Merge branch 'main' into sfn-bedrock-guardrail-trace

CHANGELOG.v2.alpha.md

@@ -2,6 +2,10 @@
 
 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.3-alpha.0](https://github.com/aws/aws-cdk/compare/v2.147.2-alpha.0...v2.147.3-alpha.0) (2024-07-01)
+
+## [2.147.2-alpha.0](https://github.com/aws/aws-cdk/compare/v2.147.1-alpha.0...v2.147.2-alpha.0) (2024-06-27)
+
 ## [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)

CHANGELOG.v2.md

@@ -2,12 +2,26 @@
 
 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.3](https://github.com/aws/aws-cdk/compare/v2.147.2...v2.147.3) (2024-07-01)
+
+
+### Bug Fixes
+
+* **lambda-nodejs:** breaking change in esbuild causes import module error ([#30726](https://github.com/aws/aws-cdk/issues/30726)) ([06c14b1](https://github.com/aws/aws-cdk/commit/06c14b16d04353e9e108b58edc1450d018c24b12)), closes [#30717](https://github.com/aws/aws-cdk/issues/30717)
+
+## [2.147.2](https://github.com/aws/aws-cdk/compare/v2.147.1...v2.147.2) (2024-06-27)
+
+
+### Reverts
+
+* fix(core): overrideLogicalId validation ([#29708](https://github.com/aws/aws-cdk/pull/29708)) ([b196b13](https://github.com/aws/aws-cdk/commit/b196b13b0b8a54dcacadf87fdbe744772a6e6c4d))
+
 ## [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)
+* route53 CrossAccountZoneDelegationRecord fails at deployment time with imported `delegatedZone` ([#30440](https://github.com/aws/aws-cdk/issues/30440)) ([a3d9b10](https://github.com/aws/aws-cdk/commit/a3d9b10ad9036486961f74e852493aa9684cfdb4))
 
 ## [2.147.0](https://github.com/aws/aws-cdk/compare/v2.146.0...v2.147.0) (2024-06-20)
 

CONTRIBUTORS.md

@@ -13,8 +13,8 @@ Shout out to our top contributors!
 - [otaviomacedo](https://github.com/otaviomacedo)
 - [mrgrain](https://github.com/mrgrain)
 - [madeline-k](https://github.com/madeline-k)
-- [comcalvi](https://github.com/comcalvi)
 - [pahud](https://github.com/pahud)
+- [comcalvi](https://github.com/comcalvi)
 - [NetaNir](https://github.com/NetaNir)
 - [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
 - [robertd](https://github.com/robertd)
@@ -25,8 +25,8 @@ Shout out to our top contributors!
 - [colifran](https://github.com/colifran)
 - [msambol](https://github.com/msambol)
 - [nija-at](https://github.com/nija-at)
-- [hoegertn](https://github.com/hoegertn)
 - [watany-dev](https://github.com/watany-dev)
+- [hoegertn](https://github.com/hoegertn)
 
 
-_Last updated: Sat, 01 Jun 24 00:09:37 +0000_
+_Last updated: Mon, 01 Jul 24 00:11:02 +0000_

package.json

@@ -15,12 +15,12 @@
     "build-all": "tsc -b"
   },
   "devDependencies": {
-    "@nx/workspace": "^19.3.1",
+    "@nx/workspace": "^19.4.0",
     "@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.8",
+    "cdk-generate-synthetic-examples": "^0.2.9",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.11",
@@ -29,7 +29,7 @@
     "jsii-pacmak": "1.101.0",
     "jsii-reflect": "1.101.0",
     "lerna": "^8.1.5",
-    "nx": "^19.3.1",
+    "nx": "^19.4.0",
     "patch-package": "^6.5.1",
     "semver": "^7.6.2",
     "standard-version": "^9.5.0",

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

@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1648.0",
+    "aws-sdk": "^2.1653.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.1648.0",
+    "aws-sdk": "^2.1653.0",
     "aws-sdk-mock": "5.6.0",
-    "cdk8s": "2.68.82",
+    "cdk8s": "2.68.85",
     "cdk8s-plus-27": "2.9.5",
     "constructs": "^10.0.0"
   },

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.restapi.access-log-firehose.js.snapshot/test-apigateway-access-logs-firehose.template.json

@@ -113,7 +113,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "96ea260348625427bb7f28ab3b379f62da6f428bcd155cb13f9261aa6a404b0d.zip"
+     "S3Key": "44e9c4d7a5d3fd2d677e1a7e416b2b56f6b0104bd5eff9cac5557b4c65a9dc61.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,
@@ -333,9 +333,18 @@
    "ap-southeast-4": {
     "value": "nodejs20.x"
    },
+   "ap-southeast-5": {
+    "value": "nodejs20.x"
+   },
+   "ap-southeast-7": {
+    "value": "nodejs20.x"
+   },
    "ca-central-1": {
     "value": "nodejs20.x"
    },
+   "ca-west-1": {
+    "value": "nodejs20.x"
+   },
    "cn-north-1": {
     "value": "nodejs18.x"
    },
@@ -348,6 +357,9 @@
    "eu-central-2": {
     "value": "nodejs20.x"
    },
+   "eu-isoe-west-1": {
+    "value": "nodejs18.x"
+   },
    "eu-north-1": {
     "value": "nodejs20.x"
    },
@@ -375,6 +387,9 @@
    "me-south-1": {
     "value": "nodejs20.x"
    },
+   "mx-central-1": {
+    "value": "nodejs20.x"
+   },
    "sa-east-1": {
     "value": "nodejs20.x"
    },

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-logmetrics.js.snapshot/AppSyncLogMetrics.template.json

@@ -241,9 +241,18 @@
    "ap-southeast-4": {
     "value": "nodejs20.x"
    },
+   "ap-southeast-5": {
+    "value": "nodejs20.x"
+   },
+   "ap-southeast-7": {
+    "value": "nodejs20.x"
+   },
    "ca-central-1": {
     "value": "nodejs20.x"
    },
+   "ca-west-1": {
+    "value": "nodejs20.x"
+   },
    "cn-north-1": {
     "value": "nodejs18.x"
    },
@@ -256,6 +265,9 @@
    "eu-central-2": {
     "value": "nodejs20.x"
    },
+   "eu-isoe-west-1": {
+    "value": "nodejs18.x"
+   },
    "eu-north-1": {
     "value": "nodejs20.x"
    },
@@ -283,6 +295,9 @@
    "me-south-1": {
     "value": "nodejs20.x"
    },
+   "mx-central-1": {
+    "value": "nodejs20.x"
+   },
    "sa-east-1": {
     "value": "nodejs20.x"
    },