chore: Easier way to delete snapshots for old AMIs (#728)

Author: kichik

src/image-builders/aws-image-builder/delete-resources.lambda.ts

@@ -1,4 +1,4 @@
-import { DeleteSnapshotCommand, DeregisterImageCommand, DescribeImagesCommand, EC2Client } from '@aws-sdk/client-ec2';
+import { DeregisterImageCommand, DescribeImagesCommand, EC2Client } from '@aws-sdk/client-ec2';
 import { BatchDeleteImageCommand, ECRClient } from '@aws-sdk/client-ecr';
 import { DeleteImageCommand, ImagebuilderClient, ListImageBuildVersionsCommand, ListImageBuildVersionsResponse } from '@aws-sdk/client-imagebuilder';
 import * as AWSLambda from 'aws-lambda';
@@ -69,21 +69,8 @@ async function deleteResources(props: DeleteResourcesProps) {
 
       await ec2.send(new DeregisterImageCommand({
         ImageId: imageId,
+        DeleteAssociatedSnapshots: true,
       }));
-
-      for (const blockMapping of imageDesc.Images[0].BlockDeviceMappings ?? []) {
-        if (blockMapping.Ebs?.SnapshotId) {
-          console.log({
-            notice: 'Deleting EBS snapshot',
-            image: imageId,
-            snapshot: blockMapping.Ebs.SnapshotId,
-          });
-
-          await ec2.send(new DeleteSnapshotCommand({
-            SnapshotId: blockMapping.Ebs.SnapshotId,
-          }));
-        }
-      }
     } catch (e) {
       console.warn({
         notice: 'Failed to delete AMI',

test/default.integ.snapshot/github-runners-test.assets.json

@@ -40,15 +40,15 @@
         }
       }
     },
-    "bfba719fe2a2764d7716a472198f4f8cbe46f6ea4616cd6ba0ebf26e75954814": {
+    "b97c8701d090be54cf447e094fd55ece7c99b860476949ee5db7ceca6eeb2f6a": {
       "source": {
-        "path": "asset.bfba719fe2a2764d7716a472198f4f8cbe46f6ea4616cd6ba0ebf26e75954814.lambda",
+        "path": "asset.b97c8701d090be54cf447e094fd55ece7c99b860476949ee5db7ceca6eeb2f6a.lambda",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "bfba719fe2a2764d7716a472198f4f8cbe46f6ea4616cd6ba0ebf26e75954814.zip",
+          "objectKey": "b97c8701d090be54cf447e094fd55ece7c99b860476949ee5db7ceca6eeb2f6a.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
@@ -222,15 +222,15 @@
         }
       }
     },
-    "e0e02d98917bef18a73321c2a05d5f726f5ce7d09a00013fd496365b722592e8": {
+    "3b80f113bf1080dd8be08e53a2fe41d076fb71707d73d9bec289feb062840add": {
       "source": {
         "path": "github-runners-test.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "e0e02d98917bef18a73321c2a05d5f726f5ce7d09a00013fd496365b722592e8.json",
+          "objectKey": "3b80f113bf1080dd8be08e53a2fe41d076fb71707d73d9bec289feb062840add.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

test/default.integ.snapshot/github-runners-test.template.json

@@ -10358,7 +10358,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "bfba719fe2a2764d7716a472198f4f8cbe46f6ea4616cd6ba0ebf26e75954814.zip"
+     "S3Key": "b97c8701d090be54cf447e094fd55ece7c99b860476949ee5db7ceca6eeb2f6a.zip"
     },
     "Description": "Custom resource handler that deletes resources of old versions of EC2 Image Builder images",
     "Environment": {