Merge branch 'main' into assertions/add-stack-tag-checks

aws · Apr 9, 2024 · 4dcbf74 · 4dcbf74
2 parents 22a2ef9 + 58ebabc
commit 4dcbf74
Show file tree

Hide file tree

Showing 96 changed files with 75,863 additions and 1,669 deletions.
diff --git a/allowed-breaking-changes.txt b/allowed-breaking-changes.txt
diff --git a/design/cloud-assembly.md b/design/cloud-assembly.md
@@ -1,3 +1,3 @@
 # Cloud Assembly Specification, Version 2.0
 
-See [cloud-assembly-schema](../packages/@aws-cdk/cloud-assembly-schema/README.md)
+See [cloud-assembly-schema](../packages/aws-cdk-lib/cloud-assembly-schema/README.md)
diff --git a/...nc-merged-api-arn-flag-enabled.js.snapshot/apiDefaultTestDeployAssert018781F2.assets.json b/...nc-merged-api-arn-flag-enabled.js.snapshot/apiDefaultTestDeployAssert018781F2.assets.json
diff --git a/...integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/cdk.out b/...integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/cdk.out
diff --git a/...eg/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/integ.json b/...eg/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/integ.json
diff --git a/...test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/manifest.json b/...test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/manifest.json
diff --git a/.../aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/stack.assets.json b/.../aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/stack.assets.json
diff --git a/...ws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/stack.template.json b/...ws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/stack.template.json
@@ -213,7 +213,10 @@
       "Arn"
      ]
     }
-   }
+   },
+   "DependsOn": [
+    "FirstSourceAPISchemaF2FDB692"
+   ]
   },
   "MergedAPISecondSourceAPIAssociationBD1A08F4": {
    "Type": "AWS::AppSync::SourceApiAssociation",
@@ -233,7 +236,10 @@
       "Arn"
      ]
     }
-   }
+   },
+   "DependsOn": [
+    "SecondSourceAPISchema65B7401E"
+   ]
   },
   "MergedAPIDefaultApiKeyAF5EA13C": {
    "Type": "AWS::AppSync::ApiKey",