Merge branch 'main' into yuanhaoz/register-ap-southeast-5

mergify[bot] · web-flow · commit f4c41801bbae · 2025-02-20T21:18:00.000Z
diff --git a/.github/workflows/analytics-metadata-updater.yml b/.github/workflows/analytics-metadata-updater.yml
@@ -47,7 +47,14 @@ jobs:
         run: |
           git config --global user.name 'aws-cdk-automation'
           git config --global user.email 'aws-cdk-automation@users.noreply.github.com'
-          git checkout -B ${{ github.event.pull_request.head.ref }}
+
+          git fetch origin ${{ github.event.pull_request.head.ref }}
+
+          if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/${{ github.event.pull_request.head.ref }})" ]; then
+            echo "Remote branch updated since approved commit; aborting."
+            exit 1
+          fi
+
           git add .
           git commit -m "chore: update analytics metadata blueprints"
           git push origin ${{ github.event.pull_request.head.ref }}
diff --git a/.github/workflows/lambda-runtime-tests.yml b/.github/workflows/lambda-runtime-tests.yml
@@ -44,7 +44,14 @@ jobs:
         run: |
           git config --global user.name 'aws-cdk-automation'
           git config --global user.email 'aws-cdk-automation@users.noreply.github.com'
-          git checkout -B ${{ github.event.pull_request.head.ref }}
+
+          git fetch origin ${{ github.event.pull_request.head.ref }}
+
+          if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/${{ github.event.pull_request.head.ref }})" ]; then
+            echo "Remote branch updated since approved commit; aborting."
+            exit 1
+          fi
+
           git add .
           git commit -m "chore: update lambda runtime integration tests"
           git push origin ${{ github.event.pull_request.head.ref }}
diff --git a/package.json b/package.json
@@ -180,4 +180,4 @@
   "dependencies": {
     "string-width": "^4.2.3"
   }
-}
+}
diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json
@@ -76,7 +76,7 @@
     "@aws-sdk/client-cloudformation": "^3",
     "@aws-cdk/cloudformation-diff": "^2",
     "@aws-cdk/cx-api": "0.0.0",
-    "@aws-cdk/aws-service-spec": "^0.1.51",
+    "@aws-cdk/aws-service-spec": "^0.1.58",
     "cdk-assets": "3.0.0-rc.143",
     "@aws-cdk/cdk-cli-wrapper": "0.0.0",
     "aws-cdk": "^2",
diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/map-base.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/map-base.ts
@@ -117,7 +117,7 @@ export interface MapBaseOptions extends AssignableStateOptions {
 /**
  * Properties for defining a Map state
  */
-export interface MapBaseProps extends StateBaseProps, AssignableStateOptions, MapBaseOptions, MapBaseJsonPathOptions, MapBaseJsonataOptions {}
+export interface MapBaseProps extends StateBaseProps, MapBaseOptions, MapBaseJsonPathOptions, MapBaseJsonataOptions {}
 
 /**
  * Returns true if the value passed is a positive integer
diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json
@@ -136,7 +136,7 @@
   },
   "devDependencies": {
     "@aws-cdk/lambda-layer-kubectl-v31": "^2.0.0",
-    "@aws-cdk/aws-service-spec": "^0.1.51",
+    "@aws-cdk/aws-service-spec": "^0.1.58",
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/custom-resource-handlers": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
@@ -528,4 +528,4 @@
       "@aws-cdk/aws-kinesisfirehose-destinations-alpha": "*"
     }
   }
-}
+}
diff --git a/tools/@aws-cdk/spec2cdk/package.json b/tools/@aws-cdk/spec2cdk/package.json
@@ -32,9 +32,9 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-cdk/aws-service-spec": "^0.1.51",
-    "@aws-cdk/service-spec-importers": "^0.0.64",
-    "@aws-cdk/service-spec-types": "^0.0.117",
+    "@aws-cdk/aws-service-spec": "^0.1.58",
+    "@aws-cdk/service-spec-importers": "^0.0.68",
+    "@aws-cdk/service-spec-types": "^0.0.124",
     "@cdklabs/tskb": "^0.0.3",
     "@cdklabs/typewriter": "^0.0.3",
     "camelcase": "^6",
diff --git a/yarn.lock b/yarn.lock
@@ -66,6 +66,14 @@
     "@aws-cdk/service-spec-types" "^0.0.117"
     "@cdklabs/tskb" "^0.0.3"
 
+"@aws-cdk/aws-service-spec@^0.1.58":
+  version "0.1.58"
+  resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.58.tgz#c045bc2fa0045bc8fddbc4eee6fdb029b2c02a01"
+  integrity sha512-rgsYO7Z5R61G/UWq7oviY2pKivQ0aUEa2vc1QiBbXWAI1vO8+feGOUSnLMk76W92IuCAmpgiO4GAoDHe1pjcsw==
+  dependencies:
+    "@aws-cdk/service-spec-types" "^0.0.124"
+    "@cdklabs/tskb" "^0.0.3"
+
 "@aws-cdk/cloud-assembly-schema@^39.2.0":
   version "39.2.4"
   resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-39.2.4.tgz#97bf89da8e7ab38624ffb533901d0eea0efea16a"
@@ -132,12 +140,12 @@
   resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v32/-/lambda-layer-kubectl-v32-2.0.1.tgz#8f77f30f16161fc07f1e82688ae7fa618c9a6d4e"
   integrity sha512-kysjeU/A5axsSLYhOzrIZgzZoCY4z9R2cYo/l6s7QA8mKbes3plmOGBQCRSCVQN2MhnXNk/a0kZOEfDUpLQung==
 
-"@aws-cdk/service-spec-importers@^0.0.64":
-  version "0.0.64"
-  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.64.tgz#8e69644f627c838f8a6523fc6b5e63069fbd6656"
-  integrity sha512-8EGZaNkY9jUpFbc0h0TY5Knz/l1PcQo8NDxymoEiZqUrUFY0WD3CFCzlzgzlNyY9kpfJLvvbfzyM0q0nHRqaCg==
+"@aws-cdk/service-spec-importers@^0.0.68":
+  version "0.0.68"
+  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.68.tgz#89999b9c51f16f1c3c3c8d9d82ec0fd5a4507b23"
+  integrity sha512-XZKpOa/3tiUzpgfYgpw2RDyYhVVLWDacZFs0J7opq1n29cB71tnNm7R1jDAwGx1+MpDQZ/V6wrGf1N0MOTs5kA==
   dependencies:
-    "@aws-cdk/service-spec-types" "^0.0.117"
+    "@aws-cdk/service-spec-types" "^0.0.121"
     "@cdklabs/tskb" "^0.0.3"
     ajv "^6"
     canonicalize "^2.0.0"
@@ -155,6 +163,20 @@
   dependencies:
     "@cdklabs/tskb" "^0.0.3"
 
+"@aws-cdk/service-spec-types@^0.0.121":
+  version "0.0.121"
+  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.121.tgz#f9f2e91838bb93f48b98e1b8e29bc0cdacccc559"
+  integrity sha512-skPyQa4tV4ozC7wtMiJTjSR8mbJ7DQaheTkPxz0NRYUe7kNiGw2hnFzkTrFcMMFtwwLOzAtVxMsDlrVsa68GPA==
+  dependencies:
+    "@cdklabs/tskb" "^0.0.3"
+
+"@aws-cdk/service-spec-types@^0.0.124":
+  version "0.0.124"
+  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.124.tgz#672b7c95aca0e76b077e41bfb76aa00b0c45da9b"
+  integrity sha512-nCY2etLDv0ruhjltvT6zNyZ5PJIAa2qGuoBLGREYdNDn8/3AoHgKztyVSiw+L0xsJ/5+0JkFlL2DjvHo4dcdbw==
+  dependencies:
+    "@cdklabs/tskb" "^0.0.3"
+
 "@aws-crypto/crc32@5.2.0":
   version "5.2.0"
   resolved "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz#cfcc22570949c98c6689cfcbd2d693d36cdae2e1"

Original file line number	Diff line number	Diff line change
`@@ -180,4 +180,4 @@`
`180`	`180`	`"dependencies": {`
`181`	`181`	`"string-width": "^4.2.3"`
`182`	`182`	`}`
`183`		`-}`
	`183`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@`
`136`	`136`	`},`
`137`	`137`	`"devDependencies": {`
`138`	`138`	`"@aws-cdk/lambda-layer-kubectl-v31": "^2.0.0",`
`139`		`- "@aws-cdk/aws-service-spec": "^0.1.51",`
	`139`	`+ "@aws-cdk/aws-service-spec": "^0.1.58",`
`140`	`140`	`"@aws-cdk/cdk-build-tools": "0.0.0",`
`141`	`141`	`"@aws-cdk/custom-resource-handlers": "0.0.0",`
`142`	`142`	`"@aws-cdk/pkglint": "0.0.0",`
`@@ -528,4 +528,4 @@`
`528`	`528`	`"@aws-cdk/aws-kinesisfirehose-destinations-alpha": "*"`
`529`	`529`	`}`
`530`	`530`	`}`
`531`		`-}`
	`531`	`+}`