Merge branch 'main' into merge-back/2.106.1

aws · Nov 11, 2023 · 454f47d · 454f47d
2 parents a2e5f65 + 94ccec6
commit 454f47d
Show file tree

Hide file tree

Showing 205 changed files with 5,229 additions and 3,777 deletions.
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,

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