Merge branch 'main' into colifran/migrate-edge-function

aws · Nov 13, 2023 · aab8850 · aab8850
2 parents 0ac874c + e5959a0
commit aab8850
Show file tree

Hide file tree

Showing 197 changed files with 4,464 additions and 3,408 deletions.
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.106.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.106.0-alpha.0...v2.106.1-alpha.0) (2023-11-11)
+
 ## [2.106.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.105.0-alpha.0...v2.106.0-alpha.0) (2023-11-10)
 
 

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.106.1](https://github.com/aws/aws-cdk/compare/v2.106.0...v2.106.1) (2023-11-11)
+
+
+### Reverts
+
+* "chore(cdk): boostrap template uses deprecated AccessControl property" ([#27939](https://github.com/aws/aws-cdk/issues/27939)) ([bede2d1](https://github.com/aws/aws-cdk/commit/bede2d1195d65e61464a40d0da4213f9f09152ca)), closes [aws/aws-cdk#27764](https://github.com/aws/aws-cdk/issues/27764)
+
 ## [2.106.0](https://github.com/aws/aws-cdk/compare/v2.105.0...v2.106.0) (2023-11-10)
 
 

diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json
@@ -40,7 +40,7 @@
   "dependencies": {
     "@octokit/rest": "^18.12.0",
     "aws-sdk": "^2.1492.0",
-    "axios": "^0.27.2",
+    "axios": "^1.6.0",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",
     "jest": "^29.7.0",

diff --git a/...03b918b596fc5a40eeb71a1/__entrypoint__.js → ...f342df63f11b1c360a3b760/__entrypoint__.js b/...03b918b596fc5a40eeb71a1/__entrypoint__.js → ...f342df63f11b1c360a3b760/__entrypoint__.js
diff --git a/....snapshot/asset.0dfca907fd15148be57ff2c4bf72903a5684be8c5f342df63f11b1c360a3b760/index.js b/....snapshot/asset.0dfca907fd15148be57ff2c4bf72903a5684be8c5f342df63f11b1c360a3b760/index.js
diff --git a/....snapshot/asset.1a067234d252533a95ecaaccd4b3e821e6a69df0b03b918b596fc5a40eeb71a1/index.js b/....snapshot/asset.1a067234d252533a95ecaaccd4b3e821e6a69df0b03b918b596fc5a40eeb71a1/index.js
diff --git a/....snapshot/asset.863f318b36ec4666a297aefb6cf8390c2f0bb6ec4ef3ae0040a63a0727f50ccf/index.js b/....snapshot/asset.863f318b36ec4666a297aefb6cf8390c2f0bb6ec4ef3ae0040a63a0727f50ccf/index.js
diff --git a/...ef3ae0040a63a0727f50ccf/__entrypoint__.js → ...6878b4068922243eac9b171/__entrypoint__.js b/...ef3ae0040a63a0727f50ccf/__entrypoint__.js → ...6878b4068922243eac9b171/__entrypoint__.js
diff --git a/....snapshot/asset.8aa288515f27dc9911c4bd76373c2f2490eb54fde6878b4068922243eac9b171/index.js b/....snapshot/asset.8aa288515f27dc9911c4bd76373c2f2490eb54fde6878b4068922243eac9b171/index.js
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": "1a067234d252533a95ecaaccd4b3e821e6a69df0b03b918b596fc5a40eeb71a1.zip"
+     "S3Key": "0dfca907fd15148be57ff2c4bf72903a5684be8c5f342df63f11b1c360a3b760.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": "863f318b36ec4666a297aefb6cf8390c2f0bb6ec4ef3ae0040a63a0727f50ccf.zip"
+     "S3Key": "8aa288515f27dc9911c4bd76373c2f2490eb54fde6878b4068922243eac9b171.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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.106.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.106.0-alpha.0...v2.106.1-alpha.0) (2023-11-11)

		## [2.106.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.105.0-alpha.0...v2.106.0-alpha.0) (2023-11-10)


Expand Down