Merge branch 'main' into main

aws · Sep 18, 2023 · ccf7887 · ccf7887
2 parents 0f2c89f + f5a5a08
commit ccf7887
Show file tree

Hide file tree

Showing 183 changed files with 3,789 additions and 193,278 deletions.
diff --git a/.github/workflows/request-cli-integ-test.yml b/.github/workflows/request-cli-integ-test.yml
@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
       - name: Find changed cli files
         id: changed-cli-files
-        uses: tj-actions/changed-files@246636f5fa148b5ad8e65ca4c57b18af3123e5f6
+        uses: tj-actions/changed-files@76c4d81a6acd339b55bd7407a016981c853eb702
         with:
           base_sha: ${{ github.event.pull_request.base.sha }}
           files_yaml: |

diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.96.2-alpha.0](https://github.com/aws/aws-cdk/compare/v2.96.1-alpha.0...v2.96.2-alpha.0) (2023-09-14)
+
 ## [2.96.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.96.0-alpha.0...v2.96.1-alpha.0) (2023-09-14)
 
 ## [2.96.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.95.1-alpha.0...v2.96.0-alpha.0) (2023-09-13)

diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.96.2](https://github.com/aws/aws-cdk/compare/v2.96.1...v2.96.2) (2023-09-14)
+
+
+### Bug Fixes
+
+* **custom-resources:** does not accept strings where numbers are expected, skips recursive types ([#27112](https://github.com/aws/aws-cdk/issues/27112)) ([d8dcd75](https://github.com/aws/aws-cdk/commit/d8dcd758d30e4d7e85c4d389a21718726e779644))
+
 ## [2.96.1](https://github.com/aws/aws-cdk/compare/v2.96.0...v2.96.1) (2023-09-14)
 
 

diff --git a/...t/lambda/integ.deployment-config.js.snapshot/aws-cdk-codedeploy-lambda-config.assets.json b/...t/lambda/integ.deployment-config.js.snapshot/aws-cdk-codedeploy-lambda-config.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "9fe810257cfcfa9ad36b78a24f4bde21cc92a5fbc22ce909ea3b65b8244fda08": {
+    "c7a41d14787864f2399d1a263c7b6b666dab08823b91be89c000dd978cc752dc": {
       "source": {
         "path": "aws-cdk-codedeploy-lambda-config.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "9fe810257cfcfa9ad36b78a24f4bde21cc92a5fbc22ce909ea3b65b8244fda08.json",
+          "objectKey": "c7a41d14787864f2399d1a263c7b6b666dab08823b91be89c000dd978cc752dc.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...lambda/integ.deployment-config.js.snapshot/aws-cdk-codedeploy-lambda-config.template.json b/...lambda/integ.deployment-config.js.snapshot/aws-cdk-codedeploy-lambda-config.template.json
@@ -98,7 +98,6 @@
      "S3Key": "e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db.zip"
     },
     "Handler": "index.handler",
-    "MemorySize": 256,
     "Role": {
      "Fn::GetAtt": [
       "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2",

diff --git a/...k-integ/test/aws-codedeploy/test/lambda/integ.deployment-config.js.snapshot/manifest.json b/...k-integ/test/aws-codedeploy/test/lambda/integ.deployment-config.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9fe810257cfcfa9ad36b78a24f4bde21cc92a5fbc22ce909ea3b65b8244fda08.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c7a41d14787864f2399d1a263c7b6b666dab08823b91be89c000dd978cc752dc.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...ework-integ/test/aws-codedeploy/test/lambda/integ.deployment-config.js.snapshot/tree.json b/...ework-integ/test/aws-codedeploy/test/lambda/integ.deployment-config.js.snapshot/tree.json
@@ -227,7 +227,6 @@
                       "s3Key": "e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db.zip"
                     },
                     "handler": "index.handler",
-                    "memorySize": 256,
                     "role": {
                       "Fn::GetAtt": [
                         "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2",

diff --git a/...-pool-client-explicit-props.js.snapshot/integ-user-pool-client-explicit-props.assets.json b/...-pool-client-explicit-props.js.snapshot/integ-user-pool-client-explicit-props.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "b873307293c4861153d8e391c9273b4182877da748d06faed2c0af9d5c9d2df2": {
+    "a2f3eeea0bc8482a2cbaf87c70e3a1f66f91277860f6c6897150ccaebc3e4f01": {
       "source": {
         "path": "integ-user-pool-client-explicit-props.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "b873307293c4861153d8e391c9273b4182877da748d06faed2c0af9d5c9d2df2.json",
+          "objectKey": "a2f3eeea0bc8482a2cbaf87c70e3a1f66f91277860f6c6897150ccaebc3e4f01.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...ool-client-explicit-props.js.snapshot/integ-user-pool-client-explicit-props.template.json b/...ool-client-explicit-props.js.snapshot/integ-user-pool-client-explicit-props.template.json
@@ -231,7 +231,6 @@
      "S3Key": "e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db.zip"
     },
     "Handler": "index.handler",
-    "MemorySize": 256,
     "Role": {
      "Fn::GetAtt": [
       "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2",

diff --git a/...teg/test/aws-cognito/test/integ.user-pool-client-explicit-props.js.snapshot/manifest.json b/...teg/test/aws-cognito/test/integ.user-pool-client-explicit-props.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b873307293c4861153d8e391c9273b4182877da748d06faed2c0af9d5c9d2df2.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a2f3eeea0bc8482a2cbaf87c70e3a1f66f91277860f6c6897150ccaebc3e4f01.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...k-integ/test/aws-cognito/test/integ.user-pool-client-explicit-props.js.snapshot/tree.json b/...k-integ/test/aws-cognito/test/integ.user-pool-client-explicit-props.js.snapshot/tree.json
@@ -321,7 +321,6 @@
                       "s3Key": "e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db.zip"
                     },
                     "handler": "index.handler",
-                    "memorySize": 256,
                     "role": {
                       "Fn::GetAtt": [
                         "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2",

diff --git a/.../test/integ.user-pool-client-secret.js.snapshot/integ-user-pool-client-secret.assets.json b/.../test/integ.user-pool-client-secret.js.snapshot/integ-user-pool-client-secret.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "42c5e20cecc6fa16d595b25e4f6b793257ca9ac33e53aae5cd929f77ea4d427f": {
+    "361c01e90165ab5a65b22b352d8cd87e3af7ee4411fb11e492c6ba2b456a2acb": {
       "source": {
         "path": "integ-user-pool-client-secret.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "42c5e20cecc6fa16d595b25e4f6b793257ca9ac33e53aae5cd929f77ea4d427f.json",
+          "objectKey": "361c01e90165ab5a65b22b352d8cd87e3af7ee4411fb11e492c6ba2b456a2acb.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...est/integ.user-pool-client-secret.js.snapshot/integ-user-pool-client-secret.template.json b/...est/integ.user-pool-client-secret.js.snapshot/integ-user-pool-client-secret.template.json
@@ -190,7 +190,6 @@
      "S3Key": "e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db.zip"
     },
     "Handler": "index.handler",
-    "MemorySize": 256,
     "Role": {
      "Fn::GetAtt": [
       "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2",

diff --git a/...ework-integ/test/aws-cognito/test/integ.user-pool-client-secret.js.snapshot/manifest.json b/...ework-integ/test/aws-cognito/test/integ.user-pool-client-secret.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/42c5e20cecc6fa16d595b25e4f6b793257ca9ac33e53aae5cd929f77ea4d427f.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/361c01e90165ab5a65b22b352d8cd87e3af7ee4411fb11e492c6ba2b456a2acb.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...framework-integ/test/aws-cognito/test/integ.user-pool-client-secret.js.snapshot/tree.json b/...framework-integ/test/aws-cognito/test/integ.user-pool-client-secret.js.snapshot/tree.json
@@ -280,7 +280,6 @@
                       "s3Key": "e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db.zip"
                     },
                     "handler": "index.handler",
-                    "memorySize": 256,
                     "role": {
                       "Fn::GetAtt": [
                         "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2",

diff --git a/.../test/integ.user-pool-domain-cfdist.js.snapshot/integ-user-pool-domain-cfdist.assets.json b/.../test/integ.user-pool-domain-cfdist.js.snapshot/integ-user-pool-domain-cfdist.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "6687fd163b14fcce9c81bd698fd75fbe5cdebda14af69cf7a7a7246d7b7bb5a2": {
+    "a85ddbe1f4f6fe3e1011e4e33c1c22d299323cbaa103ebef7b5a3dcb98344bf1": {
       "source": {
         "path": "integ-user-pool-domain-cfdist.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "6687fd163b14fcce9c81bd698fd75fbe5cdebda14af69cf7a7a7246d7b7bb5a2.json",
+          "objectKey": "a85ddbe1f4f6fe3e1011e4e33c1c22d299323cbaa103ebef7b5a3dcb98344bf1.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...est/integ.user-pool-domain-cfdist.js.snapshot/integ-user-pool-domain-cfdist.template.json b/...est/integ.user-pool-domain-cfdist.js.snapshot/integ-user-pool-domain-cfdist.template.json
@@ -151,7 +151,6 @@
      "S3Key": "e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db.zip"
     },
     "Handler": "index.handler",
-    "MemorySize": 256,
     "Role": {
      "Fn::GetAtt": [
       "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2",

diff --git a/...ework-integ/test/aws-cognito/test/integ.user-pool-domain-cfdist.js.snapshot/manifest.json b/...ework-integ/test/aws-cognito/test/integ.user-pool-domain-cfdist.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6687fd163b14fcce9c81bd698fd75fbe5cdebda14af69cf7a7a7246d7b7bb5a2.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a85ddbe1f4f6fe3e1011e4e33c1c22d299323cbaa103ebef7b5a3dcb98344bf1.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...framework-integ/test/aws-cognito/test/integ.user-pool-domain-cfdist.js.snapshot/tree.json b/...framework-integ/test/aws-cognito/test/integ.user-pool-domain-cfdist.js.snapshot/tree.json
@@ -265,7 +265,6 @@
                       "s3Key": "e5178afc49b7c6a85127a67856ce958e4f0879ce6aad5e974cac2a088bf939db.zip"
                     },
                     "handler": "index.handler",
-                    "memorySize": 256,
                     "role": {
                       "Fn::GetAtt": [
                         "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2",