Merge branch 'main' into isGpuInstanceType_INF2

aws · Oct 4, 2023 · cd17871 · cd17871
2 parents 713464e + 08f8cd3
commit cd17871
Show file tree

Hide file tree

Showing 92 changed files with 48,957 additions and 409 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.99.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.99.0-alpha.0...v2.99.1-alpha.0) (2023-09-29)
+
 ## [2.99.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.98.0-alpha.0...v2.99.0-alpha.0) (2023-09-27)
 
 

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.99.1](https://github.com/aws/aws-cdk/compare/v2.99.0...v2.99.1) (2023-09-29)
+
+
+### Bug Fixes
+
+* load time regression ([#27314](https://github.com/aws/aws-cdk/issues/27314)) ([fca5a73](https://github.com/aws/aws-cdk/commit/fca5a7344d2e205663873b577d5d91f203dd9d14))
+
 ## [2.99.0](https://github.com/aws/aws-cdk/compare/v2.98.0...v2.99.0) (2023-09-27)
 
 

diff --git a/packages/@aws-cdk-testing/cli-integ/tests/init-javascript/init-javascript.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/init-javascript/init-javascript.integtest.ts
@@ -25,8 +25,10 @@ integTest('Test importing CDK from ESM', withTemporaryDirectory(withPackages(asy
 
   // Rewrite some files
   await fs.writeFile(path.join(context.integTestDir, 'new-entrypoint.mjs'), `
-// Test two styles of imports
-import { Stack, aws_sns as sns, aws_sns_subscriptions as subs, aws_sqs as sqs } from 'aws-cdk-lib';
+// Test multiple styles of imports
+import { Stack, aws_sns as sns } from 'aws-cdk-lib';
+import { SqsSubscription } from 'aws-cdk-lib/aws-sns-subscriptions';
+import * as sqs from 'aws-cdk-lib/aws-sqs';
 import * as cdk from 'aws-cdk-lib';
 
 class TestjsStack extends Stack {
@@ -39,7 +41,7 @@ class TestjsStack extends Stack {
 
     const topic = new sns.Topic(this, 'TestjsTopic');
 
-    topic.addSubscription(new subs.SqsSubscription(queue));
+    topic.addSubscription(new SqsSubscription(queue));
   }
 }
 

diff --git a/...re/test/integ.cross-region-references.js.snapshot/CrossRegionRefProducerInteg.assets.json b/...re/test/integ.cross-region-references.js.snapshot/CrossRegionRefProducerInteg.assets.json
diff --git a/.../test/integ.cross-region-references.js.snapshot/CrossRegionRefProducerInteg.template.json b/.../test/integ.cross-region-references.js.snapshot/CrossRegionRefProducerInteg.template.json
@@ -94,7 +94,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
      },
-     "S3Key": "1a067234d252533a95ecaaccd4b3e821e6a69df0b03b918b596fc5a40eeb71a1.zip"
+     "S3Key": "0cd3b0876ff31491e457d92c24b80c95310950e9839c43eb5a86ad9535d15597.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,

diff --git a/...03b918b596fc5a40eeb71a1/__entrypoint__.js → ...39c43eb5a86ad9535d15597/__entrypoint__.js b/...03b918b596fc5a40eeb71a1/__entrypoint__.js → ...39c43eb5a86ad9535d15597/__entrypoint__.js
diff --git a/....snapshot/asset.0cd3b0876ff31491e457d92c24b80c95310950e9839c43eb5a86ad9535d15597/index.js b/....snapshot/asset.0cd3b0876ff31491e457d92c24b80c95310950e9839c43eb5a86ad9535d15597/index.js
diff --git a/....snapshot/asset.1a067234d252533a95ecaaccd4b3e821e6a69df0b03b918b596fc5a40eeb71a1/index.js b/....snapshot/asset.1a067234d252533a95ecaaccd4b3e821e6a69df0b03b918b596fc5a40eeb71a1/index.js
diff --git a/...ng/framework-integ/test/core/test/integ.cross-region-references.js.snapshot/manifest.json b/...ng/framework-integ/test/core/test/integ.cross-region-references.js.snapshot/manifest.json
diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json b/packages/@aws-cdk/app-staging-synthesizer-alpha/package.json
@@ -96,7 +96,7 @@
     "@aws-cdk/pkglint": "0.0.0"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "0.0.0",
+    "aws-cdk-lib": "^0.0.0",
     "constructs": "^10.0.0"
   },
   "publishConfig": {

diff --git a/packages/@aws-cdk/aws-appconfig-alpha/package.json b/packages/@aws-cdk/aws-appconfig-alpha/package.json
@@ -93,7 +93,7 @@
   },
   "homepage": "https://github.com/aws/aws-cdk",
   "peerDependencies": {
-    "aws-cdk-lib": "0.0.0",
+    "aws-cdk-lib": "^0.0.0",
     "constructs": "^10.0.0"
   },
   "separate-module": false,

diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/lambda-handler-custom-build/requirements.txt b/packages/@aws-cdk/aws-lambda-python-alpha/test/lambda-handler-custom-build/requirements.txt
@@ -2,6 +2,6 @@
 certifi==2023.7.22
 chardet==3.0.4
 idna==2.10
-urllib3==1.26.7
+urllib3==1.26.17
 # Requests used by this lambda
 requests==2.31.0
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.99.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.99.0-alpha.0...v2.99.1-alpha.0) (2023-09-29)

		## [2.99.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.98.0-alpha.0...v2.99.0-alpha.0) (2023-09-27)


Expand Down