Merge branch 'main' into comcalvi/EcsSecret

aws · Jul 18, 2023 · 30654e9 · 30654e9
2 parents a0146bd + 979cbff
commit 30654e9
Show file tree

Hide file tree

Showing 362 changed files with 880,474 additions and 32,228 deletions.
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "@types/node": "18.11.19",
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
-    "cdk-generate-synthetic-examples": "^0.1.287",
+    "cdk-generate-synthetic-examples": "^0.1.291",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.11",

diff --git a/...st/aws-appsync/test/integ.graphql-opensearch.js.snapshot/appsync-opensearch.template.json b/...st/aws-appsync/test/integ.graphql-opensearch.js.snapshot/appsync-opensearch.template.json
@@ -22,7 +22,8 @@
      "DedicatedMasterEnabled": false,
      "InstanceCount": 1,
      "InstanceType": "r5.large.search",
-     "ZoneAwarenessEnabled": false
+     "ZoneAwarenessEnabled": false,
+     "MultiAZWithStandbyEnabled": false
     },
     "DomainEndpointOptions": {
      "EnforceHTTPS": true,

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-opensearch.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-opensearch.ts
@@ -23,6 +23,9 @@ class OpensSearch23Stack extends cdk.Stack {
       },
       nodeToNodeEncryption: true,
       enforceHttps: true,
+      capacity: {
+        multiAzWithStandbyEnabled: false,
+      },
     });
 
     const api = new appsync.GraphqlApi(this, 'api', {

diff --git a/...s-ecs/test/fargate/integ.external-deploy-controller.js.snapshot/aws-ecs-integ.assets.json b/...s-ecs/test/fargate/integ.external-deploy-controller.js.snapshot/aws-ecs-integ.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "08f603b34dd592b1fe18725d57edf629a7b88639b2b9e032676b44567f62a470": {
+      "source": {
+        "path": "aws-ecs-integ.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "08f603b34dd592b1fe18725d57edf629a7b88639b2b9e032676b44567f62a470.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}