@cloudsnorkel/cdk-github-runners 0.13.4 → 0.14.1

package/API.md

@@ -8,7 +8,7 @@
 
 An AMI builder that uses AWS Image Builder to build AMIs pre-baked with all the GitHub Actions runner requirements.
 
-Builders can be used with {@link Ec2Runner }.
+Builders can be used with {@link Ec2RunnerProvider }.
 
 Each builder re-runs automatically at a set interval to make sure the AMIs contain the latest versions of everything.
 
@@ -197,7 +197,7 @@ Any object.
 
 ##### ~~`node`~~<sup>Required</sup> <a name="node" id="@cloudsnorkel/cdk-github-runners.AmiBuilder.property.node"></a>
 
-- *Deprecated:* use RunnerImageBuilder
+- *Deprecated:* use RunnerImageBuilder, e.g. with Ec2RunnerProvider.imageBuilder()
 
 ```typescript
 public readonly node: Node;
@@ -211,7 +211,7 @@ The tree node.
 
 ##### ~~`connections`~~<sup>Required</sup> <a name="connections" id="@cloudsnorkel/cdk-github-runners.AmiBuilder.property.connections"></a>
 
-- *Deprecated:* use RunnerImageBuilder
+- *Deprecated:* use RunnerImageBuilder, e.g. with Ec2RunnerProvider.imageBuilder()
 
 ```typescript
 public readonly connections: Connections;
@@ -3876,7 +3876,7 @@ You can customize the OS, architecture, VPC, subnet, security groups, etc. by pa
 
 You can add components to the image builder by calling `imageBuilder.addComponent()`.
 
-The default OS is Amazon Linux 2 running on x64 architecture.
+The default OS is Amazon Linux 2023 running on x64 architecture.
 
 Included components:
  * `RunnerImageComponent.requiredPackages()`
@@ -3887,8 +3887,6 @@ Included components:
  * `RunnerImageComponent.githubRunner()`
  * `RunnerImageComponent.lambdaEntrypoint()`
 
- Base Docker image: `public.ecr.aws/lambda/nodejs:20-x86_64` or `public.ecr.aws/lambda/nodejs:20-arm64`
-
 ###### `scope`<sup>Required</sup> <a name="scope" id="@cloudsnorkel/cdk-github-runners.LambdaRunner.imageBuilder.parameter.scope"></a>
 
 - *Type:* constructs.Construct
@@ -4242,7 +4240,7 @@ You can customize the OS, architecture, VPC, subnet, security groups, etc. by pa
 
 You can add components to the image builder by calling `imageBuilder.addComponent()`.
 
-The default OS is Amazon Linux 2 running on x64 architecture.
+The default OS is Amazon Linux 2023 running on x64 architecture.
 
 Included components:
  * `RunnerImageComponent.requiredPackages()`
@@ -4253,8 +4251,6 @@ Included components:
  * `RunnerImageComponent.githubRunner()`
  * `RunnerImageComponent.lambdaEntrypoint()`
 
- Base Docker image: `public.ecr.aws/lambda/nodejs:20-x86_64` or `public.ecr.aws/lambda/nodejs:20-arm64`
-
 ###### `scope`<sup>Required</sup> <a name="scope" id="@cloudsnorkel/cdk-github-runners.LambdaRunnerProvider.imageBuilder.parameter.scope"></a>
 
 - *Type:* constructs.Construct

package/README.md

@@ -65,9 +65,14 @@ You can also create your own provider by implementing `IRunnerProvider`.
    ```
    ### Use
    ```python
+   from aws_cdk import App, Stack
    from cloudsnorkel.cdk_github_runners import GitHubRunners
    
-   GitHubRunners(self, "runners")
+   app = App()
+   stack = Stack(app, "github-runners")
+   GitHubRunners(stack, "runners")
+   
+   app.synth()
    ```
    </details>
    <details><summary>TypeScript or JavaScript</summary>
@@ -79,9 +84,14 @@ You can also create your own provider by implementing `IRunnerProvider`.
    ```
    ### Use
    ```typescript
+   import { App, Stack } from 'aws-cdk-lib';
    import { GitHubRunners } from '@cloudsnorkel/cdk-github-runners';
    
-   new GitHubRunners(this, "runners");
+   const app = new App();
+   const stack = new Stack(app, 'github-runners');
+   new GitHubRunners(stack, 'runners');
+   
+   app.synth();
    ```
    </details>
    <details><summary>Java</summary>
@@ -96,9 +106,19 @@ You can also create your own provider by implementing `IRunnerProvider`.
    ```
    ### Use
    ```java
