Merge branch 'main' into revert-29435-chore-ec2-windows-versions

aws · Apr 9, 2024 · 9a37485 · 9a37485
2 parents fc763ce + 92a160b
commit 9a37485
Show file tree

Hide file tree

Showing 25 changed files with 357 additions and 249 deletions.
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",