fix(toolkit-cleaner): construct is using deprecated API (#261)

Fixes #260 BREAKING CHANGE: `cloudstructs` now requires `aws-cdk-lib` >= 2.133.0
jogold · Mar 15, 2024 · eb73513 · eb73513
1 parent 287a34d
commit eb73513
Show file tree

Hide file tree

Showing 20 changed files with 93 additions and 52 deletions.
diff --git a/.projen/deps.json b/.projen/deps.json
diff --git a/.projenrc.js b/.projenrc.js
@@ -6,7 +6,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
   authorName: 'Jonathan Goldwasser',
   description: 'High-level constructs for AWS CDK',
   jsiiVersion: '5.x',
-  cdkVersion: '2.112.0',
+  cdkVersion: '2.133.0',
   name: 'cloudstructs',
   repository: 'https://github.com/jogold/cloudstructs.git',
   peerDeps: [],

diff --git a/package.json b/package.json
diff --git a/src/toolkit-cleaner/index.ts b/src/toolkit-cleaner/index.ts
@@ -140,7 +140,7 @@ export class ToolkitCleaner extends Construct {
     const stateMachine = new sfn.StateMachine(this, 'Resource', {
       definitionBody: sfn.DefinitionBody.fromChainable(
         getStackNames
-          .next(stacksMap.iterator(extractTemplateHashes))
+          .next(stacksMap.itemProcessor(extractTemplateHashes))
           .next(flattenHashes)
           .next(new sfn.Parallel(this, 'Clean')
             .branch(cleanObjects)

diff --git a/test/codecommit-mirror/__snapshots__/codecommit-mirror.test.ts.snap b/test/codecommit-mirror/__snapshots__/codecommit-mirror.test.ts.snap
diff --git a/test/ecs-service-roller/__snapshots__/ecs-service-roller.test.ts.snap b/test/ecs-service-roller/__snapshots__/ecs-service-roller.test.ts.snap
diff --git a/test/saml-identity-provider/__snapshots__/saml-identity-provider.test.ts.snap b/test/saml-identity-provider/__snapshots__/saml-identity-provider.test.ts.snap
diff --git a/test/slack-app/__snapshots__/slack-app.test.ts.snap b/test/slack-app/__snapshots__/slack-app.test.ts.snap
diff --git a/test/slack-app/slack-app.integ.snapshot/slack-app-integ.assets.json b/test/slack-app/slack-app.integ.snapshot/slack-app-integ.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "35.0.0",
+  "version": "36.0.0",
   "files": {
     "ada9251e2af3daf198f52f17e3371cb1a7b8ab4b280eea60518707204911cb61": {
       "source": {
@@ -27,28 +27,28 @@
         }
       }
     },
-    "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94": {
+    "3542be390685e0c8353d92ccb5796d343cd93ca946b6b0de798004206a199adc": {
       "source": {
-        "path": "asset.7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94",
+        "path": "asset.3542be390685e0c8353d92ccb5796d343cd93ca946b6b0de798004206a199adc",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip",
+          "objectKey": "3542be390685e0c8353d92ccb5796d343cd93ca946b6b0de798004206a199adc.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     },
-    "72ff6fedcb1cc61d8db1c3d09860e1eb1026b801fc55b015028f951a7b97b1b6": {
+    "5e97e0c46d6a7dbfb6cf0f30788809ccaaa60f3cb27d263de0318d466556c92b": {
       "source": {
         "path": "slack-app-integ.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "72ff6fedcb1cc61d8db1c3d09860e1eb1026b801fc55b015028f951a7b97b1b6.json",
+          "objectKey": "5e97e0c46d6a7dbfb6cf0f30788809ccaaa60f3cb27d263de0318d466556c92b.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/test/slack-app/slack-app.integ.snapshot/slack-app-integ.template.json b/test/slack-app/slack-app.integ.snapshot/slack-app-integ.template.json
@@ -289,7 +289,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "7382a0addb9f34974a1ea6c6c9b063882af874828f366f5c93b2b7b64db15c94.zip"
+     "S3Key": "3542be390685e0c8353d92ccb5796d343cd93ca946b6b0de798004206a199adc.zip"
     },
     "Description": "AWS CDK resource provider framework - onEvent (slack-app-integ/SlackAppProvider/Resource)",
     "Environment": {

diff --git a/test/ssl-server-test/ssl-server-test.integ.snapshot/ssl-server-test-integ.assets.json b/test/ssl-server-test/ssl-server-test.integ.snapshot/ssl-server-test-integ.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "35.0.0",
+  "version": "36.0.0",
   "files": {
     "9db120688461d865c813bd640672ebde6708d8dd687df3a95923ad04d9c097c1": {
       "source": {

diff --git a/test/static-website/__snapshots__/static-website.test.ts.snap b/test/static-website/__snapshots__/static-website.test.ts.snap
diff --git a/test/toolkit-cleaner/toolkit-cleaner.integ.snapshot/toolkit-cleaner-integ.assets.json b/test/toolkit-cleaner/toolkit-cleaner.integ.snapshot/toolkit-cleaner-integ.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "35.0.0",
+  "version": "36.0.0",
   "files": {
     "95c924c84f5d023be4edee540cb2cb401a49f115d01ed403b288f6cb412771df": {
       "source": {
@@ -79,15 +79,15 @@
         }
       }
     },
-    "98847dde48fcfdf640649e0b6d6475dfbb32da6bf54a09507e02cb06c4fd11a8": {
+    "92f9cadfef0d55746244db5e99b1dedebf3f3423d3363b7ba6d201890151114a": {
       "source": {
         "path": "toolkit-cleaner-integ.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "98847dde48fcfdf640649e0b6d6475dfbb32da6bf54a09507e02cb06c4fd11a8.json",
+          "objectKey": "92f9cadfef0d55746244db5e99b1dedebf3f3423d3363b7ba6d201890151114a.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/test/toolkit-cleaner/toolkit-cleaner.integ.snapshot/toolkit-cleaner-integ.template.json b/test/toolkit-cleaner/toolkit-cleaner.integ.snapshot/toolkit-cleaner-integ.template.json
@@ -606,7 +606,7 @@
          "Arn"
         ]
        },
-       "\"},\"StacksMap\":{\"Type\":\"Map\",\"Next\":\"FlattenHashes\",\"ResultSelector\":{\"AssetHashes.$\":\"$\"},\"Iterator\":{\"StartAt\":\"ExtractTemplateHashes\",\"States\":{\"ExtractTemplateHashes\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"Lambda.ClientExecutionTimeoutException\",\"Lambda.ServiceException\",\"Lambda.AWSLambdaException\",\"Lambda.SdkClientException\"],\"IntervalSeconds\":2,\"MaxAttempts\":6,\"BackoffRate\":2},{\"ErrorEquals\":[\"Throttling\"]}],\"Type\":\"Task\",\"Resource\":\"",
+       "\"},\"StacksMap\":{\"Type\":\"Map\",\"Next\":\"FlattenHashes\",\"ResultSelector\":{\"AssetHashes.$\":\"$\"},\"ItemProcessor\":{\"ProcessorConfig\":{\"Mode\":\"INLINE\"},\"StartAt\":\"ExtractTemplateHashes\",\"States\":{\"ExtractTemplateHashes\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"Lambda.ClientExecutionTimeoutException\",\"Lambda.ServiceException\",\"Lambda.AWSLambdaException\",\"Lambda.SdkClientException\"],\"IntervalSeconds\":2,\"MaxAttempts\":6,\"BackoffRate\":2},{\"ErrorEquals\":[\"Throttling\"]}],\"Type\":\"Task\",\"Resource\":\"",
        {
         "Fn::GetAtt": [
          "ToolkitCleanerExtractTemplateHashesFunctionFFDFB6D1",

diff --git a/test/toolkit-cleaner/toolkit-cleaner.test.ts b/test/toolkit-cleaner/toolkit-cleaner.test.ts
@@ -28,7 +28,7 @@ test('ToolkitCleaner', () => {
               'Arn',
             ],
           },
-          '"},"StacksMap":{"Type":"Map","Next":"FlattenHashes","ResultSelector":{"AssetHashes.$":"$"},"Iterator":{"StartAt":"ExtractTemplateHashes","States":{"ExtractTemplateHashes":{"End":true,"Retry":[{"ErrorEquals":["Lambda.ClientExecutionTimeoutException","Lambda.ServiceException","Lambda.AWSLambdaException","Lambda.SdkClientException"],"IntervalSeconds":2,"MaxAttempts":6,"BackoffRate":2},{"ErrorEquals":["Throttling"]}],"Type":"Task","Resource":"',
+          '"},"StacksMap":{"Type":"Map","Next":"FlattenHashes","ResultSelector":{"AssetHashes.$":"$"},"ItemProcessor":{"ProcessorConfig":{"Mode":"INLINE"},"StartAt":"ExtractTemplateHashes","States":{"ExtractTemplateHashes":{"End":true,"Retry":[{"ErrorEquals":["Lambda.ClientExecutionTimeoutException","Lambda.ServiceException","Lambda.AWSLambdaException","Lambda.SdkClientException"],"IntervalSeconds":2,"MaxAttempts":6,"BackoffRate":2},{"ErrorEquals":["Throttling"]}],"Type":"Task","Resource":"',
           {
             'Fn::GetAtt': [
               'ToolkitCleanerExtractTemplateHashesFunctionFFDFB6D1',

diff --git a/test/url-shortener/__snapshots__/url-shortener.test.ts.snap b/test/url-shortener/__snapshots__/url-shortener.test.ts.snap
diff --git a/...r.integ.snapshot/edge-lambda-stack-c8e731c8ad0787291628b399d525c90dc78319b7d7.assets.json b/...r.integ.snapshot/edge-lambda-stack-c8e731c8ad0787291628b399d525c90dc78319b7d7.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "35.0.0",
+  "version": "36.0.0",
   "files": {
     "ef50eada816754194800ebd82b6d5459ee1af84a5fbdfcb142b289e893b6fa07": {
       "source": {

diff --git a/test/url-shortener/url-shortener.integ.snapshot/url-shortener-integ.assets.json b/test/url-shortener/url-shortener.integ.snapshot/url-shortener-integ.assets.json
@@ -1,15 +1,15 @@
 {
-  "version": "35.0.0",
+  "version": "36.0.0",
   "files": {
-    "7b6b79862e18ab4b409cd9030e927a51058675765b06850d741b81cd0477a00d": {
+    "820cf5767b52fe3ade2023551f65be59f6a5a1d6ffbb11bc6be66146f3c37d3c": {
       "source": {
-        "path": "asset.7b6b79862e18ab4b409cd9030e927a51058675765b06850d741b81cd0477a00d",
+        "path": "asset.820cf5767b52fe3ade2023551f65be59f6a5a1d6ffbb11bc6be66146f3c37d3c",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-eu-west-1": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1",
-          "objectKey": "7b6b79862e18ab4b409cd9030e927a51058675765b06850d741b81cd0477a00d.zip",
+          "objectKey": "820cf5767b52fe3ade2023551f65be59f6a5a1d6ffbb11bc6be66146f3c37d3c.zip",
           "region": "eu-west-1",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-eu-west-1"
         }
@@ -57,15 +57,15 @@
         }
       }
     },
-    "a8b50926121c6a8d85cc1623e72e0cdddea61d7cef33568a405e9a8a4d51be00": {
+    "50f7d578dfd0bad70f9fb546c7c1c4aa26ef6127c3cfb37e150f9c3807abe461": {
       "source": {
         "path": "url-shortener-integ.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-eu-west-1": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1",
-          "objectKey": "a8b50926121c6a8d85cc1623e72e0cdddea61d7cef33568a405e9a8a4d51be00.json",
+          "objectKey": "50f7d578dfd0bad70f9fb546c7c1c4aa26ef6127c3cfb37e150f9c3807abe461.json",
           "region": "eu-west-1",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-eu-west-1"
         }

diff --git a/test/url-shortener/url-shortener.integ.snapshot/url-shortener-integ.template.json b/test/url-shortener/url-shortener.integ.snapshot/url-shortener-integ.template.json
@@ -1015,7 +1015,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1"
      },
-     "S3Key": "7b6b79862e18ab4b409cd9030e927a51058675765b06850d741b81cd0477a00d.zip"
+     "S3Key": "820cf5767b52fe3ade2023551f65be59f6a5a1d6ffbb11bc6be66146f3c37d3c.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,