Merge branch 'main' into mask_output_in_provider_framework

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

@@ -58,7 +58,7 @@ jobs:
 env:
  OSDS_DEVS: >
  {
- "assignees":["indrora","khushail","hunhsieh"]
+ "assignees":["ashishdhingra","khushail","hunhsieh"]
  }
 
  AREA_AFFIXES: >
@@ -283,5 +283,6 @@ env:
  {"area":"@aws-cdk/triggers","keywords":["trigger","triggers"],"labels":["@aws-cdk/triggers"]},
  {"area":"@aws-cdk/integ-tests","keywords":["integ-tests", "integ"],"labels":["@aws-cdk/integ-tests"]},
  {"area":"@aws-cdk/integ-runner","keywords":["integ-runner"],"labels":["@aws-cdk/integ-runner"]},
- {"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]}
+ {"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]},
+ {"area":"@aws-cdk/aws-location-alpha", "keywords":["aws-location", "aws-location-alpha"],"labels":["@aws-cdk/aws-location-alpha"]}
  ]

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

@@ -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: |

CHANGELOG.v2.alpha.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https:/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.147.1-alpha.0](https:/aws/aws-cdk/compare/v2.147.0-alpha.0...v2.147.1-alpha.0) (2024-06-21)
+
 ## [2.147.0-alpha.0](https:/aws/aws-cdk/compare/v2.146.0-alpha.0...v2.147.0-alpha.0) (2024-06-20)
 
 

CHANGELOG.v2.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https:/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.147.1](https:/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:/aws/aws-cdk/issues/30440))" ([#30606](https:/aws/aws-cdk/issues/30606)) ([69eb617](https:/aws/aws-cdk/commit/69eb617b45b5c4e495901d367d85e1edeea57e69)), closes [#30600](https:/aws/aws-cdk/issues/30600)
+
 ## [2.147.0](https:/aws/aws-cdk/compare/v2.146.0...v2.147.0) (2024-06-20)
 
 

package.json

@@ -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"
  },

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

@@ -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",

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

@@ -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"
  },

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

@@ -773,7 +773,8 @@
  "CodeDeployGroupRole1D304F7A",
  "Arn"
  ]
- }
+ },
+ "TerminationHookEnabled": true
  }
  }
  },