Merge remote-tracking branch 'origin/main' into merge-back/2.99.1

.gitallowed

@@ -30,6 +30,7 @@ account: '924023996002'
 account: '919366029133' #cn-north-1
 account: '919830735681' #cn-northwest-1
 account: '909464085924' #ap-southeast-3
+account: '564877687649' #il-central-1
 
 # The account IDs of password rotation applications of Serverless Application Repository
 # https://docs.aws.amazon.com/secretsmanager/latest/userguide/enable-rotation-rds.html

CONTRIBUTORS.md

@@ -14,19 +14,19 @@ Shout out to our top contributors!
 - [otaviomacedo](https://github.com/otaviomacedo)
 - [madeline-k](https://github.com/madeline-k)
 - [NetaNir](https://github.com/NetaNir)
-- [robertd](https://github.com/robertd)
 - [comcalvi](https://github.com/comcalvi)
+- [robertd](https://github.com/robertd)
 - [pahud](https://github.com/pahud)
-- [peterwoodworth](https://github.com/peterwoodworth)
-- [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
 - [mrgrain](https://github.com/mrgrain)
+- [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
+- [peterwoodworth](https://github.com/peterwoodworth)
 - [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
 - [nija-at](https://github.com/nija-at)
 - [hoegertn](https://github.com/hoegertn)
-- [nmussy](https://github.com/nmussy)
 - [lpizzinidev](https://github.com/lpizzinidev)
 - [jumic](https://github.com/jumic)
 - [SoManyHs](https://github.com/SoManyHs)
+- [watany-dev](https://github.com/watany-dev)
 
 
-_Last updated: Fri, 01 Sep 23 00:09:05 +0000_
+_Last updated: Sun, 01 Oct 23 00:09:32 +0000_

package.json

@@ -15,7 +15,7 @@
  "build-all": "tsc -b"
  },
  "devDependencies": {
- "@nx/workspace": "^16.8.1",
+ "@nx/workspace": "^16.9.1",
  "@types/node": "18.11.19",
  "@types/prettier": "2.6.0",
  "@yarnpkg/lockfile": "^1.1.0",
@@ -24,12 +24,12 @@
  "fs-extra": "^9.1.0",
  "graceful-fs": "^4.2.11",
  "jest-junit": "^13.2.0",
- "jsii-diff": "1.88.0",
- "jsii-pacmak": "1.88.0",
- "jsii-reflect": "1.88.0",
+ "jsii-diff": "1.89.0",
+ "jsii-pacmak": "1.89.0",
+ "jsii-reflect": "1.89.0",
  "jsii-rosetta": "~5.1.13",
  "lerna": "^7.3.0",
- "nx": "^16.8.1",
+ "nx": "^16.9.1",
  "patch-package": "^6.5.1",
  "semver": "^7.5.4",
  "standard-version": "^9.5.0",

packages/@aws-cdk-testing/cli-integ/package.json

@@ -30,16 +30,16 @@
  "license": "Apache-2.0",
  "devDependencies": {
  "@aws-cdk/cdk-build-tools": "0.0.0",
- "@types/semver": "^7.5.2",
- "@types/yargs": "^15.0.15",
+ "@types/semver": "^7.5.3",
+ "@types/yargs": "^15.0.16",
  "@types/fs-extra": "^9.0.13",
  "@types/glob": "^7.2.0",
- "@types/npm": "^7.19.0",
+ "@types/npm": "^7.19.1",
  "@aws-cdk/pkglint": "0.0.0"
  },
  "dependencies": {
  "@octokit/rest": "^18.12.0",
- "aws-sdk": "^2.1461.0",
+ "aws-sdk": "^2.1466.0",
  "axios": "^0.27.2",
  "fs-extra": "^9.1.0",
  "glob": "^7.2.3",

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));
  }
 }
 

packages/@aws-cdk-testing/framework-integ/package.json

@@ -32,18 +32,18 @@
  "@aws-cdk/cdk-build-tools": "0.0.0",
  "@aws-cdk/integ-runner": "^0.0.0",
  "@aws-cdk/pkglint": "0.0.0",
- "@aws-sdk/client-acm": "3.414.0",
- "@aws-sdk/client-rds": "3.414.0",
- "@aws-sdk/client-s3": "3.414.0",
+ "@aws-sdk/client-acm": "3.421.0",
+ "@aws-sdk/client-rds": "3.421.0",
+ "@aws-sdk/client-s3": "3.421.0",
  "delay": "5.0.0"
  },
  "dependencies": {
  "@aws-cdk/integ-tests-alpha": "0.0.0",
  "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
  "aws-cdk-lib": "0.0.0",
- "aws-sdk": "^2.1461.0",
+ "aws-sdk": "^2.1466.0",
  "aws-sdk-mock": "5.6.0",
- "cdk8s": "^2.64.16",
+ "cdk8s": "^2.64.23",
  "cdk8s-plus-24": "2.12.1",
  "constructs": "^10.0.0"
  },