Skip to content

Commit

Permalink
Merge branch 'main' into grant_invoke_v2
Browse files Browse the repository at this point in the history
  • Loading branch information
roger-zhangg committed Jun 26, 2024
2 parents 734aae6 + eaa8f3e commit 15e3e8e
Show file tree
Hide file tree
Showing 23 changed files with 1,213 additions and 1,334 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/request-cli-integ-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
persist-credentials: false
- name: Find changed cli files
id: changed-cli-files
uses: tj-actions/changed-files@d6babd6899969df1a11d14c368283ea4436bca78
uses: tj-actions/changed-files@cc733854b1f224978ef800d29e4709d5ee2883e4
with:
base_sha: ${{ github.event.pull_request.base.sha }}
files_yaml: |
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.v2.alpha.md
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.147.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.147.0-alpha.0...v2.147.1-alpha.0) (2024-06-21)

## [2.147.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.146.0-alpha.0...v2.147.0-alpha.0) (2024-06-20)


Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.147.1](https://github.com/aws/aws-cdk/compare/v2.147.0...v2.147.1) (2024-06-21)


### Reverts

* route53 CrossAccountZoneDelegationRecord fails at deployment time with imported `delegatedZone` ([#30440](https://github.com/aws/aws-cdk/issues/30440))" ([#30606](https://github.com/aws/aws-cdk/issues/30606)) ([69eb617](https://github.com/aws/aws-cdk/commit/69eb617b45b5c4e495901d367d85e1edeea57e69)), closes [#30600](https://github.com/aws/aws-cdk/issues/30600)

## [2.147.0](https://github.com/aws/aws-cdk/compare/v2.146.0...v2.147.0) (2024-06-20)


Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
"build-all": "tsc -b"
},
"devDependencies": {
"@nx/workspace": "^16.10.0",
"@nx/workspace": "^19.3.1",
"@types/node": "18.11.19",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"aws-sdk-js-codemod": "^0.28.2",
"cdk-generate-synthetic-examples": "^0.2.7",
"cdk-generate-synthetic-examples": "^0.2.8",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
"jest-junit": "^13.2.0",
"jsii-diff": "1.99.0",
"jsii-pacmak": "1.99.0",
"jsii-reflect": "1.99.0",
"lerna": "^8.1.4",
"nx": "^18.3.5",
"jsii-diff": "1.101.0",
"jsii-pacmak": "1.101.0",
"jsii-reflect": "1.101.0",
"lerna": "^8.1.5",
"nx": "^19.3.1",
"patch-package": "^6.5.1",
"semver": "^7.6.2",
"standard-version": "^9.5.0",
"ts-jest": "^29.1.4",
"ts-jest": "^29.1.5",
"ts-node": "^10.9.2",
"typescript": "~5.4.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@octokit/rest": "^18.12.0",
"aws-sdk": "^2.1639.0",
"aws-sdk": "^2.1648.0",
"axios": "^1.7.2",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk-testing/framework-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0",
"@aws-cdk/lambda-layer-kubectl-v30": "^2.0.0",
"aws-cdk-lib": "0.0.0",
"aws-sdk": "^2.1639.0",
"aws-sdk": "^2.1648.0",
"aws-sdk-mock": "5.6.0",
"cdk8s": "2.68.78",
"cdk8s": "2.68.82",
"cdk8s-plus-27": "2.9.5",
"constructs": "^10.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cloud-assembly-schema/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"aws-cdk-lib": "0.0.0",
"jest": "^29.7.0",
"mock-fs": "^4.14.0",
"typescript-json-schema": "^0.63.0"
"typescript-json-schema": "^0.64.0"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cloudformation-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@types/string-width": "^4.0.1",
"fast-check": "^3.19.0",
"jest": "^29.7.0",
"ts-jest": "^29.1.4"
"ts-jest": "^29.1.5"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/custom-resource-handlers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"nock": "^13.5.4",
"fs-extra": "^11.2.0",
"esbuild": "^0.21.5",
"aws-sdk": "^2.1639.0"
"aws-sdk": "^2.1648.0"
},
"dependencies": {
"@aws-cdk/asset-node-proxy-agent-v6": "^2.0.3",
Expand Down
19 changes: 18 additions & 1 deletion packages/@aws-cdk/cx-api/FEATURE_FLAGS.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ Flags come in three types:
| [@aws-cdk/pipelines:reduceAssetRoleTrustScope](#aws-cdkpipelinesreduceassetroletrustscope) | Remove the root account principal from PipelineAssetsFileRole trust policy | 2.141.0 | (default) |
| [@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm](#aws-cdkaws-ecsremovedefaultdeploymentalarm) | When enabled, remove default deployment alarm settings | 2.143.0 | (default) |
| [@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) |
| [@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) |

<!-- END table -->

Expand Down Expand Up @@ -133,7 +134,8 @@ The following json shows the current recommended set of flags, as `cdk init` wou
"@aws-cdk/aws-eks:nodegroupNameAttribute": true,
"@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
"@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
"@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false
"@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false,
"@aws-cdk/aws-stepfunctions-tasks:ecsReduceRunTaskPermissions": true
}
}
```
Expand Down Expand Up @@ -1356,4 +1358,19 @@ property from the event object.
| 2.145.0 | `false` | `false` |


### @aws-cdk/aws-stepfunctions-tasks:ecsReduceRunTaskPermissions

*When enabled, IAM Policy created to run tasks won't include the task definition ARN, only the revision ARN.* (fix)

When this feature flag is enabled, the IAM Policy created to run tasks won't include the task definition ARN, only the revision ARN.
The revision ARN is more specific than the task definition ARN. See https://docs.aws.amazon.com/step-functions/latest/dg/ecs-iam.html
for more details.


| Since | Default | Recommended |
| ----- | ----- | ----- |
| (not in v1) | | |
| V2NEXT | `false` | `true` |


<!-- END details -->
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-codebuild/lib/project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1843,7 +1843,7 @@ export class LinuxBuildImage implements IBuildImage {
* */
public static readonly AMAZON_LINUX_2_ARM_2 = LinuxArmBuildImage.AMAZON_LINUX_2_STANDARD_2_0;
/**
* Image "aws/codebuild/amazonlinux2-aarch64-standard:2.0".
* Image "aws/codebuild/amazonlinux2-aarch64-standard:3.0".
* @see {LinuxArmBuildImage.AMAZON_LINUX_2_STANDARD_3_0}
* */
public static readonly AMAZON_LINUX_2_ARM_3 = LinuxArmBuildImage.AMAZON_LINUX_2_STANDARD_3_0;
Expand Down
19 changes: 18 additions & 1 deletion packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ Flags come in three types:
| [@aws-cdk/pipelines:reduceAssetRoleTrustScope](#aws-cdkpipelinesreduceassetroletrustscope) | Remove the root account principal from PipelineAssetsFileRole trust policy | 2.141.0 | (default) |
| [@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm](#aws-cdkaws-ecsremovedefaultdeploymentalarm) | When enabled, remove default deployment alarm settings | 2.143.0 | (default) |
| [@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) |
| [@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) |

<!-- END table -->

Expand Down Expand Up @@ -133,7 +134,8 @@ The following json shows the current recommended set of flags, as `cdk init` wou
"@aws-cdk/aws-eks:nodegroupNameAttribute": true,
"@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
"@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
"@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false
"@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false,
"@aws-cdk/aws-stepfunctions-tasks:ecsReduceRunTaskPermissions": true
}
}
```
Expand Down Expand Up @@ -1356,4 +1358,19 @@ property from the event object.
| 2.145.0 | `false` | `false` |


### @aws-cdk/aws-stepfunctions-tasks:ecsReduceRunTaskPermissions

*When enabled, IAM Policy created to run tasks won't include the task definition ARN, only the revision ARN.* (fix)

When this feature flag is enabled, the IAM Policy created to run tasks won't include the task definition ARN, only the revision ARN.
The revision ARN is more specific than the task definition ARN. See https://docs.aws.amazon.com/step-functions/latest/dg/ecs-iam.html
for more details.


| Since | Default | Recommended |
| ----- | ----- | ----- |
| (not in v1) | | |
| V2NEXT | `false` | `true` |


<!-- END details -->
8 changes: 4 additions & 4 deletions packages/aws-cdk-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,17 @@
"@aws-sdk/node-http-handler": "^3.370.0",
"@aws-sdk/types": "^3.433.0",
"@smithy/util-stream": "^2.2.0",
"@types/aws-lambda": "^8.10.138",
"@types/aws-lambda": "^8.10.140",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.17.5",
"@types/punycode": "^2.1.4",
"@types/mime-types": "^2.1.4",
"@aws-cdk/lazify": "0.0.0",
"aws-sdk": "^2.1639.0",
"aws-sdk": "^2.1648.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.78",
"cdk8s": "2.68.82",
"constructs": "^10.0.0",
"delay": "5.0.0",
"esbuild": "^0.21.5",
Expand All @@ -184,7 +184,7 @@
"ts-mock-imports": "^1.3.16",
"ts-node": "^10.9.2",
"typescript": "~5.4.5",
"typescript-json-schema": "^0.63.0"
"typescript-json-schema": "^0.64.0"
},
"peerDependencies": {
"constructs": "^10.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The aws-cdk package includes the following third-party software/licensing:

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

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

----------------

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/node": "20.14.2",
"@types/node": "20.14.9",
"jest": "^29.7.0",
"ts-jest": "^29.1.4",
"ts-jest": "^29.1.5",
"aws-cdk": "%cdk-version%",
"ts-node": "^10.9.2",
"typescript": "~5.4.5"
"typescript": "~5.5.2"
},
"dependencies": {
"aws-cdk-lib": "%cdk-version%",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/node": "20.14.2",
"@types/node": "20.14.9",
"aws-cdk-lib": "%cdk-version%",
"constructs": "%constructs-version%",
"jest": "^29.7.0",
"ts-jest": "^29.1.4",
"typescript": "~5.4.5"
"ts-jest": "^29.1.5",
"typescript": "~5.5.2"
},
"peerDependencies": {
"aws-cdk-lib": "%cdk-version%",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/node": "20.14.2",
"@types/node": "20.14.9",
"jest": "^29.7.0",
"ts-jest": "^29.1.4",
"ts-jest": "^29.1.5",
"aws-cdk": "%cdk-version%",
"ts-node": "^10.9.2",
"typescript": "~5.4.5"
"typescript": "~5.5.2"
},
"dependencies": {
"aws-cdk-lib": "%cdk-version%",
Expand Down
8 changes: 4 additions & 4 deletions packages/aws-cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"make-runnable": "^1.4.1",
"nock": "^13.5.4",
"sinon": "^9.2.4",
"ts-jest": "^29.1.4",
"ts-jest": "^29.1.5",
"ts-mock-imports": "^1.3.16",
"xml-js": "^1.6.11"
},
Expand All @@ -100,9 +100,9 @@
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/region-info": "0.0.0",
"@jsii/check-node": "1.99.0",
"@jsii/check-node": "1.101.0",
"archiver": "^5.3.2",
"aws-sdk": "^2.1639.0",
"aws-sdk": "^2.1648.0",
"camelcase": "^6.3.0",
"cdk-assets": "0.0.0",
"cdk-from-cfn": "^0.162.0",
Expand All @@ -112,7 +112,7 @@
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
"json-diff": "^0.10.0",
"minimatch": "^9.0.4",
"minimatch": "^9.0.5",
"promptly": "^3.2.0",
"proxy-agent": "^6.4.0",
"semver": "^7.6.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/awslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"awslint": "bin/awslint"
},
"dependencies": {
"@jsii/spec": "1.99.0",
"@jsii/spec": "1.101.0",
"chalk": "^4",
"fs-extra": "^9.1.0",
"jsii-reflect": "1.99.0",
"jsii-reflect": "1.101.0",
"change-case": "^4.1.2",
"yargs": "^16.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cdk-assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@aws-cdk/cloud-assembly-schema": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"archiver": "^5.3.2",
"aws-sdk": "^2.1639.0",
"aws-sdk": "^2.1648.0",
"glob": "^7.2.3",
"mime": "^2.6.0",
"yargs": "^16.2.0"
Expand Down
10 changes: 5 additions & 5 deletions tools/@aws-cdk/cdk-build-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@
"glob": "^7.2.3",
"jest": "^29.7.0",
"jest-junit": "^13.2.0",
"jsii": "~5.4.21",
"jsii-rosetta": "~5.4.21",
"jsii-pacmak": "1.99.0",
"jsii-reflect": "1.99.0",
"jsii": "~5.4.23",
"jsii-rosetta": "~5.4.23",
"jsii-pacmak": "1.101.0",
"jsii-reflect": "1.101.0",
"markdownlint-cli": "^0.41.0",
"nyc": "^15.1.0",
"semver": "^7.6.2",
"ts-jest": "^29.1.4",
"ts-jest": "^29.1.5",
"typescript": "~5.4.5",
"yargs": "^16.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions version.v2.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "2.147.0",
"alphaVersion": "2.147.0-alpha.0"
"version": "2.147.1",
"alphaVersion": "2.147.1-alpha.0"
}
Loading

0 comments on commit 15e3e8e

Please sign in to comment.