@cloudsnorkel/cdk-github-runners 0.14.24 → 0.15.0

package/README.md

@@ -34,6 +34,7 @@ Ephemeral (or on-demand) runners are the [recommended way by GitHub][14] for aut
 - [Customizing](#customizing)
   - [Composite Providers](#composite-providers)
   - [Custom Provider Selection](#custom-provider-selection)
+  - [Warm Runners](#warm-runners)
 - [Examples](#examples)
 - [Architecture](#architecture)
 - [Troubleshooting](#troubleshooting)
@@ -463,12 +464,62 @@ const providerSelector = new Function(this, 'provider-selector', {
 * ⚠️ **No guarantee of assignment**: Provider selection only determines which provider will provision a runner. GitHub Actions may still route the job to any available runner with matching labels. For reliable provider assignment, consider repo-level runner registration (the default).
 * ⚡ **Performance**: The selector runs synchronously during webhook processing. Keep it fast and efficient—the webhook has a 30-second timeout total.
 
+### Warm Runners
+
+Warm runners are pre-provisioned and stay idle until a job arrives, reducing startup latency. Use `AlwaysOnWarmRunner` for 24/7 pools or `ScheduledWarmRunner` for time-windowed pools. You specify the provider directly.
+
+```typescript
+import { AlwaysOnWarmRunner, CodeBuildRunnerProvider, GitHubRunners } from '@cloudsnorkel/cdk-github-runners';
+
+const provider = new CodeBuildRunnerProvider(this, 'provider', { labels: ['codebuild', 'linux'] });
+const runners = new GitHubRunners(this, 'runners', { providers: [provider] });
+
+new AlwaysOnWarmRunner(this, 'warm', {
+  runners,
+  provider,
+  count: 2,
+  owner: 'my-org',
+  repo: 'my-repo',
+});
+```
+
+Warm runner pools can be stacked. If you want 2 warm runners always available but 3 during peak work hours, you can create one pool with 2 runners always on and another pool with 1 runner during work hours.
+
+```typescript
+import { aws_events as events, Duration } from 'aws-cdk-lib';
+import { AlwaysOnWarmRunner, ScheduledWarmRunner, CodeBuildRunnerProvider, GitHubRunners } from '@cloudsnorkel/cdk-github-runners';
+
+const provider = new CodeBuildRunnerProvider(this, 'provider', { labels: ['codebuild', 'linux'] });
+const runners = new GitHubRunners(this, 'runners', { providers: [provider] });
+
+new AlwaysOnWarmRunner(this, 'warm', {
+  runners,
+  provider,
+  count: 2,
+  owner: 'my-org',
+  repo: 'my-repo',
+});
+
+new ScheduledWarmRunner(this, 'work hours warm', {
+  runners,
+  provider,
+  count: 1,
+  owner: 'my-org',
+  repo: 'my-repo',
+  schedule: events.Schedule.cron({ hour: '13', minute: '0', weekDay: 'MON-FRI' }),
+  duration: Duration.hours(2),
+});
+```
+
+See the [warm-runners example](examples/typescript/warm-runners/) for a complete setup.
+
 ## Examples
 
 We provide comprehensive examples in the [`examples/`](examples/) folder to help you get started quickly:
 
 ### Getting Started
 - **[Simple CodeBuild](examples/typescript/simple-codebuild/)** - Basic setup with just a CodeBuild provider (also available in [Python](examples/python/simple-codebuild/))
+- **[Warm Runners](examples/typescript/warm-runners/)** - Pre-provisioned runners for low-latency job starts (also available in [Python](examples/python/warm-runners/))
 
 ### Provider Configuration
 - **[Composite Provider](examples/typescript/composite-provider/)** - Fallback and weighted distribution strategies (also available in [Python](examples/python/composite-provider/))
@@ -489,6 +540,7 @@ We provide comprehensive examples in the [`examples/`](examples/) folder to help
 
 ### Customization
 - **[Add Software](examples/typescript/add-software/)** - Add custom software to runner images (also available in [Python](examples/python/add-software/))
+- **[GPU](examples/typescript/gpu/)** - GPU support with NVIDIA drivers across EC2, CodeBuild, and ECS (also available in [Python](examples/python/gpu/))
 
 ### Enterprise & Monitoring
 - **[GHES](examples/typescript/ghes/)** - Configure runners for GitHub Enterprise Server (also available in [Python](examples/python/ghes/))

package/assets/delete-failed-runner.lambda/index.js

@@ -300,7 +300,7 @@ function isKeyOperator(operator) {
 function getValues(context, operator, key, modifier) {
   var value = context[key], result = [];
   if (isDefined(value) && value !== "") {
-    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    if (typeof value === "string" || typeof value === "number" || typeof value === "bigint" || typeof value === "boolean") {
       value = value.toString();
       if (modifier && modifier !== "*") {
         value = value.substring(0, parseInt(modifier, 10));
@@ -595,6 +595,98 @@ var require_fast_content_type_parse = __commonJS({
   }
 });
 
+// node_modules/json-with-bigint/json-with-bigint.js
+var intRegex, noiseValue, originalStringify, originalParse, customFormat, bigIntsStringify, noiseStringify, JSONStringify, isContextSourceSupported, convertMarkedBigIntsReviver, JSONParseV2, MAX_INT, MAX_DIGITS, stringsOrLargeNumbers, noiseValueWithQuotes, JSONParse;
+var init_json_with_bigint = __esm({
+  "node_modules/json-with-bigint/json-with-bigint.js"() {
+    "use strict";
+    intRegex = /^-?\d+$/;
+    noiseValue = /^-?\d+n+$/;
+    originalStringify = JSON.stringify;
+    originalParse = JSON.parse;
+    customFormat = /^-?\d+n$/;
+    bigIntsStringify = /([\[:])?"(-?\d+)n"($|([\\n]|\s)*(\s|[\\n])*[,\}\]])/g;
+    noiseStringify = /([\[:])?("-?\d+n+)n("$|"([\\n]|\s)*(\s|[\\n])*[,\}\]])/g;
+    JSONStringify = (value, replacer, space) => {
+      if ("rawJSON" in JSON) {
+        return originalStringify(
+          value,
+          (key, value2) => {
+            if (typeof value2 === "bigint") return JSON.rawJSON(value2.toString());
+            if (typeof replacer === "function") return replacer(key, value2);
+            if (Array.isArray(replacer) && replacer.includes(key)) return value2;
+            return value2;
+          },
+          space
+        );
+      }
+      if (!value) return originalStringify(value, replacer, space);
+      const convertedToCustomJSON = originalStringify(
+        value,
+        (key, value2) => {
+          const isNoise = typeof value2 === "string" && Boolean(value2.match(noiseValue));
+          if (isNoise) return value2.toString() + "n";
+          if (typeof value2 === "bigint") return value2.toString() + "n";
+          if (typeof replacer === "function") return replacer(key, value2);
+          if (Array.isArray(replacer) && replacer.includes(key)) return value2;
+          return value2;
+        },
+        space
+      );
+      const processedJSON = convertedToCustomJSON.replace(
+        bigIntsStringify,
+        "$1$2$3"
+      );
+      const denoisedJSON = processedJSON.replace(noiseStringify, "$1$2$3");
+      return denoisedJSON;
+    };
+    isContextSourceSupported = () => JSON.parse("1", (_, __, context) => !!context && context.source === "1");
+    convertMarkedBigIntsReviver = (key, value, context, userReviver) => {
+      const isCustomFormatBigInt = typeof value === "string" && value.match(customFormat);
+      if (isCustomFormatBigInt) return BigInt(value.slice(0, -1));
+      const isNoiseValue = typeof value === "string" && value.match(noiseValue);
+      if (isNoiseValue) return value.slice(0, -1);
+      if (typeof userReviver !== "function") return value;
+      return userReviver(key, value, context);
+    };
+    JSONParseV2 = (text, reviver) => {
+      return JSON.parse(text, (key, value, context) => {
+        const isBigNumber = typeof value === "number" && (value > Number.MAX_SAFE_INTEGER || value < Number.MIN_SAFE_INTEGER);
+        const isInt = context && intRegex.test(context.source);
+        const isBigInt = isBigNumber && isInt;
+        if (isBigInt) return BigInt(context.source);
+        if (typeof reviver !== "function") return value;
+        return reviver(key, value, context);
+      });
+    };
+    MAX_INT = Number.MAX_SAFE_INTEGER.toString();
+    MAX_DIGITS = MAX_INT.length;
+    stringsOrLargeNumbers = /"(?:\\.|[^"])*"|-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?/g;
+    noiseValueWithQuotes = /^"-?\d+n+"$/;
+    JSONParse = (text, reviver) => {
+      if (!text) return originalParse(text, reviver);
+      if (isContextSourceSupported()) return JSONParseV2(text, reviver);
+      const serializedData = text.replace(
+        stringsOrLargeNumbers,
+        (text2, digits, fractional, exponential) => {
+          const isString = text2[0] === '"';
+          const isNoise = isString && Boolean(text2.match(noiseValueWithQuotes));
+          if (isNoise) return text2.substring(0, text2.length - 1) + 'n"';
+          const isFractionalOrExponential = fractional || exponential;
+          const isLessThanMaxSafeInt = digits && (digits.length < MAX_DIGITS || digits.length === MAX_DIGITS && digits <= MAX_INT);
+          if (isString || isFractionalOrExponential || isLessThanMaxSafeInt)
+            return text2;
+          return '"' + text2 + 'n"';
+        }
+      );
+      return originalParse(
+        serializedData,
+        (key, value, context) => convertMarkedBigIntsReviver(key, value, context, reviver)
+      );
+    };
+  }
+});
+
 // node_modules/@octokit/request-error/dist-src/index.js
 var RequestError;
 var init_dist_src = __esm({
@@ -658,7 +750,7 @@ async function fetchWrapper(requestOptions) {
   }
   const log = requestOptions.request?.log || console;
   const parseSuccessResponseBody = requestOptions.request?.parseSuccessResponseBody !== false;
-  const body = isPlainObject2(requestOptions.body) || Array.isArray(requestOptions.body) ? JSON.stringify(requestOptions.body) : requestOptions.body;
+  const body = isPlainObject2(requestOptions.body) || Array.isArray(requestOptions.body) ? JSONStringify(requestOptions.body) : requestOptions.body;
   const requestHeaders = Object.fromEntries(
     Object.entries(requestOptions.headers).map(([name, value]) => [
       name,
@@ -757,7 +849,7 @@ async function getResponseData(response) {
     let text = "";
     try {
       text = await response.text();
-      return JSON.parse(text);
+      return JSONParse(text);
     } catch (err) {
       return text;
     }
@@ -816,8 +908,9 @@ var init_dist_bundle2 = __esm({
     init_dist_bundle();
     init_universal_user_agent();
     import_fast_content_type_parse = __toESM(require_fast_content_type_parse(), 1);
+    init_json_with_bigint();
     init_dist_src();
-    VERSION2 = "10.0.7";
+    VERSION2 = "10.0.8";
     defaults_default = {
       headers: {
         "user-agent": `octokit-request.js/${VERSION2} ${getUserAgent()}`
@@ -5040,6 +5133,8 @@ function requiresAppAuth(url) {
 }
 function isNotTimeSkewError(error) {
   return !(error.message.match(
+    /'Expiration time' claim \('exp'\) is too far in the future/
+  ) || error.message.match(
     /'Expiration time' claim \('exp'\) must be a numeric value representing the future time at which the assertion expires/
   ) || error.message.match(
     /'Issued at' claim \('iat'\) must be an Integer representing the time that the assertion was issued/
@@ -5201,11 +5296,12 @@ var init_dist_node = __esm({
       "/marketplace_listing/stubbed/plans/{plan_id}/accounts",
       "/orgs/{org}/installation",
       "/repos/{owner}/{repo}/installation",
-      "/users/{username}/installation"
+      "/users/{username}/installation",
+      "/enterprises/{enterprise}/installation"
     ];
     REGEX = routeMatcher(PATHS);
     FIVE_SECONDS_IN_MS = 5 * 1e3;
-    VERSION12 = "8.1.2";
+    VERSION12 = "8.2.0";
   }
 });
 
@@ -5224,11 +5320,11 @@ 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");
+    throw new Error("Missing secret ARN. Check the Lambda configuration and required environment variables.");
   }
   const secret = await sm.send(new import_client_secrets_manager.GetSecretValueCommand({ SecretId: arn }));
   if (!secret.SecretString) {
-    throw new Error(`No SecretString in ${arn}`);
+    throw new Error("Secrets Manager getSecretValue returned no SecretString. This often indicates that the secret was stored as binary data (SecretBinary) instead of a string. Ensure the secret is stored in SecretString or update the code to handle SecretBinary.");
   }
   return secret.SecretString;
 }
@@ -5402,7 +5498,7 @@ async function handler2(event) {
         repo: event.repo,
         runnerId: runner.id,
         runnerName: event.runnerName,
-        error: `${e}`
+        error: e
       });
     }
   }

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

@@ -300,7 +300,7 @@ function isKeyOperator(operator) {
 function getValues(context, operator, key, modifier) {
   var value = context[key], result = [];
   if (isDefined(value) && value !== "") {
-    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    if (typeof value === "string" || typeof value === "number" || typeof value === "bigint" || typeof value === "boolean") {
       value = value.toString();
       if (modifier && modifier !== "*") {
         value = value.substring(0, parseInt(modifier, 10));
@@ -595,6 +595,98 @@ var require_fast_content_type_parse = __commonJS({
   }
 });
 
+// node_modules/json-with-bigint/json-with-bigint.js
+var intRegex, noiseValue, originalStringify, originalParse, customFormat, bigIntsStringify, noiseStringify, JSONStringify, isContextSourceSupported, convertMarkedBigIntsReviver, JSONParseV2, MAX_INT, MAX_DIGITS, stringsOrLargeNumbers, noiseValueWithQuotes, JSONParse;
+var init_json_with_bigint = __esm({
+  "node_modules/json-with-bigint/json-with-bigint.js"() {
+    "use strict";
+    intRegex = /^-?\d+$/;
+    noiseValue = /^-?\d+n+$/;
+    originalStringify = JSON.stringify;
+    originalParse = JSON.parse;
+    customFormat = /^-?\d+n$/;
+    bigIntsStringify = /([\[:])?"(-?\d+)n"($|([\\n]|\s)*(\s|[\\n])*[,\}\]])/g;
+    noiseStringify = /([\[:])?("-?\d+n+)n("$|"([\\n]|\s)*(\s|[\\n])*[,\}\]])/g;
+    JSONStringify = (value, replacer, space) => {
+      if ("rawJSON" in JSON) {
+        return originalStringify(
+          value,
+          (key, value2) => {
+            if (typeof value2 === "bigint") return JSON.rawJSON(value2.toString());
+            if (typeof replacer === "function") return replacer(key, value2);
+            if (Array.isArray(replacer) && replacer.includes(key)) return value2;
+            return value2;
+          },
+          space
+        );
+      }
+      if (!value) return originalStringify(value, replacer, space);
+      const convertedToCustomJSON = originalStringify(
+        value,
+        (key, value2) => {
+          const isNoise = typeof value2 === "string" && Boolean(value2.match(noiseValue));
+          if (isNoise) return value2.toString() + "n";
+          if (typeof value2 === "bigint") return value2.toString() + "n";
+          if (typeof replacer === "function") return replacer(key, value2);
+          if (Array.isArray(replacer) && replacer.includes(key)) return value2;
+          return value2;
+        },
+        space
+      );
+      const processedJSON = convertedToCustomJSON.replace(
+        bigIntsStringify,
+        "$1$2$3"
+      );
+      const denoisedJSON = processedJSON.replace(noiseStringify, "$1$2$3");
+      return denoisedJSON;
+    };
+    isContextSourceSupported = () => JSON.parse("1", (_, __, context) => !!context && context.source === "1");
+    convertMarkedBigIntsReviver = (key, value, context, userReviver) => {
+      const isCustomFormatBigInt = typeof value === "string" && value.match(customFormat);
+      if (isCustomFormatBigInt) return BigInt(value.slice(0, -1));
+      const isNoiseValue = typeof value === "string" && value.match(noiseValue);
+      if (isNoiseValue) return value.slice(0, -1);
+      if (typeof userReviver !== "function") return value;
+      return userReviver(key, value, context);
+    };
+    JSONParseV2 = (text, reviver) => {
+      return JSON.parse(text, (key, value, context) => {
+        const isBigNumber = typeof value === "number" && (value > Number.MAX_SAFE_INTEGER || value < Number.MIN_SAFE_INTEGER);
+        const isInt = context && intRegex.test(context.source);
+        const isBigInt = isBigNumber && isInt;
+        if (isBigInt) return BigInt(context.source);
+        if (typeof reviver !== "function") return value;
+        return reviver(key, value, context);
+      });
+    };
+    MAX_INT = Number.MAX_SAFE_INTEGER.toString();
+    MAX_DIGITS = MAX_INT.length;
+    stringsOrLargeNumbers = /"(?:\\.|[^"])*"|-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?/g;
+    noiseValueWithQuotes = /^"-?\d+n+"$/;
+    JSONParse = (text, reviver) => {
+      if (!text) return originalParse(text, reviver);
+      if (isContextSourceSupported()) return JSONParseV2(text, reviver);
+      const serializedData = text.replace(
+        stringsOrLargeNumbers,
+        (text2, digits, fractional, exponential) => {
+          const isString = text2[0] === '"';
+          const isNoise = isString && Boolean(text2.match(noiseValueWithQuotes));
+          if (isNoise) return text2.substring(0, text2.length - 1) + 'n"';
+          const isFractionalOrExponential = fractional || exponential;
+          const isLessThanMaxSafeInt = digits && (digits.length < MAX_DIGITS || digits.length === MAX_DIGITS && digits <= MAX_INT);
+          if (isString || isFractionalOrExponential || isLessThanMaxSafeInt)
+            return text2;
+          return '"' + text2 + 'n"';
+        }
+      );
+      return originalParse(
+        serializedData,
+        (key, value, context) => convertMarkedBigIntsReviver(key, value, context, reviver)
+      );
+    };
+  }
+});
+
 // node_modules/@octokit/request-error/dist-src/index.js
 var RequestError;
 var init_dist_src = __esm({
@@ -658,7 +750,7 @@ async function fetchWrapper(requestOptions) {
   }
   const log = requestOptions.request?.log || console;
   const parseSuccessResponseBody = requestOptions.request?.parseSuccessResponseBody !== false;
-  const body = isPlainObject2(requestOptions.body) || Array.isArray(requestOptions.body) ? JSON.stringify(requestOptions.body) : requestOptions.body;
+  const body = isPlainObject2(requestOptions.body) || Array.isArray(requestOptions.body) ? JSONStringify(requestOptions.body) : requestOptions.body;
   const requestHeaders = Object.fromEntries(
     Object.entries(requestOptions.headers).map(([name, value]) => [
       name,
@@ -757,7 +849,7 @@ async function getResponseData(response) {
     let text = "";
     try {
       text = await response.text();
-      return JSON.parse(text);
+      return JSONParse(text);
     } catch (err) {
       return text;
     }
@@ -816,8 +908,9 @@ var init_dist_bundle2 = __esm({
     init_dist_bundle();
     init_universal_user_agent();
     import_fast_content_type_parse = __toESM(require_fast_content_type_parse(), 1);
+    init_json_with_bigint();
     init_dist_src();
-    VERSION2 = "10.0.7";
+    VERSION2 = "10.0.8";
     defaults_default = {
       headers: {
         "user-agent": `octokit-request.js/${VERSION2} ${getUserAgent()}`
@@ -5040,6 +5133,8 @@ function requiresAppAuth(url) {
 }
 function isNotTimeSkewError(error) {
   return !(error.message.match(
+    /'Expiration time' claim \('exp'\) is too far in the future/
+  ) || error.message.match(
     /'Expiration time' claim \('exp'\) must be a numeric value representing the future time at which the assertion expires/
   ) || error.message.match(
     /'Issued at' claim \('iat'\) must be an Integer representing the time that the assertion was issued/
@@ -5201,11 +5296,12 @@ var init_dist_node = __esm({
       "/marketplace_listing/stubbed/plans/{plan_id}/accounts",
       "/orgs/{org}/installation",
       "/repos/{owner}/{repo}/installation",
-      "/users/{username}/installation"
+      "/users/{username}/installation",
+      "/enterprises/{enterprise}/installation"
     ];
     REGEX = routeMatcher(PATHS);
     FIVE_SECONDS_IN_MS = 5 * 1e3;
-    VERSION12 = "8.1.2";
+    VERSION12 = "8.2.0";
   }
 });
 
@@ -5225,11 +5321,11 @@ 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");
+    throw new Error("Missing secret ARN. Check the Lambda configuration and required environment variables.");
   }
   const secret = await sm.send(new import_client_secrets_manager.GetSecretValueCommand({ SecretId: arn }));
   if (!secret.SecretString) {
-    throw new Error(`No SecretString in ${arn}`);
+    throw new Error("Secrets Manager getSecretValue returned no SecretString. This often indicates that the secret was stored as binary data (SecretBinary) instead of a string. Ensure the secret is stored in SecretString or update the code to handle SecretBinary.");
   }
   return secret.SecretString;
 }
@@ -5364,6 +5460,7 @@ async function handler2(event) {
     const input = JSON.parse(record.body);
     console.log({
       notice: "Checking runner",
+      runnerName: input.runnerName,
       input
     });
     const retryLater = () => result.batchItemFailures.push({ itemIdentifier: record.messageId });
@@ -5371,6 +5468,7 @@ async function handler2(event) {
     if (execution.status != "RUNNING") {
       console.log({
         notice: "Runner already finished",
+        runnerName: input.runnerName,
         input
       });
       continue;
@@ -5391,6 +5489,7 @@ async function handler2(event) {
     if (!runner) {
       console.log({
         notice: "Runner not running yet",
+        runnerName: input.runnerName,
         input
       });
       retryLater();
@@ -5399,6 +5498,8 @@ async function handler2(event) {
     if (runner.busy) {
       console.log({
         notice: "Runner is not idle",
+        runnerId: runner.id,
+        runnerName: input.runnerName,
         input
       });
       retryLater();
@@ -5412,17 +5513,27 @@ async function handler2(event) {
         const now = /* @__PURE__ */ new Date();
         const diffMs = now.getTime() - startedDate.getTime();
         console.log({
-          notice: `Runner ${input.runnerName} started ${diffMs / 1e3} seconds ago`,
+          notice: "Runner is idle",
+          runnerId: runner.id,
+          runnerName: input.runnerName,
+          idleSeconds: diffMs / 1e3,
           input
         });
         if (diffMs > 1e3 * input.maxIdleSeconds) {
           console.log({
-            notice: `Runner ${input.runnerName} is idle for too long`,
+            notice: "Runner is idle for too long",
+            runnerId: runner.id,
+            runnerName: input.runnerName,
+            idleSeconds: diffMs / 1e3,
+            maxIdleSeconds: input.maxIdleSeconds,
             input
           });
           try {
             console.log({
-              notice: `Stopping step function ${input.executionArn}...`,
+              notice: "Stopping step function",
+              executionArn: input.executionArn,
+              runnerId: runner.id,
+              runnerName: input.runnerName,
               input
             });
             await sfn.send(new import_client_sfn.StopExecutionCommand({
@@ -5432,7 +5543,11 @@ async function handler2(event) {
             }));
           } catch (e) {
             console.error({
-              notice: `Failed to stop step function ${input.executionArn}: ${e}`,
+              notice: "Failed to stop step function",
+              executionArn: input.executionArn,
+              runnerId: runner.id,
+              runnerName: input.runnerName,
+              error: e,
               input
             });
             retryLater();
@@ -5440,13 +5555,18 @@ async function handler2(event) {
           }
           try {
             console.log({
-              notice: `Deleting runner ${runner.id}...`,
+              notice: "Deleting runner",
+              runnerId: runner.id,
+              runnerName: input.runnerName,
               input
             });
             await deleteRunner(octokit, secrets.runnerLevel, input.owner, input.repo, runner.id);
           } catch (e) {
             console.error({
-              notice: `Failed to delete runner ${runner.id}: ${e}`,
+              notice: "Failed to delete runner",
+              runnerId: runner.id,
+              runnerName: input.runnerName,
+              error: e,
               input
             });
             retryLater();
@@ -5462,6 +5582,8 @@ async function handler2(event) {
     if (!found) {
       console.error({
         notice: "No `cdkghr:started:xxx` label found???",
+        runnerId: runner.id,
+        runnerName: input.runnerName,
         input
       });
       retryLater();

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

@@ -197,7 +197,7 @@ async function handler(event, _context) {
   } catch (e) {
     console.error({
       notice: "Failed to delete Image Builder resources",
-      error: `${e}`
+      error: e
     });
     await customResourceRespond(event, "FAILED", e.message || "Internal Error", "FAIL", {});
   }

package/assets/image-builders/build-image.lambda/index.js

@@ -105,7 +105,7 @@ async function handler(event, context) {
   } catch (e) {
     console.error({
       notice: "Failed to start CodeBuild project",
-      error: `${e}`
+      error: e
     });
     await customResourceRespond(event, "FAILED", e.message || "Internal Error", context.logStreamName, {});
   }

package/assets/providers/ami-root-device.lambda/index.js

@@ -184,7 +184,7 @@ async function handler(event, context) {
   } catch (e) {
     console.error({
       notice: "Failed to resolve AMI root device",
-      error: `${e}`
+      error: e
     });
     await customResourceRespond(event, "FAILED", e.message || "Internal Error", context.logStreamName, {});
   }