Skip to content

Commit 05c4cfd

Browse files
msambolmsambol
authored
Merge branch 'main' into pipes-targets-cwl
2 parents 82f3200 + 3264b9b commit 05c4cfd

File tree

18 files changed

+1196
-1334
lines changed

18 files changed

+1196
-1334
lines changed

‎package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515
"build-all": "tsc -b"
1616
},
1717
"devDependencies": {
18-
"@nx/workspace": "^16.10.0",
18+
"@nx/workspace": "^19.3.1",
1919
"@types/node": "18.11.19",
2020
"@types/prettier": "2.6.0",
2121
"@yarnpkg/lockfile": "^1.1.0",
2222
"aws-sdk-js-codemod": "^0.28.2",
23-
"cdk-generate-synthetic-examples": "^0.2.7",
23+
"cdk-generate-synthetic-examples": "^0.2.8",
2424
"conventional-changelog-cli": "^2.2.2",
2525
"fs-extra": "^9.1.0",
2626
"graceful-fs": "^4.2.11",
2727
"jest-junit": "^13.2.0",
28-
"jsii-diff": "1.99.0",
29-
"jsii-pacmak": "1.99.0",
30-
"jsii-reflect": "1.99.0",
31-
"lerna": "^8.1.4",
32-
"nx": "^18.3.5",
28+
"jsii-diff": "1.100.0",
29+
"jsii-pacmak": "1.100.0",
30+
"jsii-reflect": "1.100.0",
31+
"lerna": "^8.1.5",
32+
"nx": "^19.3.1",
3333
"patch-package": "^6.5.1",
3434
"semver": "^7.6.2",
3535
"standard-version": "^9.5.0",
36-
"ts-jest": "^29.1.4",
36+
"ts-jest": "^29.1.5",
3737
"ts-node": "^10.9.2",
3838
"typescript": "~5.4.5"
3939
},
@@ -177,4 +177,4 @@
177177
"dependencies": {
178178
"string-width": "^4.2.3"
179179
}
180-
}
180+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"dependencies": {
4141
"@octokit/rest": "^18.12.0",
42-
"aws-sdk": "^2.1639.0",
42+
"aws-sdk": "^2.1648.0",
4343
"axios": "^1.7.2",
4444
"fs-extra": "^9.1.0",
4545
"glob": "^7.2.3",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
"@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0",
4444
"@aws-cdk/lambda-layer-kubectl-v30": "^2.0.0",
4545
"aws-cdk-lib": "0.0.0",
46-
"aws-sdk": "^2.1639.0",
46+
"aws-sdk": "^2.1648.0",
4747
"aws-sdk-mock": "5.6.0",
48-
"cdk8s": "2.68.78",
48+
"cdk8s": "2.68.82",
4949
"cdk8s-plus-27": "2.9.5",
5050
"constructs": "^10.0.0"
5151
},

