@cloudsnorkel/cdk-github-runners 0.14.10 → 0.14.11

package/.jsii

@@ -3834,7 +3834,7 @@
     "stability": "experimental"
   },
   "homepage": "https://github.com/CloudSnorkel/cdk-github-runners.git",
-  "jsiiVersion": "5.8.13 (build 2043962)",
+  "jsiiVersion": "5.8.15 (build af1b019)",
   "keywords": [
     "aws",
     "aws-cdk",
@@ -9058,7 +9058,7 @@
         },
         "locationInModule": {
           "filename": "src/runner.ts",
-          "line": 270
+          "line": 272
         },
         "parameters": [
           {
@@ -9088,7 +9088,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/runner.ts",
-        "line": 244
+        "line": 245
       },
       "methods": [
         {
@@ -9099,7 +9099,7 @@
           },
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 787
+            "line": 793
           },
           "name": "createLogsInsightsQueries"
         },
@@ -9111,7 +9111,7 @@
           },
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 767
+            "line": 773
           },
           "name": "failedImageBuildsTopic",
           "returns": {
@@ -9128,7 +9128,7 @@
           },
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 749
+            "line": 755
           },
           "name": "metricFailed",
           "parameters": [
@@ -9154,7 +9154,7 @@
           },
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 694
+            "line": 700
           },
           "name": "metricJobCompleted",
           "parameters": [
@@ -9180,7 +9180,7 @@
           },
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 740
+            "line": 746
           },
           "name": "metricSucceeded",
           "parameters": [
@@ -9206,7 +9206,7 @@
           },
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 756
+            "line": 762
           },
           "name": "metricTime",
           "parameters": [
@@ -9236,7 +9236,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 260
+            "line": 261
           },
           "name": "connections",
           "overrides": "aws-cdk-lib.aws_ec2.IConnectable",
@@ -9252,7 +9252,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 248
+            "line": 249
           },
           "name": "providers",
           "type": {
@@ -9272,7 +9272,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 253
+            "line": 254
           },
           "name": "secrets",
           "type": {
@@ -9286,7 +9286,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 270
+            "line": 272
           },
           "name": "props",
           "optional": true,
@@ -9308,7 +9308,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/runner.ts",
-        "line": 39
+        "line": 40
       },
       "name": "GitHubRunnersProps",
       "properties": [
@@ -9323,7 +9323,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 80
+            "line": 81
           },
           "name": "allowPublicSubnet",
           "optional": true,
@@ -9341,7 +9341,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 117
+            "line": 118
           },
           "name": "extraCertificates",
           "optional": true,
@@ -9360,7 +9360,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 124
+            "line": 125
           },
           "name": "idleTimeout",
           "optional": true,
@@ -9378,7 +9378,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 131
+            "line": 132
           },
           "name": "logOptions",
           "optional": true,
@@ -9397,7 +9397,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 45
+            "line": 46
           },
           "name": "providers",
           "optional": true,
@@ -9421,7 +9421,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 54
+            "line": 55
           },
           "name": "requireSelfHostedLabel",
           "optional": true,
@@ -9440,7 +9440,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 168
+            "line": 169
           },
           "name": "retryOptions",
           "optional": true,
@@ -9459,7 +9459,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 87
+            "line": 88
           },
           "name": "securityGroup",
           "optional": true,
@@ -9477,7 +9477,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 92
+            "line": 93
           },
           "name": "securityGroups",
           "optional": true,
@@ -9501,7 +9501,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 138
+            "line": 139
           },
           "name": "setupAccess",
           "optional": true,
@@ -9520,7 +9520,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 157
+            "line": 158
           },
           "name": "statusAccess",
           "optional": true,
@@ -9538,7 +9538,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 68
+            "line": 69
           },
           "name": "vpc",
           "optional": true,
@@ -9556,7 +9556,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 73
+            "line": 74
           },
           "name": "vpcSubnets",
           "optional": true,
@@ -9575,7 +9575,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 150
+            "line": 151
           },
           "name": "webhookAccess",
           "optional": true,
@@ -11645,7 +11645,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/runner.ts",
-        "line": 174
+        "line": 175
       },
       "name": "LogOptions",
       "properties": [
@@ -11659,7 +11659,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 185
+            "line": 186
           },
           "name": "includeExecutionData",
           "optional": true,
