@cloudsnorkel/cdk-github-runners 0.11.3 → 0.11.5

package/assets/idle-runner-repear.lambda/index.js

@@ -12865,7 +12865,6 @@ var require_cjs = __commonJS({
     };
     var AC = globalThis.AbortController;
     var AS = globalThis.AbortSignal;
-    var _a;
     if (typeof AC === "undefined") {
       AS = class AbortSignal {
         onabort;
@@ -12882,7 +12881,6 @@ var require_cjs = __commonJS({
         }
         signal = new AS();
         abort(reason) {
-          var _a2, _b;
           if (this.signal.aborted)
             return;
           this.signal.reason = reason;
@@ -12890,10 +12888,10 @@ var require_cjs = __commonJS({
           for (const fn of this.signal._onabort) {
             fn(reason);
           }
-          (_b = (_a2 = this.signal).onabort) == null ? void 0 : _b.call(_a2, reason);
+          this.signal.onabort?.(reason);
         }
       };
-      let printACPolyfillWarning = ((_a = PROCESS.env) == null ? void 0 : _a.LRU_CACHE_IGNORE_AC_WARNING) !== "1";
+      let printACPolyfillWarning = PROCESS.env?.LRU_CACHE_IGNORE_AC_WARNING !== "1";
       const warnACPolyfill = () => {
         if (!printACPolyfillWarning)
           return;
@@ -13548,7 +13546,6 @@ var require_cjs = __commonJS({
        * {@link LRUCache#delete}
        */
       set(k, v, setOptions = {}) {
-        var _a2, _b, _c;
         if (v === void 0) {
           this.delete(k);
           return this;
@@ -13586,10 +13583,10 @@ var require_cjs = __commonJS({
               oldVal.__abortController.abort(new Error("replaced"));
             } else if (!noDisposeOnSet) {
               if (this.#hasDispose) {
-                (_a2 = this.#dispose) == null ? void 0 : _a2.call(this, oldVal, k, "set");
+                this.#dispose?.(oldVal, k, "set");
               }
               if (this.#hasDisposeAfter) {
-                (_b = this.#disposed) == null ? void 0 : _b.push([oldVal, k, "set"]);
+                this.#disposed?.push([oldVal, k, "set"]);
               }
             }
             this.#removeItemSize(index);
@@ -13618,8 +13615,8 @@ var require_cjs = __commonJS({
         if (!noDisposeOnSet && this.#hasDisposeAfter && this.#disposed) {
           const dt = this.#disposed;
           let task;
-          while (task = dt == null ? void 0 : dt.shift()) {
-            (_c = this.#disposeAfter) == null ? void 0 : _c.call(this, ...task);
+          while (task = dt?.shift()) {
+            this.#disposeAfter?.(...task);
           }
         }
         return this;
@@ -13629,7 +13626,6 @@ var require_cjs = __commonJS({
        * `undefined` if cache is empty.
        */
       pop() {
-        var _a2;
         try {
           while (this.#size) {
             const val = this.#valList[this.#head];
@@ -13646,14 +13642,13 @@ var require_cjs = __commonJS({
           if (this.#hasDisposeAfter && this.#disposed) {
             const dt = this.#disposed;
             let task;
-            while (task = dt == null ? void 0 : dt.shift()) {
-              (_a2 = this.#disposeAfter) == null ? void 0 : _a2.call(this, ...task);
+            while (task = dt?.shift()) {
+              this.#disposeAfter?.(...task);
             }
           }
         }
       }
       #evict(free) {
-        var _a2, _b;
         const head = this.#head;
         const k = this.#keyList[head];
         const v = this.#valList[head];
@@ -13661,10 +13656,10 @@ var require_cjs = __commonJS({
           v.__abortController.abort(new Error("evicted"));
         } else if (this.#hasDispose || this.#hasDisposeAfter) {
           if (this.#hasDispose) {
-            (_a2 = this.#dispose) == null ? void 0 : _a2.call(this, v, k, "evict");
+            this.#dispose?.(v, k, "evict");
           }
           if (this.#hasDisposeAfter) {
-            (_b = this.#disposed) == null ? void 0 : _b.push([v, k, "evict"]);
+            this.#disposed?.push([v, k, "evict"]);
           }
         }
         this.#removeItemSize(head);
@@ -13739,7 +13734,7 @@ var require_cjs = __commonJS({
         }
         const ac = new AC();
         const { signal } = options;
-        signal == null ? void 0 : signal.addEventListener("abort", () => ac.abort(signal.reason), {
+        signal?.addEventListener("abort", () => ac.abort(signal.reason), {
           signal: ac.signal
         });
         const fetchOpts = {
@@ -13810,8 +13805,7 @@ var require_cjs = __commonJS({
           }
         };
         const pcall = (res, rej) => {
-          var _a2;
-          const fmp = (_a2 = this.#fetchMethod) == null ? void 0 : _a2.call(this, k, v, fetchOpts);
+          const fmp = this.#fetchMethod?.(k, v, fetchOpts);
           if (fmp && fmp instanceof Promise) {
             fmp.then((v2) => res(v2), rej);
           }
@@ -14000,7 +13994,6 @@ var require_cjs = __commonJS({
        * Returns true if the key was deleted, false otherwise.
        */
       delete(k) {
-        var _a2, _b, _c, _d;
         let deleted = false;
         if (this.#size !== 0) {
           const index = this.#keyMap.get(k);
@@ -14015,10 +14008,10 @@ var require_cjs = __commonJS({
                 v.__abortController.abort(new Error("deleted"));
               } else if (this.#hasDispose || this.#hasDisposeAfter) {
                 if (this.#hasDispose) {
-                  (_a2 = this.#dispose) == null ? void 0 : _a2.call(this, v, k, "delete");
+                  this.#dispose?.(v, k, "delete");
                 }
                 if (this.#hasDisposeAfter) {
-                  (_b = this.#disposed) == null ? void 0 : _b.push([v, k, "delete"]);
+                  this.#disposed?.push([v, k, "delete"]);
                 }
               }
               this.#keyMap.delete(k);
@@ -14037,11 +14030,11 @@ var require_cjs = __commonJS({
             }
           }
         }
-        if (this.#hasDisposeAfter && ((_c = this.#disposed) == null ? void 0 : _c.length)) {
+        if (this.#hasDisposeAfter && this.#disposed?.length) {
           const dt = this.#disposed;
           let task;
-          while (task = dt == null ? void 0 : dt.shift()) {
-            (_d = this.#disposeAfter) == null ? void 0 : _d.call(this, ...task);
+          while (task = dt?.shift()) {
+            this.#disposeAfter?.(...task);
           }
         }
         return deleted;
@@ -14050,7 +14043,6 @@ var require_cjs = __commonJS({
        * Clear the cache entirely, throwing away all values.
        */
       clear() {
-        var _a2, _b, _c;
         for (const index of this.#rindexes({ allowStale: true })) {
           const v = this.#valList[index];
           if (this.#isBackgroundFetch(v)) {
@@ -14058,10 +14050,10 @@ var require_cjs = __commonJS({
           } else {
             const k = this.#keyList[index];
             if (this.#hasDispose) {
-              (_a2 = this.#dispose) == null ? void 0 : _a2.call(this, v, k, "delete");
+              this.#dispose?.(v, k, "delete");
             }
             if (this.#hasDisposeAfter) {
-              (_b = this.#disposed) == null ? void 0 : _b.push([v, k, "delete"]);
+              this.#disposed?.push([v, k, "delete"]);
             }
           }
         }
@@ -14083,8 +14075,8 @@ var require_cjs = __commonJS({
         if (this.#hasDisposeAfter && this.#disposed) {
           const dt = this.#disposed;
           let task;
-          while (task = dt == null ? void 0 : dt.shift()) {
-            (_c = this.#disposeAfter) == null ? void 0 : _c.call(this, ...task);
+          while (task = dt?.shift()) {
+            this.#disposeAfter?.(...task);
           }
         }
       }
@@ -17496,20 +17488,20 @@ __export(idle_runner_repear_lambda_exports, {
   handler: () => handler
 });
 module.exports = __toCommonJS(idle_runner_repear_lambda_exports);
-var AWS2 = __toESM(require("aws-sdk"));
+var import_client_sfn = require("@aws-sdk/client-sfn");
 
 // src/lambda-github.ts
 var import_auth_app = __toESM(require_dist_node12());
 var import_rest = __toESM(require_dist_node19());
 
 // src/lambda-helpers.ts
-var AWS = __toESM(require("aws-sdk"));
-var sm = new AWS.SecretsManager();
+var import_client_secrets_manager = require("@aws-sdk/client-secrets-manager");
+var sm = new import_client_secrets_manager.SecretsManagerClient();
 async function getSecretValue(arn) {
   if (!arn) {
     throw new Error("Missing secret ARN");
   }
-  const secret = await sm.getSecretValue({ SecretId: arn }).promise();
+  const secret = await sm.send(new import_client_secrets_manager.GetSecretValueCommand({ SecretId: arn }));
   if (!secret.SecretString) {
     throw new Error(`No SecretString in ${arn}`);
   }
@@ -17576,14 +17568,22 @@ async function getOctokit(installationId) {
     githubSecrets
   };
 }
-async function getRunner(octokit, owner, repo, name) {
+async function getRunner(octokit, runnerLevel, owner, repo, name) {
   let page = 1;
   while (true) {
-    const runners = await octokit.request("GET /repos/{owner}/{repo}/actions/runners?per_page=100&page={page}", {
-      page,
-      owner,
-      repo
-    });
+    let runners;
+    if ((runnerLevel ?? "repo") === "repo") {
+      runners = await octokit.rest.actions.listSelfHostedRunnersForRepo({
+        page,
+        owner,
+        repo
+      });
+    } else {
+      runners = await octokit.rest.actions.listSelfHostedRunnersForOrg({
+        page,
+        org: owner
+      });
+    }
     if (runners.data.runners.length == 0) {
       return;
     }
@@ -17595,28 +17595,42 @@ async function getRunner(octokit, owner, repo, name) {
     page++;
   }
 }
+async function deleteRunner(octokit, runnerLevel, owner, repo, runnerId) {
+  if ((runnerLevel ?? "repo") === "repo") {
+    await octokit.rest.actions.deleteSelfHostedRunnerFromRepo({
+      owner,
+      repo,
+      runner_id: runnerId
+    });
+  } else {
+    await octokit.rest.actions.deleteSelfHostedRunnerFromOrg({
+      org: owner,
+      runner_id: runnerId
+    });
+  }
+}
 
 // src/idle-runner-repear.lambda.ts
-var sfn = new AWS2.StepFunctions();
+var sfn = new import_client_sfn.SFNClient();
 async function handler(event) {
   const result = { batchItemFailures: [] };
-  const octokitCache2 = {};
+  let octokitCache2;
+  let runnerLevel;
   for (const record of event.Records) {
     const input = JSON.parse(record.body);
     console.log(`Checking runner for ${input.owner}/${input.repo} [execution-id=${input.runnerName}]`);
     const retryLater = () => result.batchItemFailures.push({ itemIdentifier: record.messageId });
-    const execution = await sfn.describeExecution({ executionArn: input.executionArn }).promise();
+    const execution = await sfn.send(new import_client_sfn.DescribeExecutionCommand({ executionArn: input.executionArn }));
     if (execution.status != "RUNNING") {
       console.log("Runner already finished");
       continue;
     }
-    let octokit;
-    if (octokitCache2[input.installationId ?? -1]) {
-      octokit = octokitCache2[input.installationId ?? -1];
-    } else {
-      octokit = octokitCache2[input.installationId ?? -1] = (await getOctokit(input.installationId)).octokit;
+    if (!octokitCache2) {
+      const { octokit, githubSecrets } = await getOctokit(input.installationId);
+      octokitCache2 = octokit;
+      runnerLevel = githubSecrets.runnerLevel;
     }
-    const runner = await getRunner(octokit, input.owner, input.repo, input.runnerName);
+    const runner = await getRunner(octokitCache2, runnerLevel, input.owner, input.repo, input.runnerName);
     if (!runner) {
       console.error(`Runner not running yet for ${input.owner}/${input.repo}:${input.runnerName}`);
       retryLater();
@@ -17639,11 +17653,11 @@ async function handler(event) {
           console.log(`Runner ${input.runnerName} is idle for too long`);
           try {
             console.log(`Stopping step function ${input.executionArn}...`);
-            await sfn.stopExecution({
+            await sfn.send(new import_client_sfn.StopExecutionCommand({
               executionArn: input.executionArn,
               error: "IdleRunner",
               cause: `Runner ${input.runnerName} on ${input.owner}/${input.repo} is idle for too long (${diffMs / 1e3} seconds and limit is ${input.maxIdleSeconds} seconds)`
-            }).promise();
+            }));
           } catch (e) {
             console.error(`Failed to stop step function ${input.executionArn}: ${e}`);
             retryLater();
@@ -17651,11 +17665,7 @@ async function handler(event) {
           }
           try {
             console.log(`Deleting runner ${runner.id}...`);
-            await octokit.rest.actions.deleteSelfHostedRunnerFromRepo({
-              owner: input.owner,
-              repo: input.repo,
-              runner_id: runner.id
-            });
+            await deleteRunner(octokitCache2, runnerLevel, input.owner, input.repo, runner.id);
           } catch (e) {
             console.error(`Failed to delete runner ${runner.id}: ${e}`);
             retryLater();

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/image-builders/aws-image-builder/delete-ami.lambda.ts
@@ -33,11 +23,11 @@ __export(delete_ami_lambda_exports, {
   handler: () => handler
 });
 module.exports = __toCommonJS(delete_ami_lambda_exports);
-var AWS2 = __toESM(require("aws-sdk"));
+var import_client_ec2 = require("@aws-sdk/client-ec2");
 
 // src/lambda-helpers.ts
-var AWS = __toESM(require("aws-sdk"));
-var sm = new AWS.SecretsManager();
+var import_client_secrets_manager = require("@aws-sdk/client-secrets-manager");
+var sm = new import_client_secrets_manager.SecretsManagerClient();
 async function customResourceRespond(event, responseStatus, reason, physicalResourceId, data) {
   const responseBody = JSON.stringify({
     Status: responseStatus,
@@ -73,10 +63,9 @@ async function customResourceRespond(event, responseStatus, reason, physicalReso
 }
 
 // src/image-builders/aws-image-builder/delete-ami.lambda.ts
-var ec2 = new AWS2.EC2();
+var ec2 = new import_client_ec2.EC2Client();
 async function deleteAmis(launchTemplateId, stackName, builderName, deleteAll) {
-  var _a;
-  const images = await ec2.describeImages({
+  const images = await ec2.send(new import_client_ec2.DescribeImagesCommand({
     Owners: ["self"],
     Filters: [
       {
@@ -88,24 +77,21 @@ async function deleteAmis(launchTemplateId, stackName, builderName, deleteAll) {
         Values: [builderName]
       }
     ]
-  }).promise();
+  }));
   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.describeLaunchTemplateVersions({
+    const launchTemplates = await ec2.send(new import_client_ec2.DescribeLaunchTemplateVersionsCommand({
       LaunchTemplateId: launchTemplateId,
       Versions: ["$Default"]
-    }).promise();
+    }));
     if (!launchTemplates.LaunchTemplateVersions) {
       console.error(`Unable to describe launch template ${launchTemplateId}`);
       return;
     }
     const launchTemplate = launchTemplates.LaunchTemplateVersions[0];
-    imagesToDelete = imagesToDelete.filter((i) => {
-      var _a2;
-      return i.ImageId != ((_a2 = launchTemplate.LaunchTemplateData) == null ? void 0 : _a2.ImageId);
-    });
+    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`);
   }
@@ -115,15 +101,15 @@ async function deleteAmis(launchTemplateId, stackName, builderName, deleteAll) {
       continue;
     }
     console.log(`Deregistering ${image.ImageId}`);
-    await ec2.deregisterImage({
+    await ec2.send(new import_client_ec2.DeregisterImageCommand({
       ImageId: image.ImageId
-    }).promise();
+    }));
     for (const blockMapping of image.BlockDeviceMappings ?? []) {
-      if ((_a = blockMapping.Ebs) == null ? void 0 : _a.SnapshotId) {
+      if (blockMapping.Ebs?.SnapshotId) {
         console.log(`Deleting ${blockMapping.Ebs.SnapshotId}`);
-        await ec2.deleteSnapshot({
+        await ec2.send(new import_client_ec2.DeleteSnapshotCommand({
           SnapshotId: blockMapping.Ebs.SnapshotId
-        }).promise();
+        }));
       }
     }
   }

package/assets/image-builders/aws-image-builder/filter-failed-builds.lambda/index.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/image-builders/aws-image-builder/filter-failed-builds.lambda.ts
@@ -33,17 +23,17 @@ __export(filter_failed_builds_lambda_exports, {
   handler: () => handler
 });
 module.exports = __toCommonJS(filter_failed_builds_lambda_exports);
-var AWS = __toESM(require("aws-sdk"));
-var sns = new AWS.SNS();
+var import_client_sns = require("@aws-sdk/client-sns");
+var sns = new import_client_sns.SNSClient();
 async function handler(event) {
   console.log(JSON.stringify(event));
   for (const record of event.Records) {
     let message = JSON.parse(record.Sns.Message);
     if (message.state.status === "FAILED") {
-      await sns.publish({
+      await sns.send(new import_client_sns.PublishCommand({
         TopicArn: process.env.TARGET_TOPIC_ARN,
         Message: record.Sns.Message
-      }).promise();
+      }));
     }
   }
 }

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/image-builders/aws-image-builder/reaper.lambda.ts
@@ -33,10 +23,12 @@ __export(reaper_lambda_exports, {
   handler: () => handler
 });
 module.exports = __toCommonJS(reaper_lambda_exports);
-var AWS = __toESM(require("aws-sdk"));
-var ec2 = new AWS.EC2();
-var ecr = new AWS.ECR();
-var ib = new AWS.Imagebuilder();
+var import_client_ec2 = require("@aws-sdk/client-ec2");
+var import_client_ecr = require("@aws-sdk/client-ecr");
+var import_client_imagebuilder = require("@aws-sdk/client-imagebuilder");
+var ec2 = new import_client_ec2.EC2Client();
+var ecr = new import_client_ecr.ECRClient();
+var ib = new import_client_imagebuilder.ImagebuilderClient();
 async function iterateImageVersions(imageName) {
   let result = [];
   let params = {
@@ -49,7 +41,7 @@ async function iterateImageVersions(imageName) {
     ]
   };
   while (true) {
-    const response = await ib.listImages(params).promise();
+    const response = await ib.send(new import_client_imagebuilder.ListImagesCommand(params));
     if (response.imageVersionList) {
       for (const imageVersion of response.imageVersionList) {
         if (imageVersion.arn) {
@@ -65,16 +57,15 @@ async function iterateImageVersions(imageName) {
   return result;
 }
 async function iterateImageBuildVersions(imageVersionArn) {
-  var _a;
   let result = [];
   let params = {
     imageVersionArn
   };
   while (true) {
-    const response = await ib.listImageBuildVersions(params).promise();
+    const response = await ib.send(new import_client_imagebuilder.ListImageBuildVersionsCommand(params));
     if (response.imageSummaryList) {
       for (const imageBuildVersion of response.imageSummaryList) {
-        if (((_a = imageBuildVersion.state) == null ? void 0 : _a.status) !== "AVAILABLE") {
+        if (imageBuildVersion.state?.status !== "AVAILABLE") {
           console.log(`${imageBuildVersion.arn} is still being created, so we can't delete it`);
           continue;
         }
@@ -89,7 +80,6 @@ async function iterateImageBuildVersions(imageVersionArn) {
   return result;
 }
 async function amisGone(amis) {
-  var _a;
   if (!amis) {
     console.log("No AMIs found, so we can delete the image version build");
     return true;
@@ -101,10 +91,10 @@ async function amisGone(amis) {
       continue;
     }
     try {
-      const response = await ec2.describeImages({
+      const response = await ec2.send(new import_client_ec2.DescribeImagesCommand({
         ImageIds: [ami.image]
-      }).promise();
-      if (((_a = response.Images) == null ? void 0 : _a.length) ?? 0 > 0) {
+      }));
+      if (response.Images?.length ?? 0 > 0) {
         console.log("AMI still available, so we can't delete it");
         return false;
       }
@@ -119,7 +109,6 @@ async function amisGone(amis) {
   return true;
 }
 async function dockerImagesGone(dockerImages) {
-  var _a;
   if (!dockerImages) {
     console.log("No docker images, so we can delete the image version build");
     return true;
@@ -133,12 +122,12 @@ async function dockerImagesGone(dockerImages) {
       }
       console.log(`Checking if ${repoName}:${version} exists`);
       try {
-        const response = await ecr.describeImages({
+        const response = await ecr.send(new import_client_ecr.DescribeImagesCommand({
           repositoryName: repoName,
           imageIds: [{ imageTag: version }]
-        }).promise();
+        }));
         if (response.imageDetails && response.imageDetails.length > 0) {
-          if ((_a = response.imageDetails[0].imageTags) == null ? void 0 : _a.includes("latest")) {
+          if (response.imageDetails[0].imageTags?.includes("latest")) {
             console.log(`Docker image ${repoName}:${version} still available and tagged latest, so we can't delete it`);
             return false;
           }
@@ -155,18 +144,17 @@ async function dockerImagesGone(dockerImages) {
   return true;
 }
 async function handler(event, _context) {
-  var _a, _b;
   for (const imageVersion of await iterateImageVersions(event.RecipeName)) {
     for (const imageBuildVersion of await iterateImageBuildVersions(imageVersion)) {
       if (!imageBuildVersion.arn) {
         continue;
       }
       console.log(`Checking ${imageBuildVersion.name}/${imageBuildVersion.version}`);
-      if (await amisGone((_a = imageBuildVersion.outputResources) == null ? void 0 : _a.amis) && await dockerImagesGone((_b = imageBuildVersion.outputResources) == null ? void 0 : _b.containers)) {
+      if (await amisGone(imageBuildVersion.outputResources?.amis) && await dockerImagesGone(imageBuildVersion.outputResources?.containers)) {
         console.log("Deleting image version build", imageBuildVersion.arn);
-        await ib.deleteImage({
+        await ib.send(new import_client_imagebuilder.DeleteImageCommand({
           imageBuildVersionArn: imageBuildVersion.arn
-        }).promise();
+        }));
       }
     }
   }