‎packages/@aws-cdk/cloud-assembly-schema/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"aws-cdk-lib": "0.0.0",
8989
"jest": "^29.7.0",
9090
"mock-fs": "^4.14.0",
91-
"typescript-json-schema": "^0.63.0"
91+
"typescript-json-schema": "^0.64.0"
9292
},
9393
"repository": {
9494
"url": "https://github.com/aws/aws-cdk.git",

‎packages/@aws-cdk/cloudformation-diff/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@types/string-width": "^4.0.1",
4040
"fast-check": "^3.19.0",
4141
"jest": "^29.7.0",
42-
"ts-jest": "^29.1.4"
42+
"ts-jest": "^29.1.5"
4343
},
4444
"repository": {
4545
"url": "https://github.com/aws/aws-cdk.git",

‎packages/@aws-cdk/custom-resource-handlers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"nock": "^13.5.4",
5757
"fs-extra": "^11.2.0",
5858
"esbuild": "^0.21.5",
59-
"aws-sdk": "^2.1639.0"
59+
"aws-sdk": "^2.1648.0"
6060
},
6161
"dependencies": {
6262
"@aws-cdk/asset-node-proxy-agent-v6": "^2.0.3",

‎packages/@aws-cdk/cx-api/FEATURE_FLAGS.md

+18-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ Flags come in three types:
7272
| [@aws-cdk/pipelines:reduceAssetRoleTrustScope](#aws-cdkpipelinesreduceassetroletrustscope) | Remove the root account principal from PipelineAssetsFileRole trust policy | 2.141.0 | (default) |
7373
| [@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm](#aws-cdkaws-ecsremovedefaultdeploymentalarm) | When enabled, remove default deployment alarm settings | 2.143.0 | (default) |
7474
| [@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault](#aws-cdkcustom-resourceslogapiresponsedatapropertytruedefault) | When enabled, the custom resource used for `AwsCustomResource` will configure the `logApiResponseData` property as true by default | 2.145.0 | (fix) |
75+
| [@aws-cdk/aws-stepfunctions-tasks:ecsReduceRunTaskPermissions](#aws-cdkaws-stepfunctions-tasksecsreduceruntaskpermissions) | When enabled, IAM Policy created to run tasks won't include the task definition ARN, only the revision ARN. | V2NEXT | (fix) |
7576

7677
<!-- END table -->
7778

@@ -133,7 +134,8 @@ The following json shows the current recommended set of flags, as `cdk init` wou
133134
"@aws-cdk/aws-eks:nodegroupNameAttribute": true,
134135
"@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
135136
"@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
136-
"@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false
137+
"@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false,
138+
"@aws-cdk/aws-stepfunctions-tasks:ecsReduceRunTaskPermissions": true
137139
}
138140
}
139141
```
@@ -1356,4 +1358,19 @@ property from the event object.
13561358
| 2.145.0 | `false` | `false` |
13571359

13581360

1361+
### @aws-cdk/aws-stepfunctions-tasks:ecsReduceRunTaskPermissions
1362+
1363+
*When enabled, IAM Policy created to run tasks won't include the task definition ARN, only the revision ARN.* (fix)
1364+
1365+
When this feature flag is enabled, the IAM Policy created to run tasks won't include the task definition ARN, only the revision ARN.
1366+
The revision ARN is more specific than the task definition ARN. See https://docs.aws.amazon.com/step-functions/latest/dg/ecs-iam.html
1367+
for more details.
1368+
1369+
1370+
| Since | Default | Recommended |
1371+
| ----- | ----- | ----- |
1372+
| (not in v1) | | |
1373+
| V2NEXT | `false` | `true` |
1374+
1375+
13591376
<!-- END details -->

‎packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md

+18-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ Flags come in three types:
7272
| [@aws-cdk/pipelines:reduceAssetRoleTrustScope](#aws-cdkpipelinesreduceassetroletrustscope) | Remove the root account principal from PipelineAssetsFileRole trust policy | 2.141.0 | (default) |
7373
| [@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm](#aws-cdkaws-ecsremovedefaultdeploymentalarm) | When enabled, remove default deployment alarm settings | 2.143.0 | (default) |
7474
| [@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault](#aws-cdkcustom-resourceslogapiresponsedatapropertytruedefault) | When enabled, the custom resource used for `AwsCustomResource` will configure the `logApiResponseData` property as true by default | 2.145.0 | (fix) |
75+
| [@aws-cdk/aws-stepfunctions-tasks:ecsReduceRunTaskPermissions](#aws-cdkaws-stepfunctions-tasksecsreduceruntaskpermissions) | When enabled, IAM Policy created to run tasks won't include the task definition ARN, only the revision ARN. | V2NEXT | (fix) |
7576

7677
<!-- END table -->
7778

@@ -133,7 +134,8 @@ The following json shows the current recommended set of flags, as `cdk init` wou
133134
"@aws-cdk/aws-eks:nodegroupNameAttribute": true,
134135
"@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
135136
"@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
136-
"@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false
137+
"@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false,
138+
"@aws-cdk/aws-stepfunctions-tasks:ecsReduceRunTaskPermissions": true
137139
}
138140
}
139141
```
@@ -1356,4 +1358,19 @@ property from the event object.
13561358
| 2.145.0 | `false` | `false` |
13571359

13581360

1361+
### @aws-cdk/aws-stepfunctions-tasks:ecsReduceRunTaskPermissions
1362+
1363+
*When enabled, IAM Policy created to run tasks won't include the task definition ARN, only the revision ARN.* (fix)
1364+
1365+
When this feature flag is enabled, the IAM Policy created to run tasks won't include the task definition ARN, only the revision ARN.
1366+
The revision ARN is more specific than the task definition ARN. See https://docs.aws.amazon.com/step-functions/latest/dg/ecs-iam.html
1367+
for more details.
1368+
1369+
1370+
| Since | Default | Recommended |
1371+
| ----- | ----- | ----- |
1372+
| (not in v1) | | |
1373+
| V2NEXT | `false` | `true` |
1374+
1375+
13591376
<!-- END details -->

‎packages/aws-cdk-lib/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,17 @@
160160
"@aws-sdk/node-http-handler": "^3.370.0",
161161
"@aws-sdk/types": "^3.433.0",
162162
"@smithy/util-stream": "^2.2.0",
163-
"@types/aws-lambda": "^8.10.138",
163+
"@types/aws-lambda": "^8.10.140",
164164
"@types/jest": "^29.5.12",
165165
"@types/lodash": "^4.17.5",
166166
"@types/punycode": "^2.1.4",
167167
"@types/mime-types": "^2.1.4",
168168
"@aws-cdk/lazify": "0.0.0",
169-
"aws-sdk": "^2.1639.0",
169+
"aws-sdk": "^2.1648.0",
170170
"aws-sdk-client-mock": "^3.1.0",
171171
"aws-sdk-client-mock-jest": "^3.1.0",
172172
"aws-sdk-mock": "5.8.0",
173-
"cdk8s": "2.68.78",
173+
"cdk8s": "2.68.82",
174174
"constructs": "^10.0.0",
175175
"delay": "5.0.0",
176176
"esbuild": "^0.21.5",
@@ -184,7 +184,7 @@
184184
"ts-mock-imports": "^1.3.16",
185185
"ts-node": "^10.9.2",
186186
"typescript": "~5.4.5",
187-
"typescript-json-schema": "^0.63.0"
187+
"typescript-json-schema": "^0.64.0"
188188
},
189189
"peerDependencies": {
190190
"constructs": "^10.0.0"

‎packages/aws-cdk/THIRD_PARTY_LICENSES

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The aws-cdk package includes the following third-party software/licensing:
22

3-
** @jsii/check-node@1.99.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.99.0 | Apache-2.0
3+
** @jsii/check-node@1.100.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.100.0 | Apache-2.0
44
jsii
55
Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
66

@@ -286,7 +286,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
286286

287287
----------------
288288

289-
** aws-sdk@2.1640.0 - https://www.npmjs.com/package/aws-sdk/v/2.1640.0 | Apache-2.0
289+
** aws-sdk@2.1648.0 - https://www.npmjs.com/package/aws-sdk/v/2.1648.0 | Apache-2.0
290290
AWS SDK for JavaScript
291291
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
292292

‎packages/aws-cdk/lib/init-templates/app/typescript/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
},
1313
"devDependencies": {
1414
"@types/jest": "^29.5.12",
15-
"@types/node": "20.14.2",
15+
"@types/node": "20.14.9",
1616
"jest": "^29.7.0",
17-
"ts-jest": "^29.1.4",
17+
"ts-jest": "^29.1.5",
1818
"aws-cdk": "%cdk-version%",
1919
"ts-node": "^10.9.2",
20-
"typescript": "~5.4.5"
20+
"typescript": "~5.5.2"
2121
},
2222
"dependencies": {
2323
"aws-cdk-lib": "%cdk-version%",

‎packages/aws-cdk/lib/init-templates/lib/typescript/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
},
1111
"devDependencies": {
1212
"@types/jest": "^29.5.12",
13-
"@types/node": "20.14.2",
13+
"@types/node": "20.14.9",
1414
"aws-cdk-lib": "%cdk-version%",
1515
"constructs": "%constructs-version%",
1616
"jest": "^29.7.0",
17-
"ts-jest": "^29.1.4",
18-
"typescript": "~5.4.5"
17+
"ts-jest": "^29.1.5",
18+
"typescript": "~5.5.2"
1919
},
2020
"peerDependencies": {
2121
"aws-cdk-lib": "%cdk-version%",

‎packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
},
1313
"devDependencies": {
1414
"@types/jest": "^29.5.12",
15-
"@types/node": "20.14.2",
15+
"@types/node": "20.14.9",
1616
"jest": "^29.7.0",
17-
"ts-jest": "^29.1.4",
17+
"ts-jest": "^29.1.5",
1818
"aws-cdk": "%cdk-version%",
1919
"ts-node": "^10.9.2",
20-
"typescript": "~5.4.5"
20+
"typescript": "~5.5.2"
2121
},
2222
"dependencies": {
2323
"aws-cdk-lib": "%cdk-version%",

‎packages/aws-cdk/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"make-runnable": "^1.4.1",
9292
"nock": "^13.5.4",
9393
"sinon": "^9.2.4",
94-
"ts-jest": "^29.1.4",
94+
"ts-jest": "^29.1.5",
9595
"ts-mock-imports": "^1.3.16",
9696
"xml-js": "^1.6.11"
9797
},
@@ -100,9 +100,9 @@
100100
"@aws-cdk/cloudformation-diff": "0.0.0",
101101
"@aws-cdk/cx-api": "0.0.0",
102102
"@aws-cdk/region-info": "0.0.0",
103-
"@jsii/check-node": "1.99.0",
103+
"@jsii/check-node": "1.100.0",
104104
"archiver": "^5.3.2",
105-
"aws-sdk": "^2.1639.0",
105+
"aws-sdk": "^2.1648.0",
106106
"camelcase": "^6.3.0",
107107
"cdk-assets": "0.0.0",
108108
"cdk-from-cfn": "^0.162.0",
@@ -112,7 +112,7 @@
112112
"fs-extra": "^9.1.0",
113113
"glob": "^7.2.3",
114114
"json-diff": "^0.10.0",
115-
"minimatch": "^9.0.4",
115+
"minimatch": "^9.0.5",
116116
"promptly": "^3.2.0",
117117
"proxy-agent": "^6.4.0",
118118
"semver": "^7.6.2",

‎packages/awslint/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"awslint": "bin/awslint"
1919
},
2020
"dependencies": {
21-
"@jsii/spec": "1.99.0",
21+
"@jsii/spec": "1.100.0",
2222
"chalk": "^4",
2323
"fs-extra": "^9.1.0",
24-
"jsii-reflect": "1.99.0",
24+
"jsii-reflect": "1.100.0",
2525
"change-case": "^4.1.2",
2626
"yargs": "^16.2.0"
2727
},

‎packages/cdk-assets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@aws-cdk/cloud-assembly-schema": "0.0.0",
4747
"@aws-cdk/cx-api": "0.0.0",
4848
"archiver": "^5.3.2",
49-
"aws-sdk": "^2.1639.0",
49+
"aws-sdk": "^2.1648.0",
5050
"glob": "^7.2.3",
5151
"mime": "^2.6.0",
5252
"yargs": "^16.2.0"

‎tools/@aws-cdk/cdk-build-tools/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@
6060
"glob": "^7.2.3",
6161
"jest": "^29.7.0",
6262
"jest-junit": "^13.2.0",
63-
"jsii": "~5.4.21",
64-
"jsii-rosetta": "~5.4.21",
65-
"jsii-pacmak": "1.99.0",
66-
"jsii-reflect": "1.99.0",
63+
"jsii": "~5.4.23",
64+
"jsii-rosetta": "~5.4.23",
65+
"jsii-pacmak": "1.100.0",
66+
"jsii-reflect": "1.100.0",
6767
"markdownlint-cli": "^0.41.0",
6868
"nyc": "^15.1.0",
6969
"semver": "^7.6.2",
70-
"ts-jest": "^29.1.4",
70+
"ts-jest": "^29.1.5",
7171
"typescript": "~5.4.5",
7272
"yargs": "^16.2.0"
7373
},

0 commit comments

Comments
 (0)