Skip to content

Commit 22df5ac

Browse files
authored
Merge branch 'main' into mask_output_in_provider_framework
2 parents 4104a8e + 1ad41e7 commit 22df5ac

File tree

81 files changed

+4188
-2819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+4188
-2819
lines changed

.github/workflows/issue-label-assign.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
env:
5959
OSDS_DEVS: >
6060
{
61-
"assignees":["indrora","khushail","hunhsieh"]
61+
"assignees":["ashishdhingra","khushail","hunhsieh"]
6262
}
6363
6464
AREA_AFFIXES: >
@@ -283,5 +283,6 @@ env:
283283
{"area":"@aws-cdk/triggers","keywords":["trigger","triggers"],"labels":["@aws-cdk/triggers"]},
284284
{"area":"@aws-cdk/integ-tests","keywords":["integ-tests", "integ"],"labels":["@aws-cdk/integ-tests"]},
285285
{"area":"@aws-cdk/integ-runner","keywords":["integ-runner"],"labels":["@aws-cdk/integ-runner"]},
286-
{"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]}
286+
{"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]},
287+
{"area":"@aws-cdk/aws-location-alpha", "keywords":["aws-location", "aws-location-alpha"],"labels":["@aws-cdk/aws-location-alpha"]}
287288
]

.github/workflows/request-cli-integ-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020
- name: Find changed cli files
2121
id: changed-cli-files
22-
uses: tj-actions/changed-files@d6babd6899969df1a11d14c368283ea4436bca78
22+
uses: tj-actions/changed-files@cc733854b1f224978ef800d29e4709d5ee2883e4
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |

CHANGELOG.v2.alpha.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
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.
44

5+
## [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)
6+
57
## [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)
68

79

CHANGELOG.v2.md

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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.
44

5+
## [2.147.1](https://github.com/aws/aws-cdk/compare/v2.147.0...v2.147.1) (2024-06-21)
6+
7+
8+
### Reverts
9+
10+
* 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)
11+
512
## [2.147.0](https://github.com/aws/aws-cdk/compare/v2.146.0...v2.147.0) (2024-06-20)
613

714

package.json

+8-8
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.101.0",
29+
"jsii-pacmak": "1.101.0",
30+
"jsii-reflect": "1.101.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
},

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-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/aws-cdk-codedeploy-server-dg.assets.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/aws-cdk-codedeploy-server-dg.template.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,8 @@
773773
"CodeDeployGroupRole1D304F7A",
774774
"Arn"
775775
]
776-
}
776+
},
777+
"TerminationHookEnabled": true
777778
}
778779
}
779780
},

packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/cdk.out

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/integ.json

+5-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/integdeploymentgroupDefaultTestDeployAssert282ECB20.assets.json

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/integdeploymentgroupDefaultTestDeployAssert282ECB20.template.json

+36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/manifest.json

+43-58
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)