@cloudsnorkel/cdk-github-runners 0.14.20 → 0.14.21

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

@@ -41,7 +41,13 @@ async function customResourceRespond(event, responseStatus, reason, physicalReso
     NoEcho: false,
     Data: data
   });
-  console.log("Responding", responseBody);
+  console.log({
+    notice: "Responding to CloudFormation custom resource",
+    status: responseStatus,
+    reason,
+    physicalResourceId,
+    responseBody
+  });
   const parsedUrl = require("url").parse(event.ResponseURL);
   const requestOptions = {
     hostname: parsedUrl.hostname,
@@ -171,6 +177,7 @@ async function deleteResources(props) {
 async function handler(event, _context) {
   try {
     console.log({
+      notice: "CloudFormation custom resource request",
       ...event,
       ResponseURL: "..."
     });
@@ -188,7 +195,10 @@ async function handler(event, _context) {
         break;
     }
   } catch (e) {
-    console.error(e);
+    console.error({
+      notice: "Failed to delete Image Builder resources",
+      error: `${e}`
+    });
     await customResourceRespond(event, "FAILED", e.message || "Internal Error", "FAIL", {});
   }
 }

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

@@ -26,7 +26,10 @@ module.exports = __toCommonJS(filter_failed_builds_lambda_exports);
 var import_client_sns = require("@aws-sdk/client-sns");
 var sns = new import_client_sns.SNSClient();
 async function handler(event) {
-  console.log(event);
+  console.log({
+    notice: "Received SNS event",
+    recordCount: event.Records.length
+  });
   for (const record of event.Records) {
     let message = JSON.parse(record.Sns.Message);
     if (message.state.status === "FAILED") {

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

@@ -39,7 +39,13 @@ async function customResourceRespond(event, responseStatus, reason, physicalReso
     NoEcho: false,
     Data: data
   });
-  console.log("Responding", responseBody);
+  console.log({
+    notice: "Responding to CloudFormation custom resource",
+    status: responseStatus,
+    reason,
+    physicalResourceId,
+    responseBody
+  });
   const parsedUrl = require("url").parse(event.ResponseURL);
   const requestOptions = {
     hostname: parsedUrl.hostname,
@@ -66,12 +72,20 @@ async function customResourceRespond(event, responseStatus, reason, physicalReso
 var codebuild = new import_client_codebuild.CodeBuildClient();
 async function handler(event, context) {
   try {
-    console.log({ ...event, ResponseURL: "..." });
+    console.log({
+      notice: "CloudFormation custom resource request",
+      ...event,
+      ResponseURL: "..."
+    });
     const props = event.ResourceProperties;
     switch (event.RequestType) {
       case "Create":
       case "Update":
-        console.log(`Starting CodeBuild project ${props.ProjectName}`);
+        console.log({
+          notice: "Starting CodeBuild project",
+          projectName: props.ProjectName,
+          repoName: props.RepoName
+        });
         const cbRes = await codebuild.send(new import_client_codebuild.StartBuildCommand({
           projectName: props.ProjectName,
           environmentVariablesOverride: [
@@ -89,7 +103,10 @@ async function handler(event, context) {
         break;
     }
   } catch (e) {
-    console.error(e);
+    console.error({
+      notice: "Failed to start CodeBuild project",
+      error: `${e}`
+    });
     await customResourceRespond(event, "FAILED", e.message || "Internal Error", context.logStreamName, {});
   }
 }

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

@@ -41,7 +41,13 @@ async function customResourceRespond(event, responseStatus, reason, physicalReso
     NoEcho: false,
     Data: data
   });
-  console.log("Responding", responseBody);
+  console.log({
+    notice: "Responding to CloudFormation custom resource",
+    status: responseStatus,
+    reason,
+    physicalResourceId,
+    responseBody
+  });
   const parsedUrl = require("url").parse(event.ResponseURL);
   const requestOptions = {
     hostname: parsedUrl.hostname,
@@ -79,25 +85,39 @@ async function handleAmi(event, ami) {
     await customResourceRespond(event, "FAILED", `${ami} has no root device`, "ERROR", {});
     return;
   }
-  console.log(`Root device for ${ami} is ${rootDevice}`);
+  console.log({
+    notice: "Resolved AMI root device",
+    ami,
+    rootDevice
+  });
   await customResourceRespond(event, "SUCCESS", "OK", rootDevice, {});
   return;
 }
 async function handler(event, context) {
   try {
-    console.log({ ...event, ResponseURL: "..." });
+    console.log({
+      notice: "CloudFormation custom resource request",
+      ...event,
+      ResponseURL: "..."
+    });
     const ami = event.ResourceProperties.Ami;
     switch (event.RequestType) {
       case "Create":
       case "Update":
         if (ami.startsWith("ami-")) {
-          console.log(`Checking AMI ${ami}`);
+          console.log({
+            notice: "Checking AMI",
+            ami
+          });
           await handleAmi(event, ami);
           break;
         }
         if (ami.startsWith("resolve:ssm:")) {
           const ssmParam = ami.substring("resolve:ssm:".length);
-          console.log(`Checking SSM ${ssmParam}`);
+          console.log({
+            notice: "Checking SSM",
+            ssmParam
+          });
           const ssmValue = (await ssm.send(new import_client_ssm.GetParameterCommand({ Name: ssmParam }))).Parameter?.Value;
           if (!ssmValue) {
             await customResourceRespond(event, "FAILED", `${ami} has no value`, "ERROR", {});
@@ -108,7 +128,10 @@ async function handler(event, context) {
         }
         if (ami.startsWith("ssm:")) {
           const ssmParam = ami.substring("ssm:".length);
-          console.log(`Checking SSM ${ssmParam}`);
+          console.log({
+            notice: "Checking SSM",
+            ssmParam
+          });
           const ssmValue = (await ssm.send(new import_client_ssm.GetParameterCommand({ Name: ssmParam }))).Parameter?.Value;
           if (!ssmValue) {
             await customResourceRespond(event, "FAILED", `${ami} has no value`, "ERROR", {});
@@ -118,7 +141,10 @@ async function handler(event, context) {
           break;
         }
         if (ami.startsWith("lt-")) {
-          console.log(`Checking Launch Template ${ami}`);
+          console.log({
+            notice: "Checking Launch Template",
+            launchTemplateId: ami
+          });
           const lts = await ec2.send(new import_client_ec2.DescribeLaunchTemplateVersionsCommand({ LaunchTemplateId: ami, Versions: ["$Latest"] }));
           if (lts.LaunchTemplateVersions?.length !== 1) {
             await customResourceRespond(event, "FAILED", `${ami} doesn't exist`, "ERROR", {});
@@ -132,7 +158,10 @@ async function handler(event, context) {
           break;
         }
         if (ami.match("^arn:aws[^:]*:imagebuilder:[^:]+:[^:]+:image/.*$")) {
-          console.log(`Checking Image Builder ${ami}`);
+          console.log({
+            notice: "Checking Image Builder",
+            imageBuildVersionArn: ami
+          });
           const img = await ib.send(new import_client_imagebuilder.GetImageCommand({ imageBuildVersionArn: ami }));
           const actualAmi = img.image?.outputResources?.amis?.[0]?.image;
           if (!actualAmi) {
@@ -145,12 +174,18 @@ async function handler(event, context) {
         await customResourceRespond(event, "FAILED", `Unknown type of AMI ${ami}`, "ERROR", {});
         break;
       case "Delete":
-        console.log("Nothing to delete");
+        console.log({
+          notice: "Nothing to delete",
+          ami
+        });
         await customResourceRespond(event, "SUCCESS", "OK", event.PhysicalResourceId, {});
         break;
     }
   } catch (e) {
-    console.error(e);
+    console.error({
+      notice: "Failed to resolve AMI root device",
+      error: `${e}`
+    });
     await customResourceRespond(event, "FAILED", e.message || "Internal Error", context.logStreamName, {});
   }
 }

package/assets/providers/update-lambda.lambda/index.js

@@ -29,7 +29,12 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function handler(event) {
-  console.log(event);
+  console.log({
+    notice: "Updating Lambda function code from container image",
+    lambdaName: event.lambdaName,
+    repositoryUri: event.repositoryUri,
+    repositoryTag: event.repositoryTag
+  });
   while (true) {
     try {
       await lambda.send(new import_client_lambda.UpdateFunctionCodeCommand({