@cloudsnorkel/cdk-github-runners 0.12.5 → 0.13.1

package/API.md

@@ -7802,6 +7802,7 @@ const runnerImageBuilderProps: RunnerImageBuilderProps = { ... }
 | <code><a href="#@cloudsnorkel/cdk-github-runners.RunnerImageBuilderProps.property.securityGroups">securityGroups</a></code> | <code>aws-cdk-lib.aws_ec2.ISecurityGroup[]</code> | Security Groups to assign to this instance. |
 | <code><a href="#@cloudsnorkel/cdk-github-runners.RunnerImageBuilderProps.property.subnetSelection">subnetSelection</a></code> | <code>aws-cdk-lib.aws_ec2.SubnetSelection</code> | Where to place the network interfaces within the VPC. |
 | <code><a href="#@cloudsnorkel/cdk-github-runners.RunnerImageBuilderProps.property.vpc">vpc</a></code> | <code>aws-cdk-lib.aws_ec2.IVpc</code> | VPC to build the image in. |
+| <code><a href="#@cloudsnorkel/cdk-github-runners.RunnerImageBuilderProps.property.waitOnDeploy">waitOnDeploy</a></code> | <code>boolean</code> | Wait for image to finish building during deployment. |
 
 ---
 
@@ -8013,6 +8014,25 @@ VPC to build the image in.
 
 ---
 
+##### `waitOnDeploy`<sup>Optional</sup> <a name="waitOnDeploy" id="@cloudsnorkel/cdk-github-runners.RunnerImageBuilderProps.property.waitOnDeploy"></a>
+
+```typescript
+public readonly waitOnDeploy: boolean;
+```
+
+- *Type:* boolean
+- *Default:* true
+
+Wait for image to finish building during deployment.
+
+It's usually best to leave this enabled to ensure everything is ready once deployment is done. However, it can be disabled to speed up deployment in case where you have a lot of image components that can take a long time to build.
+
+Disabling this option means a finished deployment is not ready to be used. You will have to wait for the image to finish building before the system can be used.
+
+Disabling this option may also mean any changes to settings or components can take up to a week (default rebuild interval) to take effect.
+
+---
+
 ### RunnerImageComponentCustomProps <a name="RunnerImageComponentCustomProps" id="@cloudsnorkel/cdk-github-runners.RunnerImageComponentCustomProps"></a>
 
 #### Initializer <a name="Initializer" id="@cloudsnorkel/cdk-github-runners.RunnerImageComponentCustomProps.Initializer"></a>

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

@@ -13919,11 +13919,17 @@ async function handler(event) {
   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}]`);
+    console.log({
+      notice: "Checking runner",
+      input
+    });
     const retryLater = () => result.batchItemFailures.push({ itemIdentifier: record.messageId });
     const execution = await sfn.send(new import_client_sfn.DescribeExecutionCommand({ executionArn: input.executionArn }));
     if (execution.status != "RUNNING") {
-      console.log("Runner already finished");
+      console.log({
+        notice: "Runner already finished",
+        input
+      });
       continue;
     }
     if (!octokitCache2) {
@@ -13933,12 +13939,18 @@ async function handler(event) {
     }
     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}`);
+      console.log({
+        notice: "Runner not running yet",
+        input
+      });
       retryLater();
       continue;
     }
     if (runner.busy) {
-      console.log("Runner is not idle");
+      console.log({
+        notice: "Runner is not idle",
+        input
+      });
       retryLater();
       continue;
     }
