Merge branch 'main' into replace-eslint-hard-sep

aws · Jul 28, 2023 · f41053a · f41053a
2 parents 2e8f8db + 004e051
commit f41053a
Show file tree

Hide file tree

Showing 72 changed files with 2,136 additions and 2,122 deletions.
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "build-all": "tsc -b"
   },
   "devDependencies": {
-    "@nx/workspace": "^16.5.3",
+    "@nx/workspace": "^16.5.5",
     "@types/node": "18.11.19",
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
@@ -27,9 +27,9 @@
     "jsii-diff": "1.85.0",
     "jsii-pacmak": "1.85.0",
     "jsii-reflect": "1.85.0",
-    "jsii-rosetta": "~5.1.7",
+    "jsii-rosetta": "~5.1.8",
     "lerna": "^7.0.1",
-    "nx": "^16.5.3",
+    "nx": "^16.5.5",
     "patch-package": "^6.5.1",
     "semver": "^7.5.4",
     "standard-version": "^9.5.0",

diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json
@@ -39,11 +39,11 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1417.0",
+    "aws-sdk": "^2.1423.0",
     "axios": "^0.27.2",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "jest-junit": "^14.0.1",
     "make-runnable": "^1.4.1",
     "npm": "^8.19.4",

diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json
@@ -39,10 +39,10 @@
     "@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.1417.0",
+    "aws-sdk": "^2.1423.0",
     "aws-sdk-mock": "5.6.0",
-    "cdk8s": "^2.7.115",
-    "cdk8s-plus-24": "2.8.99",
+    "cdk8s": "^2.21.0",
+    "cdk8s-plus-24": "2.12.1",
     "constructs": "^10.0.0"
   },
   "repository": {

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.alb-controller.ts
@@ -72,6 +72,7 @@ const app = new App();
 const stack = new EksClusterAlbControllerStack(app, 'aws-cdk-eks-cluster-alb-controller-test');
 new integ.IntegTest(app, 'aws-cdk-cluster-alb-controller', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
 });
 app.synth();
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-bottlerocket-ng.ts
@@ -45,6 +45,7 @@ const app = new App();
 const stack = new EksClusterStack(app, 'aws-cdk-eks-cluster-bottlerocket-ng-test');
 new integ.IntegTest(app, 'aws-cdk-eks-cluster-bottlerocket-ng', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
 });
 app.synth();