+   import software.amazon.awscdk.App;
+   import software.amazon.awscdk.Stack;
    import com.cloudsnorkel.cdk.github.runners.GitHubRunners;
    
-   GitHubRunners.Builder.create(this, "runners").build();
+   public class Example {
+     public static void main(String[] args){
+       App app = new App();
+       Stack stack = new Stack(app, "github-runners");
+       GitHubRunners.Builder.create(stack, "runners").build();
+   
+       app.synth();
+     }
+   } 
    ```
    </details>
    <details><summary>Go</summary>
@@ -110,9 +130,21 @@ You can also create your own provider by implementing `IRunnerProvider`.
    ```
    ### Use
    ```go
-   import "github.com/CloudSnorkel/cdk-github-runners-go/cloudsnorkelcdkgithubrunners"
+   package main
+
+   import (
+     "github.com/CloudSnorkel/cdk-github-runners-go/cloudsnorkelcdkgithubrunners"
+     "github.com/aws/aws-cdk-go/awscdk/v2"
+     "github.com/aws/jsii-runtime-go"
+   )
+   
+   func main() {
+     app := awscdk.NewApp(nil)
+     stack := awscdk.NewStack(app, jsii.String("github-runners"), &awscdk.StackProps{})
+     cloudsnorkelcdkgithubrunners.NewGitHubRunners(stack, jsii.String("runners"), &cloudsnorkelcdkgithubrunners.GitHubRunnersProps{})
    
-   NewGitHubRunners(this, jsii.String("runners"))
+     app.Synth(nil)
+   }
    ```
    </details>
    <details><summary>.NET</summary>
@@ -124,9 +156,22 @@ You can also create your own provider by implementing `IRunnerProvider`.
    ```
    ### Use
    ```csharp
+   using Amazon.CDK;
    using CloudSnorkel;
    
