Skip to content

Commit a40dbde

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into merge-back/2.136.1
2 parents 6f21c1d + 07c939a commit a40dbde

File tree

107 files changed

+75486
-359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+75486
-359
lines changed

‎design/cloud-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Cloud Assembly Specification, Version 2.0
22

3-
See [cloud-assembly-schema](../packages/@aws-cdk/cloud-assembly-schema/README.md)
3+
See [cloud-assembly-schema](../packages/aws-cdk-lib/cloud-assembly-schema/README.md)

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/apiDefaultTestDeployAssert018781F2.assets.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/integ.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/manifest.json

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/stack.assets.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/stack.template.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,10 @@
213213
"Arn"
214214
]
215215
}
216-
}
216+
},
217+
"DependsOn": [
218+
"FirstSourceAPISchemaF2FDB692"
219+
]
217220
},
218221
"MergedAPISecondSourceAPIAssociationBD1A08F4": {
219222
"Type": "AWS::AppSync::SourceApiAssociation",
@@ -233,7 +236,10 @@
233236
"Arn"
234237
]
235238
}
236-
}
239+
},
240+
"DependsOn": [
241+
"SecondSourceAPISchema65B7401E"
242+
]
237243
},
238244
"MergedAPIDefaultApiKeyAF5EA13C": {
239245
"Type": "AWS::AppSync::ApiKey",

0 commit comments

Comments
 (0)