Merge branch 'main' into fix-issue-27642

aws · Nov 28, 2023 · 3b2725c · 3b2725c
2 parents ecc3df9 + 75333b1
commit 3b2725c
Show file tree

Hide file tree

Showing 363 changed files with 46,248 additions and 12,668 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@25ef3926d147cd02fc7e931c1ef50772bbb0d25d
+        uses: tj-actions/changed-files@da093c1609db0edd0a037ce9664e135f74bf30d9
         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,10 @@
 
 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.111.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.110.1-alpha.0...v2.111.0-alpha.0) (2023-11-27)
+
+## [2.110.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.110.0-alpha.0...v2.110.1-alpha.0) (2023-11-21)
+
 ## [2.110.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.109.0-alpha.0...v2.110.0-alpha.0) (2023-11-16)
 
 ## [2.109.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.108.1-alpha.0...v2.109.0-alpha.0) (2023-11-15)

diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
@@ -2,6 +2,20 @@
 
 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.111.0](https://github.com/aws/aws-cdk/compare/v2.110.1...v2.111.0) (2023-11-27)
+
+
+### Features
+
+* **aws-logs:** add LogGroupClass property to AWS::Logs::LogGroup ([da47ee6](https://github.com/aws/aws-cdk/commit/da47ee6c0259a7640701f092b272372e734f8e93))
+
+## [2.110.1](https://github.com/aws/aws-cdk/compare/v2.110.0...v2.110.1) (2023-11-21)
+
+
+### Bug Fixes
+
+* **cli:** hotswap cannot evaluate nested stacks within nested stacks ([8fa6bdd](https://github.com/aws/aws-cdk/commit/8fa6bdd86ca673649d2498304311f288fad524c0))
+
 ## [2.110.0](https://github.com/aws/aws-cdk/compare/v2.109.0...v2.110.0) (2023-11-16)
 
 

diff --git a/.../asset.e585d45530f6ac41c9820a8d4a613c60a63157f6da5ae14acdb0bb9cf5c99aa8/__entrypoint__.js b/.../asset.e585d45530f6ac41c9820a8d4a613c60a63157f6da5ae14acdb0bb9cf5c99aa8/__entrypoint__.js
diff --git a/...90eb54fde6878b4068922243eac9b171/index.js → ...a63157f6da5ae14acdb0bb9cf5c99aa8/index.js b/...90eb54fde6878b4068922243eac9b171/index.js → ...a63157f6da5ae14acdb0bb9cf5c99aa8/index.js
diff --git a/.../asset.efed83658c390f4cf6b11ee3102d0915b4e59221bffb59919511e5653e6db7f9/__entrypoint__.js b/.../asset.efed83658c390f4cf6b11ee3102d0915b4e59221bffb59919511e5653e6db7f9/__entrypoint__.js
diff --git a/...5684be8c5f342df63f11b1c360a3b760/index.js → ...b4e59221bffb59919511e5653e6db7f9/index.js b/...5684be8c5f342df63f11b1c360a3b760/index.js → ...b4e59221bffb59919511e5653e6db7f9/index.js
diff --git a/...ork-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/cdk.out b/...ork-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/cdk.out
diff --git a/...loudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.assets.json b/...loudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.assets.json
diff --git a/...udfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.template.json b/...udfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-acm-stack.template.json
@@ -89,7 +89,7 @@
    "Properties": {
     "Code": {
      "S3Bucket": "cdk-hnb659fds-assets-12345678-us-east-1",
-     "S3Key": "0dfca907fd15148be57ff2c4bf72903a5684be8c5f342df63f11b1c360a3b760.zip"
+     "S3Key": "efed83658c390f4cf6b11ee3102d0915b4e59221bffb59919511e5653e6db7f9.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,

diff --git a/...nt/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.assets.json b/...nt/test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.assets.json
diff --git a/.../test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.template.json b/.../test/integ.cloudfront-cross-region-cert.js.snapshot/integ-cloudfront-stack.template.json
@@ -104,7 +104,7 @@
    "Properties": {
     "Code": {
      "S3Bucket": "cdk-hnb659fds-assets-12345678-us-east-2",
-     "S3Key": "8aa288515f27dc9911c4bd76373c2f2490eb54fde6878b4068922243eac9b171.zip"
+     "S3Key": "e585d45530f6ac41c9820a8d4a613c60a63157f6da5ae14acdb0bb9cf5c99aa8.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,

diff --git a/...-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ.json b/...-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/integ.json
diff --git a/...cert.js.snapshot/integcloudfrontcrossregionacmDefaultTestDeployAssertD48673AA.assets.json b/...cert.js.snapshot/integcloudfrontcrossregionacmDefaultTestDeployAssertD48673AA.assets.json
diff --git a/...teg/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/manifest.json b/...teg/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.js.snapshot/manifest.json
diff --git a/.../asset.28a7d6256e60ec0ace46fa25cef1b24eaa625f4b65614aafc2c3c9a7a347c575/__entrypoint__.js b/.../asset.28a7d6256e60ec0ace46fa25cef1b24eaa625f4b65614aafc2c3c9a7a347c575/__entrypoint__.js
diff --git a/...ed25190474a6a59becad0eadd913b065/index.js → ...aa625f4b65614aafc2c3c9a7a347c575/index.js b/...ed25190474a6a59becad0eadd913b065/index.js → ...aa625f4b65614aafc2c3c9a7a347c575/index.js
diff --git a/.../asset.cd19575860c0626abb20d8fd8434732eed25190474a6a59becad0eadd913b065/__entrypoint__.js b/.../asset.cd19575860c0626abb20d8fd8434732eed25190474a6a59becad0eadd913b065/__entrypoint__.js
diff --git a/...integ/test/aws-cloudfront/test/integ.distribution-lambda-cross-region.js.snapshot/cdk.out b/...integ/test/aws-cloudfront/test/integ.distribution-lambda-cross-region.js.snapshot/cdk.out
diff --git a/...snapshot/cdkintegdistributionlambdacrossregionDefaultTestDeployAssert47F14485.assets.json b/...snapshot/cdkintegdistributionlambdacrossregionDefaultTestDeployAssert47F14485.assets.json
diff --git a/...gion.js.snapshot/edge-lambda-stack-c8363f8375cbe20a55dbe2aafe5dcee3889b0631e6.assets.json b/...gion.js.snapshot/edge-lambda-stack-c8363f8375cbe20a55dbe2aafe5dcee3889b0631e6.assets.json
diff --git a/...eg.distribution-lambda-cross-region.js.snapshot/edge-lambda-stack-eu-west-1-2.assets.json b/...eg.distribution-lambda-cross-region.js.snapshot/edge-lambda-stack-eu-west-1-2.assets.json
diff --git a/...bution-lambda-cross-region.js.snapshot/integ-distribution-lambda-cross-region.assets.json b/...bution-lambda-cross-region.js.snapshot/integ-distribution-lambda-cross-region.assets.json
diff --git a/...tion-lambda-cross-region.js.snapshot/integ-distribution-lambda-cross-region.template.json b/...tion-lambda-cross-region.js.snapshot/integ-distribution-lambda-cross-region.template.json
@@ -73,7 +73,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1"
      },
-     "S3Key": "cd19575860c0626abb20d8fd8434732eed25190474a6a59becad0eadd913b065.zip"
+     "S3Key": "28a7d6256e60ec0ace46fa25cef1b24eaa625f4b65614aafc2c3c9a7a347c575.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,

diff --git a/...eg/test/aws-cloudfront/test/integ.distribution-lambda-cross-region.js.snapshot/integ.json b/...eg/test/aws-cloudfront/test/integ.distribution-lambda-cross-region.js.snapshot/integ.json
diff --git a/...test/aws-cloudfront/test/integ.distribution-lambda-cross-region.js.snapshot/manifest.json b/...test/aws-cloudfront/test/integ.distribution-lambda-cross-region.js.snapshot/manifest.json
diff --git a/...teg/test/aws-cloudfront/test/integ.distribution-lambda-cross-region.js.snapshot/tree.json b/...teg/test/aws-cloudfront/test/integ.distribution-lambda-cross-region.js.snapshot/tree.json
diff --git a/...t/integ.launch-template.js.snapshot/LambdaTestDefaultTestDeployAssert1AF2B360.assets.json b/...t/integ.launch-template.js.snapshot/LambdaTestDefaultTestDeployAssert1AF2B360.assets.json