Merge branch 'main' into mrgrain/feat/cloudformation-diff-to-use-new-…

…servicespec

.github/workflows/spec-update.yml

@@ -30,11 +30,11 @@ jobs:
       - name: Install ncu tool
         run: npm -g install lerna npm-check-updates
       - name: Run "ncu" for service spec packages
-        run: lerna exec --parallel ncu -- --upgrade --filter='@aws-cdk/aws-service-spec,@aws-cdk/service-spec-types' --target=latest
+        run: lerna exec --parallel ncu -- --upgrade --filter='@aws-cdk/aws-service-spec,@aws-cdk/service-spec-importers,@aws-cdk/service-spec-types' --target=latest
 
       # This will ensure the current lockfile is up-to-date with the dependency specifications
       - name: Install latest version & update lockfile
-        run: yarn upgrade @aws-cdk/aws-service-spec @aws-cdk/service-spec-types
+        run: yarn upgrade @aws-cdk/aws-service-spec @aws-cdk/service-spec-importers @aws-cdk/service-spec-types
 
       # Build @aws-cdk/spec2cdk and run L1 gen script to generate base files for new modules
       - name: Build @aws-cdk/spec2cdk

tools/@aws-cdk/spec2cdk/package.json

@@ -33,7 +33,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-cdk/aws-service-spec": "^0.0.26",
-    "@aws-cdk/service-spec-importers": "^0.0.1",
+    "@aws-cdk/service-spec-importers": "^0.0.4",
     "@aws-cdk/service-spec-types": "^0.0.26",
     "@cdklabs/tskb": "^0.0.1",
     "@cdklabs/typewriter": "^0.0.2",

yarn.lock

@@ -68,13 +68,13 @@
   resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v24/-/lambda-layer-kubectl-v24-2.0.242.tgz#4273a5ad7714f933a7eba155eb9280823086db71"
   integrity sha512-7/wIOo685tmrEe4hh6zqDELhBZh5OQGf3Hd2FU2Vnwy2ZubW8qTmEw5gqJCsCrGKeYDoa1BcVhDRZ/nzjkaqyA==
 
-"@aws-cdk/service-spec-importers@^0.0.1":
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.1.tgz#9565d3c358e4b5237c778bee50f8591553846819"
-  integrity sha512-CyUWiNcyFxdLeqiWIfR22eOGV4BTFDn6p+qLeNdX21vzBk4WFNlJ1n5VI+Z44a2BJyrG4ckp0Vj4SFP9Q76Mjw==
+"@aws-cdk/service-spec-importers@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.4.tgz#b322d9f8d638fc25494593b2dd0b0ca23c57cbc7"
+  integrity sha512-KNrD6tB5phfw9PeY/upTygebN+Y/AHI5DtiD8BHzdy65lrqBoGruO4xs3JuPy3faRk46cPzwI7NHIPSLAHfE0Q==
   dependencies:
-    "@aws-cdk/service-spec-types" "^0.0.23"
-    "@cdklabs/tskb" "^0.0.2"
+    "@aws-cdk/service-spec-types" "^0.0.26"
+    "@cdklabs/tskb" "^0.0.3"
     ajv "^6"
     canonicalize "^2.0.0"
     chalk "^4"
@@ -84,13 +84,6 @@
     glob "^8"
     sort-json "^2.0.1"
 
-"@aws-cdk/service-spec-types@^0.0.23":
-  version "0.0.23"
-  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.23.tgz#b336c6e4cd50ea098b3e2728fb98bf8e8686dce7"
-  integrity sha512-oif4BCL7VczhdqA92kdvqjOO2LZcyma7pg0kpfjDgVAog3BCcTH0RJbjA0HXOvjSjlWh83t31SxVGLrhQ65gBg==
-  dependencies:
-    "@cdklabs/tskb" "^0.0.2"
-
 "@aws-cdk/service-spec-types@^0.0.26":
   version "0.0.26"
   resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.26.tgz#a00d43361767664bad022ad4e742d94cbf2f45e0"
@@ -2247,11 +2240,6 @@
   resolved "https://registry.npmjs.org/@cdklabs/tskb/-/tskb-0.0.1.tgz#dc2732703d8ef080369db5e7ad150223f60cc519"
   integrity sha512-UWJLIaMsu2a9cE40Gtopz2i7afkx6oEjWVT/rBLWlCT4QYvUEq1+Uqw1fBK4Q96fgPCwJNU7zeWlSz0PcjFx7A==
 
-"@cdklabs/tskb@^0.0.2":
-  version "0.0.2"
-  resolved "https://registry.npmjs.org/@cdklabs/tskb/-/tskb-0.0.2.tgz#bb39faf0375ee865eea48139be9802e35cc4264c"
-  integrity sha512-ZWPfM6U0XeiAPEUc+xwBBP0T8W1lFl1+cYL6zcPjT9c0tt0ijtSm952GLuZXzlDhu1YUMoMn3M+FJNbLqOCSEg==
-
 "@cdklabs/tskb@^0.0.3":
   version "0.0.3"
   resolved "https://registry.npmjs.org/@cdklabs/tskb/-/tskb-0.0.3.tgz#4b79846d9381eb1252ba85d5d20b7cd7d99b6ecb"