diff --git a/...ages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.ts b/...ages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.ts
@@ -23,7 +23,8 @@ const app = new App();
 const stack = new EksAllHandlersInVpcStack(app, 'aws-cdk-eks-handlers-in-vpc-test');
 new integ.IntegTest(app, 'aws-cdk-eks-handlers-in-vpc', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
 });
 
 app.synth();
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.ts
@@ -211,7 +211,8 @@ const stack = new EksClusterStack(app, 'aws-cdk-eks-import-cluster-test');
 
 new integ.IntegTest(app, 'aws-cdk-eks-import-cluster', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
   cdkCommandOptions: {
     deploy: {
       args: {

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.ts
@@ -382,7 +382,8 @@ if (process.env.CDK_INTEG_ACCOUNT !== '12345678') {
 
 new integ.IntegTest(app, 'aws-cdk-eks-cluster-ipv6', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
   cdkCommandOptions: {
     deploy: {
       args: {

diff --git a/.../@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.ts b/.../@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-private-endpoint.ts
@@ -47,7 +47,8 @@ const app = new App();
 const stack = new EksClusterStack(app, 'aws-cdk-eks-cluster-private-endpoint-test');
 new integ.IntegTest(app, 'aws-cdk-eks-cluster-private-endpoint', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
 });
 
 app.synth();
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.ts
@@ -355,7 +355,8 @@ if (process.env.CDK_INTEG_ACCOUNT !== '12345678') {
 
 new integ.IntegTest(app, 'aws-cdk-eks-cluster', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
   cdkCommandOptions: {
     deploy: {
       args: {

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.ts
@@ -104,7 +104,8 @@ const app = new App();
 const stack = new EksClusterStack(app, 'aws-cdk-eks-helm-test');
 new integ.IntegTest(app, 'aws-cdk-eks-helm', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
 });
 
 app.synth();
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-inference.ts
@@ -32,7 +32,8 @@ const app = new App();
 const stack = new EksClusterInferenceStack(app, 'aws-cdk-eks-cluster-inference-test');
 new integ.IntegTest(app, 'aws-cdk-eks-cluster-interence', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
   cdkCommandOptions: {
     deploy: {
       args: {

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-windows-ng.ts
@@ -54,6 +54,7 @@ const app = new App();
 const stack = new EksClusterStack(app, 'aws-cdk-eks-cluster-windows-ng-test');
 new integ.IntegTest(app, 'aws-cdk-eks-cluster-windows-ng', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
 });
 app.synth();
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.ts
@@ -23,7 +23,8 @@ const app = new App();
 const stack = new EksFargateClusterStack(app, 'aws-cdk-eks-fargate-cluster-test');
 new integ.IntegTest(app, 'aws-cdk-eks-fargate-cluster', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
 });
 
 app.synth();
diff --git a/...testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/package.json b/...testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/package.json
@@ -2,6 +2,6 @@
     "name": "eks-service-account-sdk-call-integ-test",
     "private": "true",
     "dependencies": {
-      "aws-sdk": "^2.1417.0"
+      "aws-sdk": "^2.1423.0"
     }
   }
diff --git a/...ages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.ts b/...ages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/eks/integ.call.ts
@@ -54,7 +54,8 @@ new cdk.CfnOutput(stack, 'stateMachineArn', {
 
 new integ.IntegTest(app, 'aws-stepfunctions-tasks-eks-call-integ', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
   cdkCommandOptions: {
     deploy: {
       args: {

diff --git a/...rk-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.ts b/...rk-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.ts
@@ -90,7 +90,8 @@ new cdk.CfnOutput(stack, 'stateMachineArn', {
 
 new integ.IntegTest(app, 'aws-stepfunctions-tasks-emr-containers-all-services', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
   cdkCommandOptions: {
     deploy: {
       args: {

diff --git a/...ng/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.ts b/...ng/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.ts
@@ -101,7 +101,8 @@ new cdk.CfnOutput(stack, 'stateMachineArn', {
 
 new integ.IntegTest(app, 'aws-stepfunctions-tasks-emr-containers-start-job-run', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
   cdkCommandOptions: {
     deploy: {
       args: {

diff --git a/...testing/framework-integ/test/lambda-layer-node-proxy-agent/test/integ.node-proxy-agent.ts b/...testing/framework-integ/test/lambda-layer-node-proxy-agent/test/integ.node-proxy-agent.ts
@@ -32,7 +32,8 @@ new cdk.CustomResource(stack, 'CustomResourceNode14', {
 
 new integ.IntegTest(app, 'lambda-layer-node-proxy-agent-integ-test', {
   testCases: [stack],
-  diffAssets: true,
+  // Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
+  diffAssets: false,
   cdkCommandOptions: {
     deploy: {
       args: {

diff --git a/packages/@aws-cdk/aws-amplify-alpha/package.json b/packages/@aws-cdk/aws-amplify-alpha/package.json
@@ -86,9 +86,9 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@aws-sdk/client-amplify": "^3.370.0",
-    "@aws-sdk/client-s3": "^3.370.0",
-    "@aws-sdk/s3-request-presigner": "^3.370.0",
+    "@aws-sdk/client-amplify": "^3.378.0",
+    "@aws-sdk/client-s3": "^3.378.0",
+    "@aws-sdk/s3-request-presigner": "^3.378.0",
     "@types/jest": "^29.5.3",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0"

diff --git a/packages/@aws-cdk/aws-batch-alpha/package.json b/packages/@aws-cdk/aws-batch-alpha/package.json
@@ -85,7 +85,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
     "@aws-cdk/integ-tests-alpha": "0.0.0"

diff --git a/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json b/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json
@@ -85,7 +85,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0"
   },

diff --git a/packages/@aws-cdk/aws-gamelift-alpha/package.json b/packages/@aws-cdk/aws-gamelift-alpha/package.json
@@ -85,7 +85,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
     "@aws-cdk/integ-tests-alpha": "0.0.0"

diff --git a/packages/@aws-cdk/aws-glue-alpha/package.json b/packages/@aws-cdk/aws-glue-alpha/package.json
@@ -88,7 +88,7 @@
     "@types/jest": "^29.5.3",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
-    "jest": "^29.6.1"
+    "jest": "^29.6.2"
   },
   "dependencies": {},
   "homepage": "https://github.com/aws/aws-cdk",

diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/package.json b/packages/@aws-cdk/aws-iot-actions-alpha/package.json
@@ -85,7 +85,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "constructs": "^10.0.0",
     "aws-cdk-lib": "0.0.0",
     "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "0.0.0",

diff --git a/packages/@aws-cdk/aws-iot-alpha/package.json b/packages/@aws-cdk/aws-iot-alpha/package.json
@@ -85,7 +85,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
     "@aws-cdk/integ-tests-alpha": "0.0.0"

diff --git a/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json b/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json
@@ -78,7 +78,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
     "@aws-cdk/integ-tests-alpha": "0.0.0",

diff --git a/packages/@aws-cdk/aws-iotevents-alpha/package.json b/packages/@aws-cdk/aws-iotevents-alpha/package.json
@@ -87,7 +87,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
     "@aws-cdk/integ-tests-alpha": "0.0.0"

diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/package.json
@@ -81,7 +81,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
     "@aws-cdk/integ-tests-alpha": "0.0.0"

diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/package.json
@@ -79,7 +79,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
     "@aws-cdk/aws-kinesisfirehose-alpha": "0.0.0"

diff --git a/packages/@aws-cdk/aws-msk-alpha/package.json b/packages/@aws-cdk/aws-msk-alpha/package.json
@@ -87,7 +87,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
     "@aws-cdk/integ-tests-alpha": "0.0.0"

diff --git a/packages/@aws-cdk/aws-redshift-alpha/package.json b/packages/@aws-cdk/aws-redshift-alpha/package.json
@@ -84,9 +84,9 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@aws-sdk/client-redshift": "^3.370.0",
-    "@aws-sdk/client-redshift-data": "^3.370.0",
-    "@aws-sdk/client-secrets-manager": "^3.370.0",
+    "@aws-sdk/client-redshift": "^3.378.0",
+    "@aws-sdk/client-redshift-data": "^3.378.0",
+    "@aws-sdk/client-secrets-manager": "^3.378.0",
     "@types/jest": "^29.5.3",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",

diff --git a/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json b/packages/@aws-cdk/aws-s3objectlambda-alpha/package.json
@@ -88,7 +88,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0"
   },

diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/package.json b/packages/@aws-cdk/aws-sagemaker-alpha/package.json
@@ -86,7 +86,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0",
     "@aws-cdk/integ-tests-alpha": "0.0.0"

diff --git a/packages/@aws-cdk/aws-synthetics-alpha/package.json b/packages/@aws-cdk/aws-synthetics-alpha/package.json
@@ -88,7 +88,7 @@
     "@aws-cdk/pkglint": "0.0.0",
     "@aws-cdk/integ-tests-alpha": "0.0.0",
     "@types/jest": "^29.5.3",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "aws-cdk-lib": "0.0.0",
     "constructs": "^10.0.0"
   },

diff --git a/packages/@aws-cdk/cdk-cli-wrapper/package.json b/packages/@aws-cdk/cdk-cli-wrapper/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@types/jest": "^29.5.3",
     "@aws-cdk/cdk-build-tools": "0.0.0",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "@aws-cdk/pkglint": "0.0.0"
   },
   "repository": {

diff --git a/packages/@aws-cdk/cfnspec/package.json b/packages/@aws-cdk/cfnspec/package.json
@@ -36,7 +36,7 @@
     "@types/jest": "^29.5.3",
     "@types/md5": "^2.3.2",
     "fast-json-patch": "^3.1.1",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "json-diff": "^0.10.0",
     "sort-json": "^2.0.1",
     "ts-node": "^10.9.1"

diff --git a/packages/@aws-cdk/cli-lib-alpha/package.json b/packages/@aws-cdk/cli-lib-alpha/package.json
@@ -93,7 +93,7 @@
     "@types/jest": "^29.5.3",
     "aws-cdk": "0.0.0",
     "constructs": "^10.0.0",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "ts-node": "^10.9.1"
   },
   "repository": {

diff --git a/packages/@aws-cdk/cloud-assembly-schema/package.json b/packages/@aws-cdk/cloud-assembly-schema/package.json
@@ -83,9 +83,9 @@
     "@types/mock-fs": "^4.13.1",
     "@types/semver": "^7.5.0",
     "aws-cdk-lib": "0.0.0",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "mock-fs": "^4.14.0",
-    "typescript-json-schema": "^0.56.0"
+    "typescript-json-schema": "^0.59.0"
   },
   "repository": {
     "url": "https://github.com/aws/aws-cdk.git",