@@ -13949,26 +13961,44 @@ async function handler(event) {
         const startedDate = new Date(started * 1e3);
         const now = /* @__PURE__ */ new Date();
         const diffMs = now.getTime() - startedDate.getTime();
-        console.log(`Runner ${input.runnerName} started ${diffMs / 1e3} seconds ago`);
+        console.log({
+          notice: `Runner ${input.runnerName} started ${diffMs / 1e3} seconds ago`,
+          input
+        });
         if (diffMs > 1e3 * input.maxIdleSeconds) {
-          console.log(`Runner ${input.runnerName} is idle for too long`);
+          console.log({
+            notice: `Runner ${input.runnerName} is idle for too long`,
+            input
+          });
           try {
-            console.log(`Stopping step function ${input.executionArn}...`);
+            console.log({
+              notice: `Stopping step function ${input.executionArn}...`,
+              input
+            });
             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)`
             }));
           } catch (e) {
-            console.error(`Failed to stop step function ${input.executionArn}: ${e}`);
+            console.error({
+              notice: `Failed to stop step function ${input.executionArn}: ${e}`,
+              input
+            });
             retryLater();
             continue;
           }
           try {
-            console.log(`Deleting runner ${runner.id}...`);
+            console.log({
+              notice: `Deleting runner ${runner.id}...`,
+              input
+            });
             await deleteRunner(octokitCache2, runnerLevel, input.owner, input.repo, runner.id);
           } catch (e) {
-            console.error(`Failed to delete runner ${runner.id}: ${e}`);
+            console.error({
+              notice: `Failed to delete runner ${runner.id}: ${e}`,
+              input
+            });
             retryLater();
             continue;
           }
@@ -13980,7 +14010,10 @@ async function handler(event) {
       }
     }
     if (!found) {
-      console.error("No `cdkghr:started:xxx` label found???");
+      console.error({
+        notice: "No `cdkghr:started:xxx` label found???",
+        input
+      });
       retryLater();
     }
   }

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

@@ -79,11 +79,16 @@ async function deleteAmis(stackName, builderName) {
     ]
   }));
   let imagesToDelete = images.Images ?? [];
-  console.log(`Found ${imagesToDelete.length} AMIs`);
-  console.log(JSON.stringify(imagesToDelete.map((i) => i.ImageId)));
+  console.log({
+    notice: `Found ${imagesToDelete.length} AMIs`,
+    images: imagesToDelete.map((i) => i.ImageId)
+  });
   for (const image of imagesToDelete) {
     if (!image.ImageId) {
-      console.warn(`No image id? ${JSON.stringify(image)}`);
+      console.warn({
+        notice: "No image id?",
+        image
+      });
       continue;
     }
     console.log(`Deregistering ${image.ImageId}`);
@@ -102,7 +107,7 @@ async function deleteAmis(stackName, builderName) {
 }
 async function handler(event, context) {
   try {
-    console.log(JSON.stringify({ ...event, ResponseURL: "..." }));
+    console.log({ ...event, ResponseURL: "..." });
     switch (event.RequestType) {
       case "Create":
       case "Update":

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

@@ -26,7 +26,7 @@ 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(JSON.stringify(event));
+  console.log(event);
   for (const record of event.Records) {
     let message = JSON.parse(record.Sns.Message);
     if (message.state.status === "FAILED") {

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

@@ -2577,7 +2577,7 @@ function increaseVersion(allVersions) {
   return version;
 }
 async function handler(event, context) {
-  console.log(JSON.stringify({ ...event, ResponseURL: "..." }));
+  console.log({ ...event, ResponseURL: "..." });
   try {
     const objectType = event.ResourceProperties.ObjectType;
     const objectName = event.ResourceProperties.ObjectName;

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

@@ -68,47 +68,31 @@ var codebuild = new import_client_codebuild.CodeBuildClient();
 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 projectName = event.ResourceProperties.ProjectName;
-    const ibName = event.ResourceProperties.ImageBuilderName;
+    console.log({ ...event, ResponseURL: "..." });
+    const props = event.ResourceProperties;
     switch (event.RequestType) {
       case "Create":
       case "Update":
-        if (deleteOnly) {
+        if (props.DeleteOnly) {
           await customResourceRespond(event, "SUCCESS", "OK", "Deleter", {});
           break;
         }
-        console.log(`Starting CodeBuild project ${projectName}`);
-        await codebuild.send(new import_client_codebuild.StartBuildCommand({
-          projectName,
+        console.log(`Starting CodeBuild project ${props.ProjectName}`);
+        const cbRes = await codebuild.send(new import_client_codebuild.StartBuildCommand({
+          projectName: props.ProjectName,
           environmentVariablesOverride: [
             {
               type: "PLAINTEXT",
-              name: "STACK_ID",
-              value: event.StackId
-            },
-            {
-              type: "PLAINTEXT",
-              name: "REQUEST_ID",
-              value: event.RequestId
-            },
-            {
-              type: "PLAINTEXT",
-              name: "LOGICAL_RESOURCE_ID",
-              value: event.LogicalResourceId
-            },
-            {
-              type: "PLAINTEXT",
-              name: "RESPONSE_URL",
-              value: event.ResponseURL
+              name: "WAIT_HANDLE",
+              value: props.WaitHandle
             }
           ]
         }));
+        await customResourceRespond(event, "SUCCESS", "OK", cbRes.build?.id ?? "build", {});
         break;
       case "Delete":
-        if (ibName) {
-          const ibImages = await ib.send(new import_client_imagebuilder.ListImagesCommand({ filters: [{ name: "name", values: [ibName] }] }));
+        if (props.ImageBuilderName) {
+          const ibImages = await ib.send(new import_client_imagebuilder.ListImagesCommand({ filters: [{ name: "name", values: [props.ImageBuilderName] }] }));
           if (ibImages.imageVersionList) {
             for (const v of ibImages.imageVersionList) {
               if (v.arn) {

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

@@ -83,7 +83,7 @@ async function handleAmi(event, ami) {
 }
 async function handler(event, context) {
   try {
-    console.log(JSON.stringify({ ...event, ResponseURL: "..." }));
+    console.log({ ...event, ResponseURL: "..." });
     const ami = event.ResourceProperties.Ami;
     switch (event.RequestType) {
       case "Create":

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

@@ -29,7 +29,7 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function handler(event) {
-  console.log(JSON.stringify(event));
+  console.log(event);
   while (true) {
     try {
       await lambda.send(new import_client_lambda.UpdateFunctionCodeCommand({

package/assets/setup.lambda/index.html

@@ -11,7 +11,7 @@
               available to you. Apps are easier to set up and provide more fine-grained access control. If
               you have previously created an app, you can choose to use an existing app.`,p=d(),c=s("div"),a=s("input"),m=d(),u=s("label"),u.innerHTML="New GitHub App <b>(recommended)</b>",k=d(),g=s("div"),_=s("input"),E=d(),f=s("label"),f.textContent="Existing GitHub App",S=d(),C=s("div"),b=s("input"),v=d(),T=s("label"),T.textContent="Personal Access Token",o(a,"class","form-check-input"),o(a,"type","radio"),a.__value="newApp",a.value=a.__value,o(a,"id","newApp"),o(u,"class","form-check-label"),o(u,"for","newApp"),o(c,"class","form-check"),o(_,"class","form-check-input"),o(_,"type","radio"),_.__value="existingApp",_.value=_.__value,o(_,"id","existingApp"),o(f,"class","form-check-label"),o(f,"for","existingApp"),o(g,"class","form-check"),o(b,"class","form-check-input"),o(b,"type","radio"),b.__value="pat",b.value=b.__value,o(b,"id","pat"),o(T,"class","form-check-label"),o(T,"for","pat"),o(C,"class","form-check"),o(l,"class","px-3 py-3"),A.p(a,_,b)},m(h,R){H(h,t,R),H(h,r,R),H(h,l,R),n(l,i),n(l,p),n(l,c),n(c,a),a.checked=a.__value===e[2],n(c,m),n(c,u),n(l,k),n(l,g),n(g,_),_.checked=_.__value===e[2],n(g,E),n(g,f),n(l,S),n(l,C),n(C,b),b.checked=b.__value===e[2],n(C,v),n(C,T),y||(N=[P(a,"change",e[19]),P(_,"change",e[20]),P(b,"change",e[21])],y=!0)},p(h,R){R[0]&4&&(a.checked=a.__value===h[2]),R[0]&4&&(_.checked=_.__value===h[2]),R[0]&4&&(b.checked=b.__value===h[2])},d(h){h&&O(t),h&&O(r),h&&O(l),A.r(),y=!1,ne(N)}}}function ot(e){let t,r,l,i,p,c,a,m,u,k,g,_,E,f,S,C,b;return{c(){t=s("h2"),t.textContent="Personal Access Token",r=d(),l=s("div"),i=s("p"),p=z("The "),c=s("a"),a=z("personal access token"),u=z(" must have the "),k=s("code"),k.textContent="repo",g=z(`
               scope enabled. Don't forget to also create a webhook as described in `),_=s("a"),_.textContent="SETUP_GITHUB.md",E=z("."),f=d(),S=s("input"),o(c,"href",m="https://"+e[1]+"/settings/tokens"),o(_,"href","https://github.com/CloudSnorkel/cdk-github-runners/blob/main/SETUP_GITHUB.md"),o(S,"class","form-control"),o(S,"placeholder","Token e.g. ghp_abcdefghijklmnopqrstuvwxyz1234567890"),o(l,"class","px-3 py-3")},m(v,T){H(v,t,T),H(v,r,T),H(v,l,T),n(l,i),n(i,p),n(i,c),n(c,a),n(i,u),n(i,k),n(i,g),n(i,_),n(i,E),n(l,f),n(l,S),X(S,e[8]),C||(b=P(S,"input",e[30]),C=!0)},p(v,T){T[0]&2&&m!==(m="https://"+v[1]+"/settings/tokens")&&o(c,"href",m),T[0]&256&&S.value!==v[8]&&X(S,v[8])},d(v){v&&O(t),v&&O(r),v&&O(l),C=!1,b()}}}function rt(e){let t,r,l,i,p,c,a,m,u,k,g,_,E,f,S,C,b,v,T,A,y,N,h,R,B,G,le,$,ie,x,oe,re,U,ee,Z=JSON.stringify(e[4]==="repo"?e[12]:e[13],void 0,2)+"",K,te,q,se,ae,Y,Q,ue;return Y=me(e[16][0]),{c(){t=s("h3"),t.textContent="Existing App Details",r=d(),l=s("div"),i=s("div"),p=s("label"),p.textContent="App Id",c=d(),a=s("div"),m=s("input"),u=d(),k=s("div"),g=s("label"),g.textContent="Private Key",_=d(),E=s("div"),f=s("textarea"),S=d(),C=s("div"),b=s("div"),b.textContent="Registration Level",v=d(),T=s("div"),A=s("div"),y=s("input"),N=d(),h=s("label"),h.textContent="Repository",R=d(),B=s("div"),G=s("input"),le=d(),$=s("label"),$.textContent="Organization",ie=d(),x=s("h4"),x.textContent="Required Permissions",oe=d(),re=s("p"),re.textContent="The existing app must have the following permissions.",U=d(),ee=s("pre"),K=z(Z),te=d(),q=s("h4"),q.textContent="Webhook",se=d(),ae=s("p"),ae.innerHTML='Don&#39;t forget to set up the webhook and its secret as described in <a href="https://github.com/CloudSnorkel/cdk-github-runners/blob/main/SETUP_GITHUB.md">SETUP_GITHUB.md</a>.',o(p,"for","appid"),o(p,"class","col-sm-2 col-form-label"),o(m,"type","number"),o(m,"class","form-control"),o(m,"id","appid"),o(a,"class","col-sm-10"),o(i,"class","form-group row px-3 py-2"),o(g,"for","pk"),o(g,"class","col-sm-2 col-form-label"),o(f,"class","form-control"),o(f,"id","pk"),o(f,"rows","10"),o(E,"class","col-sm-10"),o(k,"class","form-group row px-3 py-2"),o(b,"class","col-sm-2 col-form-label"),o(y,"class","form-check-input"),o(y,"type","radio"),y.__value="repo",y.value=y.__value,o(y,"id","repo"),o(h,"class","form-check-label"),o(h,"for","repo"),o(A,"class","form-check"),o(G,"class","form-check-input"),o(G,"type","radio"),G.__value="org",G.value=G.__value,o(G,"id","org"),o($,"class","form-check-label"),o($,"for","org"),o(B,"class","form-check"),o(T,"class","col-sm-10"),o(C,"class","form-group row px-3 py-2"),o(l,"class","px-3 py-3"),Y.p(y,G)},m(I,F){H(I,t,F),H(I,r,F),H(I,l,F),n(l,i),n(i,p),n(i,c),n(i,a),n(a,m),X(m,e[6]),n(l,u),n(l,k),n(k,g),n(k,_),n(k,E),n(E,f),X(f,e[7]),n(l,S),n(l,C),n(C,b),n(C,v),n(C,T),n(T,A),n(A,y),y.checked=y.__value===e[4],n(A,N),n(A,h),n(T,R),n(T,B),n(B,G),G.checked=G.__value===e[4],n(B,le),n(B,$),n(l,ie),n(l,x),n(l,oe),n(l,re),n(l,U),n(l,ee),n(ee,K),n(l,te),n(l,q),n(l,se),n(l,ae),Q||(ue=[P(m,"input",e[26]),P(f,"input",e[27]),P(y,"change",e[28]),P(G,"change",e[29])],Q=!0)},p(I,F){F[0]&64&&We(m.value)!==I[6]&&X(m,I[6]),F[0]&128&&X(f,I[7]),F[0]&16&&(y.checked=y.__value===I[4]),F[0]&16&&(G.checked=G.__value===I[4]),F[0]&16&&Z!==(Z=JSON.stringify(I[4]==="repo"?I[12]:I[13],void 0,2)+"")&&be(K,Z)},d(I){I&&O(t),I&&O(r),I&&O(l),Y.r(),Q=!1,ne(ue)}}}function st(e){let t,r,l,i,p,c,a,m,u,k,g,_,E,f,S,C,b,v,T,A,y=e[0]==="ghes"&&Ge(e),N=e[3]==="org"&&Pe(e);return v=me(e[16][1]),{c(){t=s("h3"),t.textContent="New App Settings",r=d(),l=s("div"),i=s("p"),i.textContent=`Choose whether to create a new personal app or organization app. A private personal app can
-              only be used for repositories under your user. A private origination app can only be used
+              only be used for repositories under your user. A private organization app can only be used
               for repositories under that organization.`,p=d(),c=s("div"),a=s("input"),m=d(),u=s("label"),u.textContent="User app",k=d(),g=s("div"),_=s("input"),E=d(),f=s("label"),f.textContent="Organization app",S=d(),y&&y.c(),C=d(),N&&N.c(),b=Fe(),o(a,"class","form-check-input"),o(a,"type","radio"),a.__value="user",a.value=a.__value,o(a,"id","userScope"),o(u,"class","form-check-label"),o(u,"for","userScope"),o(c,"class","form-check"),o(_,"class","form-check-input"),o(_,"type","radio"),_.__value="org",_.value=_.__value,o(_,"id","orgScope"),o(f,"class","form-check-label"),o(f,"for","orgScope"),o(g,"class","form-check"),o(l,"class","px-3 py-3"),v.p(a,_)},m(h,R){H(h,t,R),H(h,r,R),H(h,l,R),n(l,i),n(l,p),n(l,c),n(c,a),a.checked=a.__value===e[3],n(c,m),n(c,u),n(l,k),n(l,g),n(g,_),_.checked=_.__value===e[3],n(g,E),n(g,f),n(l,S),y&&y.m(l,null),H(h,C,R),N&&N.m(h,R),H(h,b,R),T||(A=[P(a,"change",e[22]),P(_,"change",e[23])],T=!0)},p(h,R){R[0]&8&&(a.checked=a.__value===h[3]),R[0]&8&&(_.checked=_.__value===h[3]),h[0]==="ghes"?y?y.p(h,R):(y=Ge(h),y.c(),y.m(l,null)):y&&(y.d(1),y=null),h[3]==="org"?N?N.p(h,R):(N=Pe(h),N.c(),N.m(b.parentNode,b)):N&&(N.d(1),N=null)},d(h){h&&O(t),h&&O(r),h&&O(l),y&&y.d(),h&&O(C),N&&N.d(h),h&&O(b),v.r(),T=!1,ne(A)}}}function Ge(e){let t,r,l,i,p,c,a,m;return{c(){t=s("p"),t.textContent=`If multiple organizations under the same GitHub Enterprise Server need to use the runners,
                 you can make the app public.`,r=d(),l=s("div"),i=s("input"),p=d(),c=s("label"),c.textContent="Public app",o(t,"class","pt-2"),o(i,"class","form-check-input"),o(i,"type","checkbox"),o(i,"id","public"),o(c,"class","form-check-label"),o(c,"for","public"),o(l,"class","form-check")},m(u,k){H(u,t,k),H(u,r,k),H(u,l,k),n(l,i),i.checked=e[11].public,n(l,p),n(l,c),a||(m=P(i,"change",e[24]),a=!0)},p(u,k){k[0]&2048&&(i.checked=u[11].public)},d(u){u&&O(t),u&&O(r),u&&O(l),a=!1,m()}}}function Pe(e){let t,r,l,i,p,c,a,m,u,k,g,_,E,f,S,C;return{c(){t=s("h3"),t.textContent="Organization name",r=d(),l=s("div"),i=s("p"),p=z(`What is the slug for your organization? If your repositories have a URL like
                 `),c=s("code"),a=z("https://"),m=z(e[1]),u=z("/MyOrg/my-repo"),k=z(`

package/assets/webhook-handler.lambda/index.js

@@ -13964,14 +13964,20 @@ async function handler(event) {
   }
   const payload = JSON.parse(body);
   if (payload.action !== "queued") {
-    console.log(`Ignoring action "${payload.action}", expecting "queued"`);
+    console.log({
+      notice: `Ignoring action "${payload.action}", expecting "queued"`,
+      job: payload.workflow_job
+    });
     return {
       statusCode: 200,
       body: 'OK. No runner started (action is not "queued").'
     };
   }
   if (process.env.REQUIRE_SELF_HOSTED_LABEL === "1" && !payload.workflow_job.labels.includes("self-hosted")) {
-    console.log(`Ignoring labels "${payload.workflow_job.labels}", expecting "self-hosted"`);
+    console.log({
+      notice: `Ignoring labels "${payload.workflow_job.labels}", expecting "self-hosted"`,
+      job: payload.workflow_job
+    });
     return {
       statusCode: 200,
       body: 'OK. No runner started (no "self-hosted" label).'
@@ -13979,38 +13985,50 @@ async function handler(event) {
   }
   const provider = matchLabelsToProvider(payload.workflow_job.labels);
   if (!provider) {
-    console.log(`Ignoring labels "${payload.workflow_job.labels}", as they don't match a supported runner provider`);
+    console.log({
+      notice: `Ignoring labels "${payload.workflow_job.labels}", as they don't match a supported runner provider`,
+      job: payload.workflow_job
+    });
     return {
       statusCode: 200,
       body: "OK. No runner started (no provider with matching labels)."
     };
   }
   if (await isDeploymentPending(payload)) {
-    console.log("Ignoring job as its deployment is still pending");
+    console.log({
+      notice: "Ignoring job as its deployment is still pending",
+      job: payload.workflow_job
+    });
     return {
       statusCode: 200,
       body: "OK. No runner started (deployment pending)."
     };
   }
-  let executionName = `${payload.repository.full_name.replace("/", "-")}-${getHeader(event, "x-github-delivery")}`.slice(0, 64);
-  const input = JSON.stringify({
+  let executionName = payload.repository.full_name.replace("/", "-").slice(0, 50);
+  let deliveryId = getHeader(event, "x-github-delivery") ?? `${Math.random()}`;
+  executionName = `${executionName}-${deliveryId.slice(0, 63 - executionName.length)}`;
+  const input = {
     owner: payload.repository.owner.login,
     repo: payload.repository.name,
     jobId: payload.workflow_job.id,
     jobUrl: payload.workflow_job.html_url,
     installationId: payload.installation?.id ?? -1,
     // always pass value because step function can't handle missing input
-    labels: payload.workflow_job.labels,
+    labels: payload.workflow_job.labels.join(","),
     provider
-  });
+  };
   const execution = await sf.send(new import_client_sfn.StartExecutionCommand({
     stateMachineArn: process.env.STEP_FUNCTION_ARN,
-    input,
+    input: JSON.stringify(input),
     // name is not random so multiple execution of this webhook won't cause multiple builders to start
     name: executionName
   }));
-  console.log(`Started ${execution.executionArn}`);
-  console.log(input);
+  console.log({
+    notice: "Started orchestrator",
+    execution: execution.executionArn,
+    sfnInput: input,
+    job: payload.workflow_job
+  });
   return {
     statusCode: 202,
     body: executionName

package/lib/access.js

@@ -59,7 +59,7 @@ class LambdaAccess {
 }
 exports.LambdaAccess = LambdaAccess;
 _a = JSII_RTTI_SYMBOL_1;
-LambdaAccess[_a] = { fqn: "@cloudsnorkel/cdk-github-runners.LambdaAccess", version: "0.12.5" };
+LambdaAccess[_a] = { fqn: "@cloudsnorkel/cdk-github-runners.LambdaAccess", version: "0.13.1" };
 /**
  * @internal
  */

package/lib/idle-runner-repear.lambda.js

@@ -10,13 +10,19 @@ async function handler(event) {
     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}]`);
+        console.log({
+            notice: 'Checking runner',
+            input,
+        });
         const retryLater = () => result.batchItemFailures.push({ itemIdentifier: record.messageId });
         // check if step function is still running
         const execution = await sfn.send(new client_sfn_1.DescribeExecutionCommand({ executionArn: input.executionArn }));
         if (execution.status != 'RUNNING') {
             // no need to test again as runner already finished
-            console.log('Runner already finished');
+            console.log({
+                notice: 'Runner already finished',
+                input,
+            });
             continue;
         }
         // get github access
@@ -30,7 +36,10 @@ async function handler(event) {
         // find runner
         const runner = await (0, lambda_github_1.getRunner)(octokitCache, runnerLevel, input.owner, input.repo, input.runnerName);
         if (!runner) {
-            console.error(`Runner not running yet for ${input.owner}/${input.repo}:${input.runnerName}`);
+            console.log({
+                notice: 'Runner not running yet',
+                input,
+            });
             retryLater();
             continue;
         }
@@ -38,7 +47,10 @@ async function handler(event) {
         // we want to try again because the runner might be retried due to e.g. lambda timeout
         // we need to keep following the retry too and make sure it doesn't go idle
         if (runner.busy) {
-            console.log('Runner is not idle');
+            console.log({
+                notice: 'Runner is not idle',
+                input,
+            });
             retryLater();
             continue;
         }
@@ -50,14 +62,23 @@ async function handler(event) {
                 const startedDate = new Date(started * 1000);
                 const now = new Date();
                 const diffMs = now.getTime() - startedDate.getTime();
-                console.log(`Runner ${input.runnerName} started ${diffMs / 1000} seconds ago`);
+                console.log({
+                    notice: `Runner ${input.runnerName} started ${diffMs / 1000} seconds ago`,
+                    input,
+                });
                 if (diffMs > 1000 * input.maxIdleSeconds) {
                     // max idle time reached, delete runner
-                    console.log(`Runner ${input.runnerName} is idle for too long`);
+                    console.log({
+                        notice: `Runner ${input.runnerName} is idle for too long`,
+                        input,
+                    });
                     try {
                         // stop step function first, so it's marked as aborted with the proper error
                         // if we delete the runner first, the step function will be marked as failed with a generic error
-                        console.log(`Stopping step function ${input.executionArn}...`);
+                        console.log({
+                            notice: `Stopping step function ${input.executionArn}...`,
+                            input,
+                        });
                         await sfn.send(new client_sfn_1.StopExecutionCommand({
                             executionArn: input.executionArn,
                             error: 'IdleRunner',
@@ -65,16 +86,25 @@ async function handler(event) {
                         }));
                     }
                     catch (e) {
-                        console.error(`Failed to stop step function ${input.executionArn}: ${e}`);
+                        console.error({
+                            notice: `Failed to stop step function ${input.executionArn}: ${e}`,
+                            input,
+                        });
                         retryLater();
                         continue;
                     }
                     try {
-                        console.log(`Deleting runner ${runner.id}...`);
+                        console.log({
+                            notice: `Deleting runner ${runner.id}...`,
+                            input,
+                        });
                         await (0, lambda_github_1.deleteRunner)(octokitCache, runnerLevel, input.owner, input.repo, runner.id);
                     }
                     catch (e) {
-                        console.error(`Failed to delete runner ${runner.id}: ${e}`);
+                        console.error({
+                            notice: `Failed to delete runner ${runner.id}: ${e}`,
+                            input,
+                        });
                         retryLater();
                         continue;
                     }
@@ -89,11 +119,14 @@ async function handler(event) {
         }
         if (!found) {
             // no started label? retry later (it won't retry forever as eventually the runner will stop and the step function will finish)
-            console.error('No `cdkghr:started:xxx` label found???');
+            console.error({
+                notice: 'No `cdkghr:started:xxx` label found???',
+                input,
+            });
             retryLater();
         }
     }
     return result;
 }
 exports.handler = handler;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"idle-runner-repear.lambda.js","sourceRoot":"","sources":["../src/idle-runner-repear.lambda.ts"],"names":[],"mappings":";;;AAAA,oDAAgG;AAGhG,mDAAsE;AAWtE,MAAM,GAAG,GAAG,IAAI,sBAAS,EAAE,CAAC;AAErB,KAAK,UAAU,OAAO,CAAC,KAAyB;IACrD,MAAM,MAAM,GAA+B,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC;IACrE,IAAI,YAAiC,CAAC;IACtC,IAAI,WAAuC,CAAC;IAE5C,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAA0B,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,uBAAuB,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,kBAAkB,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;QAEnG,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;QAE7F,0CAA0C;QAC1C,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,qCAAwB,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QACrG,IAAI,SAAS,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;YAClC,mDAAmD;YACnD,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,SAAS;QACX,CAAC;QAED,oBAAoB;QACpB,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,mEAAmE;YACnE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,0BAAU,EAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAC1E,gIAAgI;YAChI,YAAY,GAAG,OAAO,CAAC;YACvB,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAC1C,CAAC;QAED,cAAc;QACd,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAS,EAAC,YAAY,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;QACrG,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,CAAC,8BAA8B,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;YAC7F,UAAU,EAAE,CAAC;YACb,SAAS;QACX,CAAC;QAED,+BAA+B;QAC/B,sFAAsF;QACtF,2EAA2E;QAC3E,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YAClC,UAAU,EAAE,CAAC;YACb,SAAS;QACX,CAAC;QAED,wCAAwC;QACxC,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClC,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC3D,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACrD,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;gBAC7C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;gBAErD,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,CAAC,UAAU,YAAY,MAAM,GAAC,IAAI,cAAc,CAAC,CAAC;gBAE7E,IAAI,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC;oBACzC,uCAAuC;oBACvC,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,CAAC,UAAU,uBAAuB,CAAC,CAAC;oBAE/D,IAAI,CAAC;wBACH,4EAA4E;wBAC5E,iGAAiG;wBACjG,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,CAAC,YAAY,KAAK,CAAC,CAAC;wBAC/D,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,iCAAoB,CAAC;4BACtC,YAAY,EAAE,KAAK,CAAC,YAAY;4BAChC,KAAK,EAAE,YAAY;4BACnB,KAAK,EAAE,UAAU,KAAK,CAAC,UAAU,OAAO,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,0BAA0B,MAAM,GAAG,IAAI,yBAAyB,KAAK,CAAC,cAAc,WAAW;yBACjK,CAAC,CAAC,CAAC;oBACN,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,OAAO,CAAC,KAAK,CAAC,gCAAgC,KAAK,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC,CAAC;wBAC1E,UAAU,EAAE,CAAC;wBACb,SAAS;oBACX,CAAC;oBAED,IAAI,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;wBAC/C,MAAM,IAAA,4BAAY,EAAC,YAAY,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;oBACpF,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,OAAO,CAAC,KAAK,CAAC,2BAA2B,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;wBAC5D,UAAU,EAAE,CAAC;wBACb,SAAS;oBACX,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,iDAAiD;oBACjD,UAAU,EAAE,CAAC;gBACf,CAAC;gBAED,KAAK,GAAG,IAAI,CAAC;gBACb,MAAM;YACR,CAAC;QACH,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,8HAA8H;YAC9H,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACxD,UAAU,EAAE,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AArGD,0BAqGC","sourcesContent":["import { DescribeExecutionCommand, SFNClient, StopExecutionCommand } from '@aws-sdk/client-sfn';\nimport { Octokit } from '@octokit/rest';\nimport * as AWSLambda from 'aws-lambda';\nimport { deleteRunner, getOctokit, getRunner } from './lambda-github';\n\ninterface IdleReaperLambdaInput {\n  readonly executionArn: string;\n  readonly runnerName: string;\n  readonly owner: string;\n  readonly repo: string;\n  readonly installationId?: number;\n  readonly maxIdleSeconds: number;\n}\n\nconst sfn = new SFNClient();\n\nexport async function handler(event: AWSLambda.SQSEvent): Promise<AWSLambda.SQSBatchResponse> {\n  const result: AWSLambda.SQSBatchResponse = { batchItemFailures: [] };\n  let octokitCache: Octokit | undefined;\n  let runnerLevel: 'repo' | 'org' | undefined;\n\n  for (const record of event.Records) {\n    const input = JSON.parse(record.body) as IdleReaperLambdaInput;\n    console.log(`Checking runner for ${input.owner}/${input.repo} [execution-id=${input.runnerName}]`);\n\n    const retryLater = () => result.batchItemFailures.push({ itemIdentifier: record.messageId });\n\n    // check if step function is still running\n    const execution = await sfn.send(new DescribeExecutionCommand({ executionArn: input.executionArn }));\n    if (execution.status != 'RUNNING') {\n      // no need to test again as runner already finished\n      console.log('Runner already finished');\n      continue;\n    }\n\n    // get github access\n    if (!octokitCache) {\n      // getOctokit calls secrets manager every time, so cache the result\n      const { octokit, githubSecrets } = await getOctokit(input.installationId);\n      // TODO if installationId changes during normal operations, we may have some records with good installationId, and some with bad\n      octokitCache = octokit;\n      runnerLevel = githubSecrets.runnerLevel;\n    }\n\n    // find runner\n    const runner = await getRunner(octokitCache, runnerLevel, input.owner, input.repo, input.runnerName);\n    if (!runner) {\n      console.error(`Runner not running yet for ${input.owner}/${input.repo}:${input.runnerName}`);\n      retryLater();\n      continue;\n    }\n\n    // if not idle, try again later\n    // we want to try again because the runner might be retried due to e.g. lambda timeout\n    // we need to keep following the retry too and make sure it doesn't go idle\n    if (runner.busy) {\n      console.log('Runner is not idle');\n      retryLater();\n      continue;\n    }\n\n    // check if max idle timeout has reached\n    let found = false;\n    for (const label of runner.labels) {\n      if (label.name.toLowerCase().startsWith('cdkghr:started:')) {\n        const started = parseFloat(label.name.split(':')[2]);\n        const startedDate = new Date(started * 1000);\n        const now = new Date();\n        const diffMs = now.getTime() - startedDate.getTime();\n\n        console.log(`Runner ${input.runnerName} started ${diffMs/1000} seconds ago`);\n\n        if (diffMs > 1000 * input.maxIdleSeconds) {\n          // max idle time reached, delete runner\n          console.log(`Runner ${input.runnerName} is idle for too long`);\n\n          try {\n            // stop step function first, so it's marked as aborted with the proper error\n            // if we delete the runner first, the step function will be marked as failed with a generic error\n            console.log(`Stopping step function ${input.executionArn}...`);\n            await sfn.send(new StopExecutionCommand({\n              executionArn: input.executionArn,\n              error: 'IdleRunner',\n              cause: `Runner ${input.runnerName} on ${input.owner}/${input.repo} is idle for too long (${diffMs / 1000} seconds and limit is ${input.maxIdleSeconds} seconds)`,\n            }));\n          } catch (e) {\n            console.error(`Failed to stop step function ${input.executionArn}: ${e}`);\n            retryLater();\n            continue;\n          }\n\n          try {\n            console.log(`Deleting runner ${runner.id}...`);\n            await deleteRunner(octokitCache, runnerLevel, input.owner, input.repo, runner.id);\n          } catch (e) {\n            console.error(`Failed to delete runner ${runner.id}: ${e}`);\n            retryLater();\n            continue;\n          }\n        } else {\n          // still idle, timeout not reached -- retry later\n          retryLater();\n        }\n\n        found = true;\n        break;\n      }\n    }\n\n    if (!found) {\n      // no started label? retry later (it won't retry forever as eventually the runner will stop and the step function will finish)\n      console.error('No `cdkghr:started:xxx` label found???');\n      retryLater();\n    }\n  }\n\n  return result;\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"idle-runner-repear.lambda.js","sourceRoot":"","sources":["../src/idle-runner-repear.lambda.ts"],"names":[],"mappings":"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","sourcesContent":["import { DescribeExecutionCommand, SFNClient, StopExecutionCommand } from '@aws-sdk/client-sfn';\nimport { Octokit } from '@octokit/rest';\nimport * as AWSLambda from 'aws-lambda';\nimport { deleteRunner, getOctokit, getRunner } from './lambda-github';\n\ninterface IdleReaperLambdaInput {\n  readonly executionArn: string;\n  readonly runnerName: string;\n  readonly owner: string;\n  readonly repo: string;\n  readonly installationId?: number;\n  readonly maxIdleSeconds: number;\n}\n\nconst sfn = new SFNClient();\n\nexport async function handler(event: AWSLambda.SQSEvent): Promise<AWSLambda.SQSBatchResponse> {\n  const result: AWSLambda.SQSBatchResponse = { batchItemFailures: [] };\n  let octokitCache: Octokit | undefined;\n  let runnerLevel: 'repo' | 'org' | undefined;\n\n  for (const record of event.Records) {\n    const input = JSON.parse(record.body) as IdleReaperLambdaInput;\n    console.log({\n      notice: 'Checking runner',\n      input,\n    });\n\n    const retryLater = () => result.batchItemFailures.push({ itemIdentifier: record.messageId });\n\n    // check if step function is still running\n    const execution = await sfn.send(new DescribeExecutionCommand({ executionArn: input.executionArn }));\n    if (execution.status != 'RUNNING') {\n      // no need to test again as runner already finished\n      console.log({\n        notice: 'Runner already finished',\n        input,\n      });\n      continue;\n    }\n\n    // get github access\n    if (!octokitCache) {\n      // getOctokit calls secrets manager every time, so cache the result\n      const { octokit, githubSecrets } = await getOctokit(input.installationId);\n      // TODO if installationId changes during normal operations, we may have some records with good installationId, and some with bad\n      octokitCache = octokit;\n      runnerLevel = githubSecrets.runnerLevel;\n    }\n\n    // find runner\n    const runner = await getRunner(octokitCache, runnerLevel, input.owner, input.repo, input.runnerName);\n    if (!runner) {\n      console.log({\n        notice: 'Runner not running yet',\n        input,\n      });\n      retryLater();\n      continue;\n    }\n\n    // if not idle, try again later\n    // we want to try again because the runner might be retried due to e.g. lambda timeout\n    // we need to keep following the retry too and make sure it doesn't go idle\n    if (runner.busy) {\n      console.log({\n        notice: 'Runner is not idle',\n        input,\n      });\n      retryLater();\n      continue;\n    }\n\n    // check if max idle timeout has reached\n    let found = false;\n    for (const label of runner.labels) {\n      if (label.name.toLowerCase().startsWith('cdkghr:started:')) {\n        const started = parseFloat(label.name.split(':')[2]);\n        const startedDate = new Date(started * 1000);\n        const now = new Date();\n        const diffMs = now.getTime() - startedDate.getTime();\n\n        console.log({\n          notice: `Runner ${input.runnerName} started ${diffMs / 1000} seconds ago`,\n          input,\n        });\n\n        if (diffMs > 1000 * input.maxIdleSeconds) {\n          // max idle time reached, delete runner\n          console.log({\n            notice: `Runner ${input.runnerName} is idle for too long`,\n            input,\n          });\n\n          try {\n            // stop step function first, so it's marked as aborted with the proper error\n            // if we delete the runner first, the step function will be marked as failed with a generic error\n            console.log({\n              notice: `Stopping step function ${input.executionArn}...`,\n              input,\n            });\n            await sfn.send(new StopExecutionCommand({\n              executionArn: input.executionArn,\n              error: 'IdleRunner',\n              cause: `Runner ${input.runnerName} on ${input.owner}/${input.repo} is idle for too long (${diffMs / 1000} seconds and limit is ${input.maxIdleSeconds} seconds)`,\n            }));\n          } catch (e) {\n            console.error({\n              notice: `Failed to stop step function ${input.executionArn}: ${e}`,\n              input,\n            });\n            retryLater();\n            continue;\n          }\n\n          try {\n            console.log({\n              notice: `Deleting runner ${runner.id}...`,\n              input,\n            });\n            await deleteRunner(octokitCache, runnerLevel, input.owner, input.repo, runner.id);\n          } catch (e) {\n            console.error({\n              notice: `Failed to delete runner ${runner.id}: ${e}`,\n              input,\n            });\n            retryLater();\n            continue;\n          }\n        } else {\n          // still idle, timeout not reached -- retry later\n          retryLater();\n        }\n\n        found = true;\n        break;\n      }\n    }\n\n    if (!found) {\n      // no started label? retry later (it won't retry forever as eventually the runner will stop and the step function will finish)\n      console.error({\n        notice: 'No `cdkghr:started:xxx` label found???',\n        input,\n      });\n      retryLater();\n    }\n  }\n\n  return result;\n}\n"]}

package/lib/image-builders/api.js

@@ -43,5 +43,5 @@ class RunnerImageBuilder extends common_1.RunnerImageBuilderBase {
 }
 exports.RunnerImageBuilder = RunnerImageBuilder;
 _a = JSII_RTTI_SYMBOL_1;
-RunnerImageBuilder[_a] = { fqn: "@cloudsnorkel/cdk-github-runners.RunnerImageBuilder", version: "0.12.5" };
+RunnerImageBuilder[_a] = { fqn: "@cloudsnorkel/cdk-github-runners.RunnerImageBuilder", version: "0.13.1" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ltYWdlLWJ1aWxkZXJzL2FwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUEwQztBQUUxQywyREFBd0U7QUFDeEUsMkNBQTBEO0FBQzFELHFDQUFvSTtBQUNwSSw0Q0FBa0M7QUFFbEM7Ozs7OztHQU1HO0FBQ0gsTUFBc0Isa0JBQW1CLFNBQVEsK0JBQXNCO0lBQ3JFOztPQUVHO0lBQ0gsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUErQjtRQUN0RSxJQUFJLEtBQUssRUFBRSxVQUFVLElBQUksS0FBSyxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQzdDLHlCQUFXLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLFVBQVUsQ0FBQyxrSEFBa0gsQ0FBQyxDQUFDO1FBQ3ZKLENBQUM7UUFFRCxJQUFJLEtBQUssRUFBRSxXQUFXLEtBQUssK0JBQXNCLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDN0QsT0FBTyxJQUFJLHVDQUEyQixDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDM0QsQ0FBQzthQUFNLElBQUksS0FBSyxFQUFFLFdBQVcsS0FBSywrQkFBc0IsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1lBQzNFLE9BQU8sSUFBSSxxREFBaUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ2pFLENBQUM7UUFFRCxNQUFNLEVBQUUsR0FBRyxLQUFLLEVBQUUsRUFBRSxJQUFJLGNBQUUsQ0FBQyxZQUFZLENBQUM7UUFDeEMsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLGNBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLENBQUM7WUFDcEMsT0FBTyxJQUFJLHVDQUEyQixDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDM0QsQ0FBQzthQUFNLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxjQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUM3QixPQUFPLElBQUkscURBQWlDLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNqRSxDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsMERBQTBELEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZGLENBQUM7SUFDSCxDQUFDOztBQXZCSCxnREF3QkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBbm5vdGF0aW9ucyB9IGZyb20gJ2F3cy1jZGstbGliJztcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuaW1wb3J0IHsgQXdzSW1hZ2VCdWlsZGVyUnVubmVySW1hZ2VCdWlsZGVyIH0gZnJvbSAnLi9hd3MtaW1hZ2UtYnVpbGRlcic7XG5pbXBvcnQgeyBDb2RlQnVpbGRSdW5uZXJJbWFnZUJ1aWxkZXIgfSBmcm9tICcuL2NvZGVidWlsZCc7XG5pbXBvcnQgeyBJQ29uZmlndXJhYmxlUnVubmVySW1hZ2VCdWlsZGVyLCBSdW5uZXJJbWFnZUJ1aWxkZXJCYXNlLCBSdW5uZXJJbWFnZUJ1aWxkZXJQcm9wcywgUnVubmVySW1hZ2VCdWlsZGVyVHlwZSB9IGZyb20gJy4vY29tbW9uJztcbmltcG9ydCB7IE9zIH0gZnJvbSAnLi4vcHJvdmlkZXJzJztcblxuLyoqXG4gKiBHaXRIdWIgUnVubmVyIGltYWdlIGJ1aWxkZXIuIEJ1aWxkcyBhIERvY2tlciBpbWFnZSBvciBBTUkgd2l0aCBHaXRIdWIgUnVubmVyIGFuZCBvdGhlciByZXF1aXJlbWVudHMgaW5zdGFsbGVkLlxuICpcbiAqIEltYWdlcyBjYW4gYmUgY3VzdG9taXplZCBiZWZvcmUgcGFzc2VkIGludG8gdGhlIHByb3ZpZGVyIGJ5IGFkZGluZyBvciByZW1vdmluZyBjb21wb25lbnRzIHRvIGJlIGluc3RhbGxlZC5cbiAqXG4gKiBJbWFnZXMgYXJlIHJlYnVpbHQgZXZlcnkgd2VlayBieSBkZWZhdWx0IHRvIGVuc3VyZSB0aGF0IHRoZSBsYXRlc3Qgc2VjdXJpdHkgcGF0Y2hlcyBhcmUgYXBwbGllZC5cbiAqL1xuZXhwb3J0IGFic3RyYWN0IGNsYXNzIFJ1bm5lckltYWdlQnVpbGRlciBleHRlbmRzIFJ1bm5lckltYWdlQnVpbGRlckJhc2Uge1xuICAvKipcbiAgICogQ3JlYXRlIGEgbmV3IGltYWdlIGJ1aWxkZXIgYmFzZWQgb24gdGhlIHByb3ZpZGVkIHByb3BlcnRpZXMuIFRoZSBpbXBsZW1lbnRhdGlvbiB3aWxsIGRpZmZlciBiYXNlZCBvbiB0aGUgT1MsIGFyY2hpdGVjdHVyZSwgYW5kIHJlcXVlc3RlZCBidWlsZGVyIHR5cGUuXG4gICAqL1xuICBzdGF0aWMgbmV3KHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzPzogUnVubmVySW1hZ2VCdWlsZGVyUHJvcHMpOiBJQ29uZmlndXJhYmxlUnVubmVySW1hZ2VCdWlsZGVyIHtcbiAgICBpZiAocHJvcHM/LmNvbXBvbmVudHMgJiYgcHJvcHMucnVubmVyVmVyc2lvbikge1xuICAgICAgQW5ub3RhdGlvbnMub2Yoc2NvcGUpLmFkZFdhcm5pbmcoJ3J1bm5lclZlcnNpb24gaXMgaWdub3JlZCB3aGVuIGNvbXBvbmVudHMgYXJlIHNwZWNpZmllZC4gVGhlIHJ1bm5lciB2ZXJzaW9uIHdpbGwgYmUgZGV0ZXJtaW5lZCBieSB0aGUgY29tcG9uZW50cy4nKTtcbiAgICB9XG5cbiAgICBpZiAocHJvcHM/LmJ1aWxkZXJUeXBlID09PSBSdW5uZXJJbWFnZUJ1aWxkZXJUeXBlLkNPREVfQlVJTEQpIHtcbiAgICAgIHJldHVybiBuZXcgQ29kZUJ1aWxkUnVubmVySW1hZ2VCdWlsZGVyKHNjb3BlLCBpZCwgcHJvcHMpO1xuICAgIH0gZWxzZSBpZiAocHJvcHM/LmJ1aWxkZXJUeXBlID09PSBSdW5uZXJJbWFnZUJ1aWxkZXJUeXBlLkFXU19JTUFHRV9CVUlMREVSKSB7XG4gICAgICByZXR1cm4gbmV3IEF3c0ltYWdlQnVpbGRlclJ1bm5lckltYWdlQnVpbGRlcihzY29wZSwgaWQsIHByb3BzKTtcbiAgICB9XG5cbiAgICBjb25zdCBvcyA9IHByb3BzPy5vcyA/PyBPcy5MSU5VWF9VQlVOVFU7XG4gICAgaWYgKG9zLmlzSW4oT3MuX0FMTF9MSU5VWF9WRVJTSU9OUykpIHtcbiAgICAgIHJldHVybiBuZXcgQ29kZUJ1aWxkUnVubmVySW1hZ2VCdWlsZGVyKHNjb3BlLCBpZCwgcHJvcHMpO1xuICAgIH0gZWxzZSBpZiAob3MuaXMoT3MuV0lORE9XUykpIHtcbiAgICAgIHJldHVybiBuZXcgQXdzSW1hZ2VCdWlsZGVyUnVubmVySW1hZ2VCdWlsZGVyKHNjb3BlLCBpZCwgcHJvcHMpO1xuICAgIH0gZWxzZSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoYFVuYWJsZSB0byBmaW5kIHJ1bm5lciBpbWFnZSBidWlsZGVyIGltcGxlbWVudGF0aW9uIGZvciAke29zLm5hbWV9YCk7XG4gICAgfVxuICB9XG59XG4iXX0=

package/lib/image-builders/aws-image-builder/builder.d.ts

@@ -155,6 +155,7 @@ export declare class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilde
     private infrastructure;
     private readonly role;
     private readonly fastLaunchOptions?;
+    private readonly waitOnDeploy;
     constructor(scope: Construct, id: string, props?: RunnerImageBuilderProps);
     private platform;
     /**
@@ -181,7 +182,7 @@ export declare class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilde
  */
 export declare class AwsImageBuilderFailedBuildNotifier implements cdk.IAspect {
     private topic;
-    static createFilteringTopic(scope: Construct, targetTopic: sns.Topic): cdk.aws_sns.Topic;
+    static createFilteringTopic(scope: Construct, targetTopic: sns.Topic): sns.ITopic;
     constructor(topic: sns.ITopic);
     visit(node: IConstruct): void;
 }