Merge branch 'main' into 29572

aws · Mar 22, 2024 · 4e96b53 · 4e96b53
2 parents a675d41 + 798b1b4
commit 4e96b53
Show file tree

Hide file tree

Showing 37 changed files with 1,075 additions and 959 deletions.
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "jsii-diff": "1.95.0",
     "jsii-pacmak": "1.95.0",
     "jsii-reflect": "1.95.0",
-    "jsii-rosetta": "~5.3.27",
+    "jsii-rosetta": "~5.3.29",
     "lerna": "^7.4.2",
     "nx": "^16.10.0",
     "patch-package": "^6.5.1",

diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json
@@ -39,8 +39,8 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1576.0",
-    "axios": "^1.6.7",
+    "aws-sdk": "^2.1583.0",
+    "axios": "^1.6.8",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",
     "jest": "^29.7.0",

diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json
@@ -41,7 +41,7 @@
     "@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.1576.0",
+    "aws-sdk": "^2.1583.0",
     "aws-sdk-mock": "5.6.0",
     "cdk8s": "2.68.46",
     "cdk8s-plus-27": "2.7.84",

diff --git a/...teg.latest.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.assets.json b/...teg.latest.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.assets.json
diff --git a/...g.latest.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.template.json b/...g.latest.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.template.json
diff --git a/...3b438433db42adadab1bf5e17.bundle/index.js → ...69bcb2be4a49f9baf5cfc2f9c.bundle/index.js b/...3b438433db42adadab1bf5e17.bundle/index.js → ...69bcb2be4a49f9baf5cfc2f9c.bundle/index.js
diff --git a/...ae188efc106fa19fc56a4b0e28290813/index.js → ...30716f8ccea80be6f26c8793a9e220ac/index.js b/...ae188efc106fa19fc56a4b0e28290813/index.js → ...30716f8ccea80be6f26c8793a9e220ac/index.js
diff --git a/...4b0e28290813/node_modules/.yarn-integrity → ...8793a9e220ac/node_modules/.yarn-integrity b/...4b0e28290813/node_modules/.yarn-integrity → ...8793a9e220ac/node_modules/.yarn-integrity
diff --git a/...b0e28290813/node_modules/delay/index.d.ts → ...793a9e220ac/node_modules/delay/index.d.ts b/...b0e28290813/node_modules/delay/index.d.ts → ...793a9e220ac/node_modules/delay/index.d.ts
diff --git a/...a4b0e28290813/node_modules/delay/index.js → ...c8793a9e220ac/node_modules/delay/index.js b/...a4b0e28290813/node_modules/delay/index.js → ...c8793a9e220ac/node_modules/delay/index.js
diff --git a/...6a4b0e28290813/node_modules/delay/license → ...6c8793a9e220ac/node_modules/delay/license b/...6a4b0e28290813/node_modules/delay/license → ...6c8793a9e220ac/node_modules/delay/license
diff --git a/...e28290813/node_modules/delay/package.json → ...3a9e220ac/node_modules/delay/package.json b/...e28290813/node_modules/delay/package.json → ...3a9e220ac/node_modules/delay/package.json
diff --git a/...4b0e28290813/node_modules/delay/readme.md → ...8793a9e220ac/node_modules/delay/readme.md b/...4b0e28290813/node_modules/delay/readme.md → ...8793a9e220ac/node_modules/delay/readme.md
diff --git a/...8efc106fa19fc56a4b0e28290813/package.json → ...6f8ccea80be6f26c8793a9e220ac/package.json b/...8efc106fa19fc56a4b0e28290813/package.json → ...6f8ccea80be6f26c8793a9e220ac/package.json
diff --git a/...e188efc106fa19fc56a4b0e28290813/yarn.lock → ...0716f8ccea80be6f26c8793a9e220ac/yarn.lock b/...e188efc106fa19fc56a4b0e28290813/yarn.lock → ...0716f8ccea80be6f26c8793a9e220ac/yarn.lock
diff --git a/...ws-lambda-nodejs/test/integ.latest.js.snapshot/cdk-integ-lambda-nodejs-latest.assets.json b/...ws-lambda-nodejs/test/integ.latest.js.snapshot/cdk-integ-lambda-nodejs-latest.assets.json
diff --git a/...-lambda-nodejs/test/integ.latest.js.snapshot/cdk-integ-lambda-nodejs-latest.template.json b/...-lambda-nodejs/test/integ.latest.js.snapshot/cdk-integ-lambda-nodejs-latest.template.json
@@ -38,7 +38,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "8675e444a7d27e73e12fdf56f28d1271ae188efc106fa19fc56a4b0e28290813.zip"
+     "S3Key": "f9b0f4d8625cbe898e0489f6ac67297230716f8ccea80be6f26c8793a9e220ac.zip"
     },
     "Environment": {
      "Variables": {

diff --git a/...esting/framework-integ/test/aws-lambda-nodejs/test/integ.latest.js.snapshot/manifest.json b/...esting/framework-integ/test/aws-lambda-nodejs/test/integ.latest.js.snapshot/manifest.json
diff --git a/...dk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.latest.js.snapshot/tree.json b/...dk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.latest.js.snapshot/tree.json
diff --git a/packages/@aws-cdk/cloudformation-diff/package.json b/packages/@aws-cdk/cloudformation-diff/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@aws-cdk/aws-service-spec": "^0.0.56",
     "@aws-cdk/service-spec-types": "^0.0.56",
-    "aws-sdk": "2.1576.0",
+    "aws-sdk": "2.1583.0",
     "chalk": "^4",
     "diff": "^5.2.0",
     "fast-deep-equal": "^3.1.3",

diff --git a/packages/@aws-cdk/custom-resource-handlers/package.json b/packages/@aws-cdk/custom-resource-handlers/package.json
@@ -45,17 +45,17 @@
     "@aws-sdk/client-eks": "3.421.0",
     "@aws-sdk/client-sts": "3.421.0",
     "@aws-sdk/node-http-handler": "^3.370.0",
-    "@smithy/util-stream": "^2.1.5",
+    "@smithy/util-stream": "^2.2.0",
     "@types/jest": "^29.5.12",
-    "aws-sdk-client-mock": "^3.0.1",
-    "aws-sdk-client-mock-jest": "^3.0.1",
+    "aws-sdk-client-mock": "^3.1.0",
+    "aws-sdk-client-mock-jest": "^3.1.0",
     "aws-sdk-mock": "5.8.0",
     "@cdklabs/typewriter": "^0.0.3",
     "jest": "^29.7.0",
     "sinon": "^9.2.4",
     "nock": "^13.5.4",
     "fs-extra": "^11.2.0",
-    "esbuild": "^0.20.1"
+    "esbuild": "^0.20.2"
   },
   "dependencies": {
     "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1",
@@ -64,7 +64,7 @@
     "@aws-sdk/client-ecr": "3.421.0",
     "@aws-sdk/client-s3": "3.421.0",
     "@aws-sdk/client-cloudwatch": "3.421.0",
-    "aws-sdk": "^2.1576.0"
+    "aws-sdk": "^2.1583.0"
   },
   "repository": {
     "url": "https://github.com/aws/aws-cdk.git",

diff --git a/packages/@aws-cdk/cx-api/FEATURE_FLAGS.md b/packages/@aws-cdk/cx-api/FEATURE_FLAGS.md
@@ -65,7 +65,8 @@ Flags come in three types:
 | [@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource](#aws-cdkaws-codepipeline-actionsusenewdefaultbranchforcodecommitsource) | When enabled, the CodeCommit source action is using the default branch name 'main'. | 2.103.1 | (fix) |
 | [@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction](#aws-cdkaws-cloudwatch-actionschangelambdapermissionlogicalidforlambdaaction) | When enabled, the logical ID of a Lambda permission for a Lambda action includes an alarm ID. | 2.124.0 | (fix) |
 | [@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse](#aws-cdkaws-codepipelinecrossaccountkeysdefaultvaluetofalse) | Enables Pipeline to set the default value for crossAccountKeys to false. | 2.127.0 | (default) |
-| [@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2](#aws-cdkaws-codepipelinedefaultpipelinetypetov2) | Enables Pipeline to set the default pipeline type to V2. | V2NEXT | (default) |
+| [@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2](#aws-cdkaws-codepipelinedefaultpipelinetypetov2) | Enables Pipeline to set the default pipeline type to V2. | 2.133.0 | (default) |
+| [@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope](#aws-cdkaws-kmsreducecrossaccountregionpolicyscope) | When enabled, IAM Policy created from KMS key grant will reduce the resource scope to this key only. | V2NEXT | (fix) |
 
 <!-- END table -->
 
@@ -122,7 +123,8 @@ The following json shows the current recommended set of flags, as `cdk init` wou
     "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": true,
     "@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction": true,
     "@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse": true,
-    "@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": true
+    "@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": true,
+    "@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope": true
   }
 }
 ```
@@ -1244,9 +1246,23 @@ construct, the construct automatically defaults the value of this property to `P
 | Since | Default | Recommended |
 | ----- | ----- | ----- |
 | (not in v1) |  |  |
-| V2NEXT | `false` | `true` |
+| 2.133.0 | `false` | `true` |
 
 **Compatibility with old behavior:** Pass `pipelineType: PipelineType.V1` to `Pipeline` construct to restore the previous behavior.
 
 
+### @aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope
+
+*When enabled, IAM Policy created from KMS key grant will reduce the resource scope to this key only.* (fix)
+
+When this feature flag is enabled and calling KMS key grant method, the created IAM policy will reduce the resource scope from
+'*' to this specific granting KMS key.
+
+
+| Since | Default | Recommended |
+| ----- | ----- | ----- |
+| (not in v1) |  |  |
+| V2NEXT | `false` | `true` |
+
+
 <!-- END details -->
diff --git a/packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES b/packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES
@@ -100,10 +100,11 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 
 ----------------
 
-** binary-extensions@2.2.0 - https://www.npmjs.com/package/binary-extensions/v/2.2.0 | MIT
+** binary-extensions@2.3.0 - https://www.npmjs.com/package/binary-extensions/v/2.3.0 | MIT
 MIT License
 
-Copyright (c) 2019 Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com), Paul Miller (https://paulmillr.com)
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+Copyright (c) Paul Miller (https://paulmillr.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/packages/@aws-cdk/integ-tests-alpha/package.json b/packages/@aws-cdk/integ-tests-alpha/package.json
@@ -76,8 +76,8 @@
     "@aws-sdk/types": "^3.433.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.5.12",
-    "aws-sdk-client-mock": "^3.0.1",
-    "aws-sdk-client-mock-jest": "^3.0.1",
+    "aws-sdk-client-mock": "^3.1.0",
+    "aws-sdk-client-mock-jest": "^3.1.0",
     "jest": "^29.7.0",
     "nock": "^13.5.4",
     "sinon": "^9.2.4",

diff --git a/packages/@aws-cdk/sdk-v2-to-v3-adapter/package.json b/packages/@aws-cdk/sdk-v2-to-v3-adapter/package.json
@@ -28,7 +28,7 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@aws-sdk/client-s3": "3.421.0",
-    "@smithy/types": "^2.11.0",
+    "@smithy/types": "^2.12.0",
     "@types/jest": "^29.5.12",
     "jest": "^29.7.0"
   },

diff --git a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
@@ -66,6 +66,7 @@ Flags come in three types:
 | [@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction](#aws-cdkaws-cloudwatch-actionschangelambdapermissionlogicalidforlambdaaction) | When enabled, the logical ID of a Lambda permission for a Lambda action includes an alarm ID. | 2.124.0 | (fix) |
 | [@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse](#aws-cdkaws-codepipelinecrossaccountkeysdefaultvaluetofalse) | Enables Pipeline to set the default value for crossAccountKeys to false. | 2.127.0 | (default) |
 | [@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2](#aws-cdkaws-codepipelinedefaultpipelinetypetov2) | Enables Pipeline to set the default pipeline type to V2. | 2.133.0 | (default) |
+| [@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope](#aws-cdkaws-kmsreducecrossaccountregionpolicyscope) | When enabled, IAM Policy created from KMS key grant will reduce the resource scope to this key only. | V2NEXT | (fix) |
 
 <!-- END table -->
 

diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json
@@ -159,21 +159,21 @@
     "@aws-sdk/credential-providers": "3.421.0",
     "@aws-sdk/node-http-handler": "^3.370.0",
     "@aws-sdk/types": "^3.433.0",
-    "@smithy/util-stream": "^2.1.5",
+    "@smithy/util-stream": "^2.2.0",
     "@types/aws-lambda": "^8.10.136",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.0",
     "@types/punycode": "^2.1.4",
     "@types/mime-types": "^2.1.4",
     "@aws-cdk/lazify": "0.0.0",
-    "aws-sdk": "^2.1576.0",
-    "aws-sdk-client-mock": "^3.0.1",
-    "aws-sdk-client-mock-jest": "^3.0.1",
+    "aws-sdk": "^2.1583.0",
+    "aws-sdk-client-mock": "^3.1.0",
+    "aws-sdk-client-mock-jest": "^3.1.0",
     "aws-sdk-mock": "5.8.0",
     "cdk8s": "2.68.46",
     "constructs": "^10.0.0",
     "delay": "5.0.0",
-    "esbuild": "^0.20.1",
+    "esbuild": "^0.20.2",
     "fast-check": "^3.16.0",
     "jest": "^29.7.0",
     "jest-each": "^29.7.0",

diff --git a/packages/aws-cdk/THIRD_PARTY_LICENSES b/packages/aws-cdk/THIRD_PARTY_LICENSES
@@ -264,7 +264,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 
 ----------------
 
-** aws-sdk@2.1576.0 - https://www.npmjs.com/package/aws-sdk/v/2.1576.0 | Apache-2.0
+** aws-sdk@2.1583.0 - https://www.npmjs.com/package/aws-sdk/v/2.1583.0 | Apache-2.0
 AWS SDK for JavaScript
 Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
@@ -301,10 +301,11 @@ SOFTWARE.
 
 ----------------
 
-** binary-extensions@2.2.0 - https://www.npmjs.com/package/binary-extensions/v/2.2.0 | MIT
+** binary-extensions@2.3.0 - https://www.npmjs.com/package/binary-extensions/v/2.3.0 | MIT
 MIT License
 
-Copyright (c) 2019 Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com), Paul Miller (https://paulmillr.com)
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+Copyright (c) Paul Miller (https://paulmillr.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -461,7 +462,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ----------------
 
-** cdk-from-cfn@0.144.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.144.0 | MIT OR Apache-2.0
+** cdk-from-cfn@0.150.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.150.0 | MIT OR Apache-2.0
 
 ----------------
 

diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/package.json b/packages/aws-cdk/lib/init-templates/app/typescript/package.json
@@ -12,12 +12,12 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/node": "20.11.27",
+    "@types/node": "20.11.30",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.2",
     "aws-cdk": "%cdk-version%",
     "ts-node": "^10.9.2",
-    "typescript": "~5.4.2"
+    "typescript": "~5.4.3"
   },
   "dependencies": {
     "aws-cdk-lib": "%cdk-version%",

diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/package.json b/packages/aws-cdk/lib/init-templates/lib/typescript/package.json
@@ -10,12 +10,12 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/node": "20.11.27",
+    "@types/node": "20.11.30",
     "aws-cdk-lib": "%cdk-version%",
     "constructs": "%constructs-version%",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.2",
-    "typescript": "~5.4.2"
+    "typescript": "~5.4.3"
   },
   "peerDependencies": {
     "aws-cdk-lib": "%cdk-version%",

diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json b/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json
@@ -12,12 +12,12 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/node": "20.11.27",
+    "@types/node": "20.11.30",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.2",
     "aws-cdk": "%cdk-version%",
     "ts-node": "^10.9.2",
-    "typescript": "~5.4.2"
+    "typescript": "~5.4.3"
   },
   "dependencies": {
     "aws-cdk-lib": "%cdk-version%",