-   new GitHubRunners(this, "runners");
+   namespace Example
+   {
+     sealed class Program
+     {
+       public static void Main(string[] args)
+       {
+         var app = new App();
+         var stack = new Stack(app, "github-runners");
+         new GitHubRunners(stack, "runners");
+         app.Synth();
+       }
+     }
+   }
    ```
    </details>
 2. Use `GitHubRunners` construct in your code (starting with default arguments is fine)

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

@@ -0,0 +1,209 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/image-builders/aws-image-builder/delete-resources.lambda.ts
+var delete_resources_lambda_exports = {};
+__export(delete_resources_lambda_exports, {
+  handler: () => handler
+});
+module.exports = __toCommonJS(delete_resources_lambda_exports);
+var import_client_ec2 = require("@aws-sdk/client-ec2");
+var import_client_ecr = require("@aws-sdk/client-ecr");
+var import_client_imagebuilder = require("@aws-sdk/client-imagebuilder");
+
+// src/lambda-helpers.ts
+var import_client_secrets_manager = require("@aws-sdk/client-secrets-manager");
+var sm = new import_client_secrets_manager.SecretsManagerClient();
+async function customResourceRespond(event, responseStatus, reason, physicalResourceId, data) {
+  const responseBody = JSON.stringify({
+    Status: responseStatus,
+    Reason: reason,
+    PhysicalResourceId: physicalResourceId,
+    StackId: event.StackId,
+    RequestId: event.RequestId,
+    LogicalResourceId: event.LogicalResourceId,
+    NoEcho: false,
+    Data: data
+  });
+  console.log("Responding", responseBody);
+  const parsedUrl = require("url").parse(event.ResponseURL);
+  const requestOptions = {
+    hostname: parsedUrl.hostname,
+    path: parsedUrl.path,
+    method: "PUT",
+    headers: {
+      "content-type": "",
+      "content-length": responseBody.length
+    }
+  };
+  return new Promise((resolve, reject) => {
+    try {
+      const request = require("https").request(requestOptions, resolve);
+      request.on("error", reject);
+      request.write(responseBody);
+      request.end();
+    } catch (e) {
+      reject(e);
+    }
+  });
+}
+
+// src/image-builders/aws-image-builder/delete-resources.lambda.ts
+var ec2 = new import_client_ec2.EC2Client();
+var ecr = new import_client_ecr.ECRClient();
+var ib = new import_client_imagebuilder.ImagebuilderClient();
+async function deleteResources(props) {
+  const buildsToDelete = [];
+  const amisToDelete = [];
+  const dockerImagesToDelete = [];
+  let result = {};
+  do {
+    result = await ib.send(new import_client_imagebuilder.ListImageBuildVersionsCommand({
+      imageVersionArn: props.ImageVersionArn,
+      nextToken: result.nextToken
+    }));
+    if (result.imageSummaryList) {
+      for (const image of result.imageSummaryList) {
+        if (image.arn) {
+          buildsToDelete.push(image.arn);
+        }
+        for (const output of image.outputResources?.amis ?? []) {
+          if (output.image) {
+            amisToDelete.push(output.image);
+          }
+        }
+        for (const output of image.outputResources?.containers ?? []) {
+          if (output.imageUris) {
+            dockerImagesToDelete.push(...output.imageUris);
+          }
+        }
+      }
+    }
+  } while (result.nextToken);
+  for (const imageId of amisToDelete) {
+    try {
+      console.log({
+        notice: "Deleting AMI",
+        image: imageId
+      });
+      const imageDesc = await ec2.send(new import_client_ec2.DescribeImagesCommand({
+        Owners: ["self"],
+        ImageIds: [imageId]
+      }));
+      if (imageDesc.Images?.length !== 1) {
+        console.warn({
+          notice: "Unable to find AMI",
+          image: imageId
+        });
+        continue;
+      }
+      await ec2.send(new import_client_ec2.DeregisterImageCommand({
+        ImageId: imageId
+      }));
+      for (const blockMapping of imageDesc.Images[0].BlockDeviceMappings ?? []) {
+        if (blockMapping.Ebs?.SnapshotId) {
+          console.log({
+            notice: "Deleting EBS snapshot",
+            image: imageId,
+            snapshot: blockMapping.Ebs.SnapshotId
+          });
+          await ec2.send(new import_client_ec2.DeleteSnapshotCommand({
+            SnapshotId: blockMapping.Ebs.SnapshotId
+          }));
+        }
+      }
+    } catch (e) {
+      console.warn({
+        notice: "Failed to delete AMI",
+        image: imageId,
+        error: e
+      });
+    }
+  }
+  for (const image of dockerImagesToDelete) {
+    try {
+      console.log({
+        notice: "Deleting Docker Image",
+        image
+      });
+      const parts = image.split("/")[1].split(":");
+      const repo = parts[0];
+      const tag = parts[1];
+      await ecr.send(new import_client_ecr.BatchDeleteImageCommand({
+        repositoryName: repo,
+        imageIds: [
+          {
+            imageTag: tag
+          }
+        ]
+      }));
+    } catch (e) {
+      console.warn({
+        notice: "Failed to delete docker image",
+        image,
+        error: e
+      });
+    }
+  }
+  for (const build of buildsToDelete) {
+    try {
+      console.log({
+        notice: "Deleting Image Build",
+        build
+      });
+      await ib.send(new import_client_imagebuilder.DeleteImageCommand({
+        imageBuildVersionArn: build
+      }));
+    } catch (e) {
+      console.warn({
+        notice: "Failed to delete image version build",
+        build,
+        error: e
+      });
+    }
+  }
+}
+async function handler(event, _context) {
+  try {
+    console.log({
+      ...event,
+      ResponseURL: "..."
+    });
+    const props = event.ResourceProperties;
+    switch (event.RequestType) {
+      case "Create":
+      case "Update":
+        await customResourceRespond(event, "SUCCESS", "OK", props.ImageVersionArn, {});
+        break;
+      case "Delete":
+        if (event.PhysicalResourceId != "FAIL") {
+          await deleteResources(props);
+        }
+        await customResourceRespond(event, "SUCCESS", "OK", event.PhysicalResourceId, {});
+        break;
+    }
+  } catch (e) {
+    console.error(e);
+    await customResourceRespond(event, "FAILED", e.message || "Internal Error", "FAIL", {});
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handler
+});

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

@@ -24,7 +24,6 @@ __export(build_image_lambda_exports, {
 });
 module.exports = __toCommonJS(build_image_lambda_exports);
 var import_client_codebuild = require("@aws-sdk/client-codebuild");
-var import_client_imagebuilder = require("@aws-sdk/client-imagebuilder");
 
 // src/lambda-helpers.ts
 var import_client_secrets_manager = require("@aws-sdk/client-secrets-manager");
@@ -65,7 +64,6 @@ async function customResourceRespond(event, responseStatus, reason, physicalReso
 
 // src/image-builders/build-image.lambda.ts
 var codebuild = new import_client_codebuild.CodeBuildClient();
-var ib = new import_client_imagebuilder.ImagebuilderClient();
 async function handler(event, context) {
   try {
     console.log({ ...event, ResponseURL: "..." });
@@ -73,10 +71,6 @@ async function handler(event, context) {
     switch (event.RequestType) {
       case "Create":
       case "Update":
-        if (props.DeleteOnly) {
-          await customResourceRespond(event, "SUCCESS", "OK", "Deleter", {});
-          break;
-        }
         console.log(`Starting CodeBuild project ${props.ProjectName}`);
         const cbRes = await codebuild.send(new import_client_codebuild.StartBuildCommand({
           projectName: props.ProjectName,
@@ -91,24 +85,6 @@ async function handler(event, context) {
         await customResourceRespond(event, "SUCCESS", "OK", cbRes.build?.id ?? "build", {});
         break;
       case "Delete":
-        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) {
-                const ibImageVersions = await ib.send(new import_client_imagebuilder.ListImageBuildVersionsCommand({ imageVersionArn: v.arn }));
-                if (ibImageVersions.imageSummaryList) {
-                  for (const vs of ibImageVersions.imageSummaryList) {
-                    if (vs.arn) {
-                      console.log(`Deleting ${vs.arn}`);
-                      await ib.send(new import_client_imagebuilder.DeleteImageCommand({ imageBuildVersionArn: vs.arn }));
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
         await customResourceRespond(event, "SUCCESS", "OK", event.PhysicalResourceId, {});
         break;
     }

package/assets/providers/lambda-bootstrap.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -euo pipefail
+
+while true
+do
+  # get data from lambda
+  HEADERS="$(mktemp)"
+  EVENT_DATA=$(curl -sS -LD "$HEADERS" "http://${AWS_LAMBDA_RUNTIME_API}/2018-06-01/runtime/invocation/next")
+  REQUEST_ID=$(grep -Fi Lambda-Runtime-Aws-Request-Id "$HEADERS" | tr -d '[:space:]' | cut -d: -f2)
+
+  # execute runner and respond
+  if bash /runner.sh "$EVENT_DATA"; then
+    curl "http://${AWS_LAMBDA_RUNTIME_API}/2018-06-01/runtime/invocation/$REQUEST_ID/response" -d ""
+  else
+    curl "http://${AWS_LAMBDA_RUNTIME_API}/2018-06-01/runtime/invocation/$REQUEST_ID/error" -d "{\"errorMessage\": \"Runner failed with exit code $?\", \"errorType\": \"Error\", \"stackTrace\": []}"
+  fi
+
+  # cleanup
+  find /tmp -mindepth 1 -maxdepth 1 -exec rm -rf '{}' \;
+done

package/assets/providers/lambda-runner.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# workaround for "Cannot get required symbol EVP_rc2_cbc from libssl"
+# lambda docker image for node.js comes with stripped down libssl.so pushed in LD_LIBRARY_PATH
+if [ -f /var/lang/lib/libssl.so ]; then
+  export LD_LIBRARY_PATH=/usr/lib64:$LD_LIBRARY_PATH
+fi
+
+# extract parameters
+OWNER=$(echo "$1" | jq -r .owner)
+REPO=$(echo "$1" | jq -r .repo)
+GITHUB_DOMAIN=$(echo "$1" | jq -r .githubDomain)
+RUNNER_TOKEN=$(echo "$1" | jq -r .token)
+RUNNER_NAME=$(echo "$1" | jq -r .runnerName)
+RUNNER_LABEL=$(echo "$1" | jq -r .label)
+REGISTRATION_URL=$(echo "$1" | jq -r .registrationUrl)
+
+# copy runner code (it needs a writable directory)
+cp -r /home/runner /tmp/
+cd /tmp/runner
+
+# setup home directory
+mkdir /tmp/home
+export HOME=/tmp/home
+
+# start runner
+if [ "${RUNNER_VERSION}" = "latest" ]; then RUNNER_FLAGS=""; else RUNNER_FLAGS="--disableupdate"; fi
+./config.sh --unattended --url "${REGISTRATION_URL}" --token "${RUNNER_TOKEN}" --ephemeral --work _work --labels "${RUNNER_LABEL},cdkghr:started:`date +%s`" --name "${RUNNER_NAME}" ${RUNNER_FLAGS}
+echo Config done
+./run.sh
+echo Run done
+
+# print status for metrics
+STATUS=$(grep -Phors "finish job request for job [0-9a-f\-]+ with result: \K.*" _diag/ | tail -n1)
+[ -n "$STATUS" ] && echo CDKGHA JOB DONE "$RUNNER_LABEL" "$STATUS"

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.13.4" };
+LambdaAccess[_a] = { fqn: "@cloudsnorkel/cdk-github-runners.LambdaAccess", version: "0.14.1" };
 /**
  * @internal
  */

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.13.4" };
+RunnerImageBuilder[_a] = { fqn: "@cloudsnorkel/cdk-github-runners.RunnerImageBuilder", version: "0.14.1" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ltYWdlLWJ1aWxkZXJzL2FwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUEwQztBQUUxQywyREFBd0U7QUFDeEUsMkNBQTBEO0FBQzFELHFDQUFvSTtBQUNwSSw0Q0FBa0M7QUFFbEM7Ozs7OztHQU1HO0FBQ0gsTUFBc0Isa0JBQW1CLFNBQVEsK0JBQXNCO0lBQ3JFOztPQUVHO0lBQ0gsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUErQjtRQUN0RSxJQUFJLEtBQUssRUFBRSxVQUFVLElBQUksS0FBSyxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQzdDLHlCQUFXLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLFVBQVUsQ0FBQyxrSEFBa0gsQ0FBQyxDQUFDO1FBQ3ZKLENBQUM7UUFFRCxJQUFJLEtBQUssRUFBRSxXQUFXLEtBQUssK0JBQXNCLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDN0QsT0FBTyxJQUFJLHVDQUEyQixDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDM0QsQ0FBQzthQUFNLElBQUksS0FBSyxFQUFFLFdBQVcsS0FBSywrQkFBc0IsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1lBQzNFLE9BQU8sSUFBSSxxREFBaUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ2pFLENBQUM7UUFFRCxNQUFNLEVBQUUsR0FBRyxLQUFLLEVBQUUsRUFBRSxJQUFJLGNBQUUsQ0FBQyxZQUFZLENBQUM7UUFDeEMsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLGNBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLENBQUM7WUFDcEMsT0FBTyxJQUFJLHVDQUEyQixDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDM0QsQ0FBQzthQUFNLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxjQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUM3QixPQUFPLElBQUkscURBQWlDLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNqRSxDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsMERBQTBELEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZGLENBQUM7SUFDSCxDQUFDOztBQXZCSCxnREF3QkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBbm5vdGF0aW9ucyB9IGZyb20gJ2F3cy1jZGstbGliJztcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuaW1wb3J0IHsgQXdzSW1hZ2VCdWlsZGVyUnVubmVySW1hZ2VCdWlsZGVyIH0gZnJvbSAnLi9hd3MtaW1hZ2UtYnVpbGRlcic7XG5pbXBvcnQgeyBDb2RlQnVpbGRSdW5uZXJJbWFnZUJ1aWxkZXIgfSBmcm9tICcuL2NvZGVidWlsZCc7XG5pbXBvcnQgeyBJQ29uZmlndXJhYmxlUnVubmVySW1hZ2VCdWlsZGVyLCBSdW5uZXJJbWFnZUJ1aWxkZXJCYXNlLCBSdW5uZXJJbWFnZUJ1aWxkZXJQcm9wcywgUnVubmVySW1hZ2VCdWlsZGVyVHlwZSB9IGZyb20gJy4vY29tbW9uJztcbmltcG9ydCB7IE9zIH0gZnJvbSAnLi4vcHJvdmlkZXJzJztcblxuLyoqXG4gKiBHaXRIdWIgUnVubmVyIGltYWdlIGJ1aWxkZXIuIEJ1aWxkcyBhIERvY2tlciBpbWFnZSBvciBBTUkgd2l0aCBHaXRIdWIgUnVubmVyIGFuZCBvdGhlciByZXF1aXJlbWVudHMgaW5zdGFsbGVkLlxuICpcbiAqIEltYWdlcyBjYW4gYmUgY3VzdG9taXplZCBiZWZvcmUgcGFzc2VkIGludG8gdGhlIHByb3ZpZGVyIGJ5IGFkZGluZyBvciByZW1vdmluZyBjb21wb25lbnRzIHRvIGJlIGluc3RhbGxlZC5cbiAqXG4gKiBJbWFnZXMgYXJlIHJlYnVpbHQgZXZlcnkgd2VlayBieSBkZWZhdWx0IHRvIGVuc3VyZSB0aGF0IHRoZSBsYXRlc3Qgc2VjdXJpdHkgcGF0Y2hlcyBhcmUgYXBwbGllZC5cbiAqL1xuZXhwb3J0IGFic3RyYWN0IGNsYXNzIFJ1bm5lckltYWdlQnVpbGRlciBleHRlbmRzIFJ1bm5lckltYWdlQnVpbGRlckJhc2Uge1xuICAvKipcbiAgICogQ3JlYXRlIGEgbmV3IGltYWdlIGJ1aWxkZXIgYmFzZWQgb24gdGhlIHByb3ZpZGVkIHByb3BlcnRpZXMuIFRoZSBpbXBsZW1lbnRhdGlvbiB3aWxsIGRpZmZlciBiYXNlZCBvbiB0aGUgT1MsIGFyY2hpdGVjdHVyZSwgYW5kIHJlcXVlc3RlZCBidWlsZGVyIHR5cGUuXG4gICAqL1xuICBzdGF0aWMgbmV3KHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzPzogUnVubmVySW1hZ2VCdWlsZGVyUHJvcHMpOiBJQ29uZmlndXJhYmxlUnVubmVySW1hZ2VCdWlsZGVyIHtcbiAgICBpZiAocHJvcHM/LmNvbXBvbmVudHMgJiYgcHJvcHMucnVubmVyVmVyc2lvbikge1xuICAgICAgQW5ub3RhdGlvbnMub2Yoc2NvcGUpLmFkZFdhcm5pbmcoJ3J1bm5lclZlcnNpb24gaXMgaWdub3JlZCB3aGVuIGNvbXBvbmVudHMgYXJlIHNwZWNpZmllZC4gVGhlIHJ1bm5lciB2ZXJzaW9uIHdpbGwgYmUgZGV0ZXJtaW5lZCBieSB0aGUgY29tcG9uZW50cy4nKTtcbiAgICB9XG5cbiAgICBpZiAocHJvcHM/LmJ1aWxkZXJUeXBlID09PSBSdW5uZXJJbWFnZUJ1aWxkZXJUeXBlLkNPREVfQlVJTEQpIHtcbiAgICAgIHJldHVybiBuZXcgQ29kZUJ1aWxkUnVubmVySW1hZ2VCdWlsZGVyKHNjb3BlLCBpZCwgcHJvcHMpO1xuICAgIH0gZWxzZSBpZiAocHJvcHM/LmJ1aWxkZXJUeXBlID09PSBSdW5uZXJJbWFnZUJ1aWxkZXJUeXBlLkFXU19JTUFHRV9CVUlMREVSKSB7XG4gICAgICByZXR1cm4gbmV3IEF3c0ltYWdlQnVpbGRlclJ1bm5lckltYWdlQnVpbGRlcihzY29wZSwgaWQsIHByb3BzKTtcbiAgICB9XG5cbiAgICBjb25zdCBvcyA9IHByb3BzPy5vcyA/PyBPcy5MSU5VWF9VQlVOVFU7XG4gICAgaWYgKG9zLmlzSW4oT3MuX0FMTF9MSU5VWF9WRVJTSU9OUykpIHtcbiAgICAgIHJldHVybiBuZXcgQ29kZUJ1aWxkUnVubmVySW1hZ2VCdWlsZGVyKHNjb3BlLCBpZCwgcHJvcHMpO1xuICAgIH0gZWxzZSBpZiAob3MuaXMoT3MuV0lORE9XUykpIHtcbiAgICAgIHJldHVybiBuZXcgQXdzSW1hZ2VCdWlsZGVyUnVubmVySW1hZ2VCdWlsZGVyKHNjb3BlLCBpZCwgcHJvcHMpO1xuICAgIH0gZWxzZSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoYFVuYWJsZSB0byBmaW5kIHJ1bm5lciBpbWFnZSBidWlsZGVyIGltcGxlbWVudGF0aW9uIGZvciAke29zLm5hbWV9YCk7XG4gICAgfVxuICB9XG59XG4iXX0=

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

@@ -4,6 +4,8 @@ import { ImageBuilderObjectBase } from './common';
 import { Architecture, Os } from '../../providers';
 /**
  * Properties for AmiRecipe construct.
+ *
+ * @internal
  */
 interface AmiRecipeProperties {
     /**
@@ -22,6 +24,12 @@ interface AmiRecipeProperties {
      * Components to add to target container image.
      */
     readonly components: ImageBuilderComponent[];
+    /**
+     * Tags to apply to the recipe and image.
+     */
+    readonly tags: {
+        [key: string]: string;
+    };
 }
 /**
  * Image builder recipe for Amazon Machine Image (AMI).

package/lib/image-builders/aws-image-builder/ami.js

@@ -24,6 +24,7 @@ class AmiRecipe extends common_1.ImageBuilderObjectBase {
             platform: props.platform,
             components,
             parentAmi: props.baseAmi,
+            tags: props.tags,
         });
         let workingDirectory;
         if (props.platform == 'Linux') {
@@ -41,6 +42,7 @@ class AmiRecipe extends common_1.ImageBuilderObjectBase {
             parentImage: props.baseAmi,
             components,
             workingDirectory,
+            tags: props.tags,
         });
         this.arn = recipe.attrArn;
     }
@@ -98,4 +100,4 @@ function defaultBaseAmi(scope, os, architecture) {
     throw new Error(`OS ${os.name} not supported for AMI runner image`);
 }
 exports.defaultBaseAmi = defaultBaseAmi;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ami.js","sourceRoot":"","sources":["../../../src/image-builders/aws-image-builder/ami.ts"],"names":[],"mappings":"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","sourcesContent":["import * as cdk from 'aws-cdk-lib';\nimport { aws_imagebuilder as imagebuilder } from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\nimport { ImageBuilderComponent } from './builder';\nimport { ImageBuilderObjectBase } from './common';\nimport { Architecture, Os } from '../../providers';\nimport { uniqueImageBuilderName } from '../common';\n\n/**\n * Properties for AmiRecipe construct.\n */\ninterface AmiRecipeProperties {\n  /**\n   * Target platform. Must match builder platform.\n   */\n  readonly platform: 'Linux' | 'Windows';\n\n  /**\n   * Target architecture. Must match builder platform.\n   */\n  readonly architecture: Architecture;\n\n  /**\n   * Base AMI to use for the new runner AMI.\n   */\n  readonly baseAmi: string;\n\n  /**\n   * Components to add to target container image.\n   */\n  readonly components: ImageBuilderComponent[];\n}\n\n/**\n * Image builder recipe for Amazon Machine Image (AMI).\n *\n * @internal\n */\nexport class AmiRecipe extends ImageBuilderObjectBase {\n  public readonly arn: string;\n  public readonly name: string;\n  public readonly version: string;\n\n  constructor(scope: Construct, id: string, props: AmiRecipeProperties) {\n    super(scope, id);\n\n    let components = props.components.map(component => {\n      return {\n        componentArn: component.arn,\n      };\n    });\n\n    this.name = uniqueImageBuilderName(this);\n    this.version = this.generateVersion('ImageRecipe', this.name, {\n      platform: props.platform,\n      components,\n      parentAmi: props.baseAmi,\n    });\n\n    let workingDirectory;\n    if (props.platform == 'Linux') {\n      workingDirectory = '/home/runner';\n    } else if (props.platform == 'Windows') {\n      workingDirectory = 'C:/'; // must exist or Image Builder fails and must not be empty or git will stall installing from the default windows\\system32\n    } else {\n      throw new Error(`Unsupported AMI recipe platform: ${props.platform}`);\n    }\n\n    const recipe = new imagebuilder.CfnImageRecipe(this, 'Recipe', {\n      name: this.name,\n      version: this.version,\n      parentImage: props.baseAmi,\n      components,\n      workingDirectory,\n    });\n\n    this.arn = recipe.attrArn;\n  }\n}\n\n/**\n * Default base AMI for given OS and architecture.\n *\n * @internal\n */\nexport function defaultBaseAmi(scope: Construct, os: Os, architecture: Architecture) {\n  const stack = cdk.Stack.of(scope);\n\n  let arch;\n  if (architecture.is(Architecture.X86_64)) {\n    arch = 'x86';\n  } else if (architecture.is(Architecture.ARM64)) {\n    arch = 'arm64';\n  } else {\n    throw new Error(`Unsupported architecture for base AMI: ${architecture.name}`);\n  }\n\n  if (os.is(Os.LINUX_UBUNTU) || os.is(Os.LINUX)) {\n    return stack.formatArn({\n      service: 'imagebuilder',\n      resource: 'image',\n      account: 'aws',\n      resourceName: `ubuntu-server-22-lts-${arch}/x.x.x`,\n    });\n  }\n\n  if (os.is(Os.LINUX_AMAZON_2)) {\n    return stack.formatArn({\n      service: 'imagebuilder',\n      resource: 'image',\n      account: 'aws',\n      resourceName: `amazon-linux-2-${arch}/x.x.x`,\n    });\n  }\n\n  if (os.is(Os.LINUX_AMAZON_2023)) {\n    return stack.formatArn({\n      service: 'imagebuilder',\n      resource: 'image',\n      account: 'aws',\n      resourceName: `amazon-linux-2023-${arch}/x.x.x`,\n    });\n  }\n\n  if (os.is(Os.WINDOWS)) {\n    return stack.formatArn({\n      service: 'imagebuilder',\n      resource: 'image',\n      account: 'aws',\n      resourceName: `windows-server-2022-english-full-base-${arch}/x.x.x`,\n    });\n  }\n\n  throw new Error(`OS ${os.name} not supported for AMI runner image`);\n}\n\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ami.js","sourceRoot":"","sources":["../../../src/image-builders/aws-image-builder/ami.ts"],"names":[],"mappings":"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","sourcesContent":["import * as cdk from 'aws-cdk-lib';\nimport { aws_imagebuilder as imagebuilder } from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\nimport { ImageBuilderComponent } from './builder';\nimport { ImageBuilderObjectBase } from './common';\nimport { Architecture, Os } from '../../providers';\nimport { uniqueImageBuilderName } from '../common';\n\n/**\n * Properties for AmiRecipe construct.\n *\n * @internal\n */\ninterface AmiRecipeProperties {\n  /**\n   * Target platform. Must match builder platform.\n   */\n  readonly platform: 'Linux' | 'Windows';\n\n  /**\n   * Target architecture. Must match builder platform.\n   */\n  readonly architecture: Architecture;\n\n  /**\n   * Base AMI to use for the new runner AMI.\n   */\n  readonly baseAmi: string;\n\n  /**\n   * Components to add to target container image.\n   */\n  readonly components: ImageBuilderComponent[];\n\n  /**\n   * Tags to apply to the recipe and image.\n   */\n  readonly tags: { [key: string]: string };\n}\n\n/**\n * Image builder recipe for Amazon Machine Image (AMI).\n *\n * @internal\n */\nexport class AmiRecipe extends ImageBuilderObjectBase {\n  public readonly arn: string;\n  public readonly name: string;\n  public readonly version: string;\n\n  constructor(scope: Construct, id: string, props: AmiRecipeProperties) {\n    super(scope, id);\n\n    let components = props.components.map(component => {\n      return {\n        componentArn: component.arn,\n      };\n    });\n\n    this.name = uniqueImageBuilderName(this);\n    this.version = this.generateVersion('ImageRecipe', this.name, {\n      platform: props.platform,\n      components,\n      parentAmi: props.baseAmi,\n      tags: props.tags,\n    });\n\n    let workingDirectory;\n    if (props.platform == 'Linux') {\n      workingDirectory = '/home/runner';\n    } else if (props.platform == 'Windows') {\n      workingDirectory = 'C:/'; // must exist or Image Builder fails and must not be empty or git will stall installing from the default windows\\system32\n    } else {\n      throw new Error(`Unsupported AMI recipe platform: ${props.platform}`);\n    }\n\n    const recipe = new imagebuilder.CfnImageRecipe(this, 'Recipe', {\n      name: this.name,\n      version: this.version,\n      parentImage: props.baseAmi,\n      components,\n      workingDirectory,\n      tags: props.tags,\n    });\n\n    this.arn = recipe.attrArn;\n  }\n}\n\n/**\n * Default base AMI for given OS and architecture.\n *\n * @internal\n */\nexport function defaultBaseAmi(scope: Construct, os: Os, architecture: Architecture) {\n  const stack = cdk.Stack.of(scope);\n\n  let arch;\n  if (architecture.is(Architecture.X86_64)) {\n    arch = 'x86';\n  } else if (architecture.is(Architecture.ARM64)) {\n    arch = 'arm64';\n  } else {\n    throw new Error(`Unsupported architecture for base AMI: ${architecture.name}`);\n  }\n\n  if (os.is(Os.LINUX_UBUNTU) || os.is(Os.LINUX)) {\n    return stack.formatArn({\n      service: 'imagebuilder',\n      resource: 'image',\n      account: 'aws',\n      resourceName: `ubuntu-server-22-lts-${arch}/x.x.x`,\n    });\n  }\n\n  if (os.is(Os.LINUX_AMAZON_2)) {\n    return stack.formatArn({\n      service: 'imagebuilder',\n      resource: 'image',\n      account: 'aws',\n      resourceName: `amazon-linux-2-${arch}/x.x.x`,\n    });\n  }\n\n  if (os.is(Os.LINUX_AMAZON_2023)) {\n    return stack.formatArn({\n      service: 'imagebuilder',\n      resource: 'image',\n      account: 'aws',\n      resourceName: `amazon-linux-2023-${arch}/x.x.x`,\n    });\n  }\n\n  if (os.is(Os.WINDOWS)) {\n    return stack.formatArn({\n      service: 'imagebuilder',\n      resource: 'image',\n      account: 'aws',\n      resourceName: `windows-server-2022-english-full-base-${arch}/x.x.x`,\n    });\n  }\n\n  throw new Error(`OS ${os.name} not supported for AMI runner image`);\n}\n\n"]}

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

@@ -157,6 +157,7 @@ export declare class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilde
     private readonly fastLaunchOptions?;
     private readonly waitOnDeploy;
     private readonly dockerSetupCommands;
+    private readonly tags;
     constructor(scope: Construct, id: string, props?: RunnerImageBuilderProps);
     private platform;
     /**
@@ -177,6 +178,7 @@ export declare class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilde
     bindAmi(): RunnerAmi;
     private amiCleaner;
     private bindComponents;
+    private imageCleaner;
 }
 /**
  * @internal