@cloudsnorkel/cdk-github-runners 0.11.6 → 0.12.0

package/assets/image-builders/aws-image-builder/delete-ami.lambda/index.js

@@ -64,7 +64,7 @@ async function customResourceRespond(event, responseStatus, reason, physicalReso
 
 // src/image-builders/aws-image-builder/delete-ami.lambda.ts
 var ec2 = new import_client_ec2.EC2Client();
-async function deleteAmis(launchTemplateId, stackName, builderName, deleteAll) {
+async function deleteAmis(stackName, builderName) {
   const images = await ec2.send(new import_client_ec2.DescribeImagesCommand({
     Owners: ["self"],
     Filters: [
@@ -81,20 +81,6 @@ async function deleteAmis(launchTemplateId, stackName, builderName, deleteAll) {
   let imagesToDelete = images.Images ?? [];
   console.log(`Found ${imagesToDelete.length} AMIs`);
   console.log(JSON.stringify(imagesToDelete.map((i) => i.ImageId)));
-  if (!deleteAll) {
-    const launchTemplates = await ec2.send(new import_client_ec2.DescribeLaunchTemplateVersionsCommand({
-      LaunchTemplateId: launchTemplateId,
-      Versions: ["$Default"]
-    }));
-    if (!launchTemplates.LaunchTemplateVersions) {
-      console.error(`Unable to describe launch template ${launchTemplateId}`);
-      return;
-    }
-    const launchTemplate = launchTemplates.LaunchTemplateVersions[0];
-    imagesToDelete = imagesToDelete.filter((i) => i.ImageId != launchTemplate.LaunchTemplateData?.ImageId);
-    imagesToDelete = imagesToDelete.filter((i) => i.CreationDate && Date.parse(i.CreationDate) < Date.now() - 1e3 * 60 * 60 * 48);
-    console.log(`${imagesToDelete.length} AMIs left after filtering by date and excluding AMI used by launch template`);
-  }
   for (const image of imagesToDelete) {
     if (!image.ImageId) {
       console.warn(`No image id? ${JSON.stringify(image)}`);
@@ -118,23 +104,18 @@ async function handler(event, context) {
   try {
     console.log(JSON.stringify({ ...event, ResponseURL: "..." }));
     switch (event.RequestType) {
-      case "Scheduled":
-        await deleteAmis(event.LaunchTemplateId, event.StackName, event.BuilderName, false);
-        return;
       case "Create":
       case "Update":
         await customResourceRespond(event, "SUCCESS", "OK", "DeleteAmis", {});
         break;
       case "Delete":
-        await deleteAmis("", event.ResourceProperties.StackName, event.ResourceProperties.BuilderName, true);
+        await deleteAmis(event.ResourceProperties.StackName, event.ResourceProperties.BuilderName);
         await customResourceRespond(event, "SUCCESS", "OK", event.PhysicalResourceId, {});
         break;
     }
   } catch (e) {
     console.error(e);
-    if (event.RequestType != "Scheduled") {
-      await customResourceRespond(event, "FAILED", e.message || "Internal Error", context.logStreamName, {});
-    }
+    await customResourceRespond(event, "FAILED", e.message || "Internal Error", context.logStreamName, {});
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/assets/image-builders/aws-image-builder/versioner.lambda/index.js

@@ -1196,9 +1196,9 @@ var require_yallist = __commonJS({
   }
 });
 
-// node_modules/semver/node_modules/lru-cache/index.js
+// node_modules/lru-cache/index.js
 var require_lru_cache = __commonJS({
-  "node_modules/semver/node_modules/lru-cache/index.js"(exports, module2) {
+  "node_modules/lru-cache/index.js"(exports, module2) {
     "use strict";
     var Yallist = require_yallist();
     var MAX = Symbol("max");

package/assets/{providers → image-builders}/build-image.lambda/index.js

@@ -17,14 +17,13 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/providers/build-image.lambda.ts
+// src/image-builders/build-image.lambda.ts
 var build_image_lambda_exports = {};
 __export(build_image_lambda_exports, {
   handler: () => handler
 });
 module.exports = __toCommonJS(build_image_lambda_exports);
 var import_client_codebuild = require("@aws-sdk/client-codebuild");
-var import_client_ecr = require("@aws-sdk/client-ecr");
 var import_client_imagebuilder = require("@aws-sdk/client-imagebuilder");
 
 // src/lambda-helpers.ts
@@ -64,15 +63,13 @@ async function customResourceRespond(event, responseStatus, reason, physicalReso
   });
 }
 
-// src/providers/build-image.lambda.ts
+// src/image-builders/build-image.lambda.ts
 var codebuild = new import_client_codebuild.CodeBuildClient();
-var ecr = new import_client_ecr.ECRClient();
 var ib = new import_client_imagebuilder.ImagebuilderClient();
 async function handler(event, context) {
   try {
     console.log(JSON.stringify({ ...event, ResponseURL: "..." }));
     const deleteOnly = event.ResourceProperties.DeleteOnly;
-    const repoName = event.ResourceProperties.RepoName;
     const projectName = event.ResourceProperties.ProjectName;
     const ibName = event.ResourceProperties.ImageBuilderName;
     switch (event.RequestType) {
@@ -110,15 +107,6 @@ async function handler(event, context) {
         }));
         break;
       case "Delete":
-        const ecrImages = await ecr.send(new import_client_ecr.ListImagesCommand({ repositoryName: repoName, maxResults: 100 }));
-        if (ecrImages.imageIds && ecrImages.imageIds.length > 0) {
-          await ecr.send(new import_client_ecr.BatchDeleteImageCommand({
-            imageIds: ecrImages.imageIds.map((i) => {
-              return { imageDigest: i.imageDigest };
-            }),
-            repositoryName: repoName
-          }));
-        }
         if (ibName) {
           const ibImages = await ib.send(new import_client_imagebuilder.ListImagesCommand({ filters: [{ name: "name", values: [ibName] }] }));
           if (ibImages.imageVersionList) {