@@ -11677,7 +11677,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 192
+            "line": 193
           },
           "name": "level",
           "optional": true,
@@ -11694,7 +11694,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 178
+            "line": 179
           },
           "name": "logGroupName",
           "optional": true,
@@ -11713,7 +11713,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 201
+            "line": 202
           },
           "name": "logRetention",
           "optional": true,
@@ -14310,6 +14310,6 @@
       "symbolId": "src/image-builders/aws-image-builder/deprecated/windows-components:WindowsComponents"
     }
   },
-  "version": "0.14.10",
-  "fingerprint": "YnLFarRHJtWdUv02nVPpdkuYSZf6IJK12Zc6QcPRWos="
+  "version": "0.14.11",
+  "fingerprint": "pPb2DkhlcCfnSgM5rfNKmErW9ttbyZayQH4/SKTZizI="
 }

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

@@ -13200,6 +13200,7 @@ __export(delete_failed_runner_lambda_exports, {
 module.exports = __toCommonJS(delete_failed_runner_lambda_exports);
 
 // src/lambda-github.ts
+var import_crypto = require("crypto");
 var import_auth_app = __toESM(require_dist_node12());
 var import_rest = __toESM(require_dist_node19());
 
@@ -13227,26 +13228,33 @@ function baseUrlFromDomain(domain) {
   }
   return `https://${domain}/api/v3`;
 }
-var octokitCache = {};
+var octokitCache = /* @__PURE__ */ new Map();
 async function getOctokit(installationId) {
   if (!process.env.GITHUB_SECRET_ARN || !process.env.GITHUB_PRIVATE_KEY_SECRET_ARN) {
     throw new Error("Missing environment variables");
   }
   const githubSecrets = await getSecretJsonValue(process.env.GITHUB_SECRET_ARN);
-  if (octokitCache.octokit && octokitCache.installationId == installationId && octokitCache.secrets && octokitCache.secrets.domain == githubSecrets.domain && octokitCache.secrets.appId == githubSecrets.appId && octokitCache.secrets.personalAuthToken == githubSecrets.personalAuthToken) {
+  const cacheKey = (0, import_crypto.createHash)("sha256").update(`${installationId || "no-install"}-${githubSecrets.domain}-${githubSecrets.appId}-${githubSecrets.personalAuthToken}`).digest("hex");
+  const cached = octokitCache.get(cacheKey);
+  if (cached) {
     try {
-      await octokitCache.octokit.rest.meta.getOctocat();
-      console.log("Using cached octokit");
+      await cached.rest.meta.getOctocat();
+      console.log({
+        notice: "Using cached octokit"
+      });
       return {
-        octokit: octokitCache.octokit,
-        githubSecrets: octokitCache.secrets
+        octokit: cached,
+        githubSecrets
       };
     } catch (e) {
-      console.log("Octokit cache is invalid", e);
-      octokitCache.octokit = void 0;
+      console.log({
+        notice: "Octokit cache is invalid",
+        error: e
+      });
+      octokitCache.delete(cacheKey);
     }
   }
-  let baseUrl = baseUrlFromDomain(githubSecrets.domain);
+  const baseUrl = baseUrlFromDomain(githubSecrets.domain);
   let token;
   if (githubSecrets.personalAuthToken) {
     token = githubSecrets.personalAuthToken;
@@ -13269,9 +13277,7 @@ async function getOctokit(installationId) {
     baseUrl,
     auth: token
   });
-  octokitCache.octokit = octokit;
-  octokitCache.installationId = installationId;
-  octokitCache.secrets = githubSecrets;
+  octokitCache.set(cacheKey, octokit);
   return {
     octokit,
     githubSecrets

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

@@ -13201,6 +13201,7 @@ module.exports = __toCommonJS(idle_runner_repear_lambda_exports);
 var import_client_sfn = require("@aws-sdk/client-sfn");
 
 // src/lambda-github.ts
+var import_crypto = require("crypto");
 var import_auth_app = __toESM(require_dist_node12());
 var import_rest = __toESM(require_dist_node19());
 
@@ -13228,26 +13229,33 @@ function baseUrlFromDomain(domain) {
   }
   return `https://${domain}/api/v3`;
 }
-var octokitCache = {};
+var octokitCache = /* @__PURE__ */ new Map();
 async function getOctokit(installationId) {
   if (!process.env.GITHUB_SECRET_ARN || !process.env.GITHUB_PRIVATE_KEY_SECRET_ARN) {
     throw new Error("Missing environment variables");
   }
   const githubSecrets = await getSecretJsonValue(process.env.GITHUB_SECRET_ARN);
-  if (octokitCache.octokit && octokitCache.installationId == installationId && octokitCache.secrets && octokitCache.secrets.domain == githubSecrets.domain && octokitCache.secrets.appId == githubSecrets.appId && octokitCache.secrets.personalAuthToken == githubSecrets.personalAuthToken) {
+  const cacheKey = (0, import_crypto.createHash)("sha256").update(`${installationId || "no-install"}-${githubSecrets.domain}-${githubSecrets.appId}-${githubSecrets.personalAuthToken}`).digest("hex");
+  const cached = octokitCache.get(cacheKey);
+  if (cached) {
     try {
-      await octokitCache.octokit.rest.meta.getOctocat();
-      console.log("Using cached octokit");
+      await cached.rest.meta.getOctocat();
+      console.log({
+        notice: "Using cached octokit"
+      });
       return {
-        octokit: octokitCache.octokit,
-        githubSecrets: octokitCache.secrets
+        octokit: cached,
+        githubSecrets
       };
     } catch (e) {
-      console.log("Octokit cache is invalid", e);
-      octokitCache.octokit = void 0;
+      console.log({
+        notice: "Octokit cache is invalid",
+        error: e
+      });
+      octokitCache.delete(cacheKey);
     }
   }
-  let baseUrl = baseUrlFromDomain(githubSecrets.domain);
+  const baseUrl = baseUrlFromDomain(githubSecrets.domain);
   let token;
   if (githubSecrets.personalAuthToken) {
     token = githubSecrets.personalAuthToken;
@@ -13270,9 +13278,7 @@ async function getOctokit(installationId) {
     baseUrl,
     auth: token
   });
-  octokitCache.octokit = octokit;
-  octokitCache.installationId = installationId;
-  octokitCache.secrets = githubSecrets;
+  octokitCache.set(cacheKey, octokit);
   return {
     octokit,
     githubSecrets
@@ -13324,8 +13330,7 @@ async function deleteRunner(octokit, runnerLevel, owner, repo, runnerId) {
 var sfn = new import_client_sfn.SFNClient();
 async function handler(event) {
   const result = { batchItemFailures: [] };
-  let octokitCache2;
-  let runnerLevel;
+  const octokitCache2 = /* @__PURE__ */ new Map();
   for (const record of event.Records) {
     const input = JSON.parse(record.body);
     console.log({
@@ -13341,12 +13346,19 @@ async function handler(event) {
       });
       continue;
     }
-    if (!octokitCache2) {
-      const { octokit, githubSecrets } = await getOctokit(input.installationId);
-      octokitCache2 = octokit;
-      runnerLevel = githubSecrets.runnerLevel;
+    let octokit;
+    let secrets;
+    const cached = octokitCache2.get(input.installationId);
+    if (cached) {
+      octokit = cached.octokit;
+      secrets = cached.secrets;
+    } else {
+      const { octokit: newOctokit, githubSecrets: newSecrets } = await getOctokit(input.installationId);
+      octokit = newOctokit;
+      secrets = newSecrets;
+      octokitCache2.set(input.installationId, { octokit, secrets });
     }
-    const runner = await getRunner(octokitCache2, runnerLevel, input.owner, input.repo, input.runnerName);
+    const runner = await getRunner(octokit, secrets.runnerLevel, input.owner, input.repo, input.runnerName);
     if (!runner) {
       console.log({
         notice: "Runner not running yet",
@@ -13402,7 +13414,7 @@ async function handler(event) {
               notice: `Deleting runner ${runner.id}...`,
               input
             });
-            await deleteRunner(octokitCache2, runnerLevel, input.owner, input.repo, runner.id);
+            await deleteRunner(octokit, secrets.runnerLevel, input.owner, input.repo, runner.id);
           } catch (e) {
             console.error({
               notice: `Failed to delete runner ${runner.id}: ${e}`,