@cloudsnorkel/cdk-github-runners 0.9.4 → 0.9.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (93) hide show
  1. package/.gitattributes +3 -3
  2. package/.jsii +315 -267
  3. package/API.md +43 -7
  4. package/README.md +15 -2
  5. package/assets/{providers/image-builders → image-builders}/aws-image-builder/delete-ami.lambda/index.js +2 -2
  6. package/assets/{providers/image-builders → image-builders}/aws-image-builder/filter-failed-builds.lambda/index.js +1 -1
  7. package/assets/{providers/image-builders → image-builders}/aws-image-builder/versioner.lambda/index.js +2 -2
  8. package/lib/access.js +1 -1
  9. package/lib/image-builders/api.js +47 -0
  10. package/lib/{providers/image-builders → image-builders}/aws-image-builder/ami.d.ts +2 -3
  11. package/lib/image-builders/aws-image-builder/ami.js +93 -0
  12. package/lib/{providers/image-builders → image-builders}/aws-image-builder/builder.d.ts +9 -2
  13. package/lib/image-builders/aws-image-builder/builder.js +529 -0
  14. package/lib/image-builders/aws-image-builder/common.js +46 -0
  15. package/lib/{providers/image-builders → image-builders}/aws-image-builder/container.d.ts +1 -1
  16. package/lib/image-builders/aws-image-builder/container.js +63 -0
  17. package/lib/{providers/image-builders → image-builders}/aws-image-builder/delete-ami-function.d.ts +1 -1
  18. package/lib/image-builders/aws-image-builder/delete-ami-function.js +23 -0
  19. package/lib/image-builders/aws-image-builder/delete-ami.lambda.js +87 -0
  20. package/lib/{providers/image-builders → image-builders}/aws-image-builder/deprecated/ami.d.ts +2 -2
  21. package/lib/image-builders/aws-image-builder/deprecated/ami.js +240 -0
  22. package/lib/{providers/image-builders → image-builders}/aws-image-builder/deprecated/common.d.ts +1 -1
  23. package/lib/image-builders/aws-image-builder/deprecated/common.js +144 -0
  24. package/lib/{providers/image-builders → image-builders}/aws-image-builder/deprecated/container.d.ts +1 -1
  25. package/lib/image-builders/aws-image-builder/deprecated/container.js +222 -0
  26. package/lib/{providers/image-builders → image-builders}/aws-image-builder/deprecated/index.js +1 -1
  27. package/lib/{providers/image-builders → image-builders}/aws-image-builder/deprecated/linux-components.d.ts +1 -1
  28. package/lib/image-builders/aws-image-builder/deprecated/linux-components.js +172 -0
  29. package/lib/{providers/image-builders → image-builders}/aws-image-builder/deprecated/windows-components.d.ts +1 -1
  30. package/lib/image-builders/aws-image-builder/deprecated/windows-components.js +126 -0
  31. package/lib/{providers/image-builders → image-builders}/aws-image-builder/filter-failed-builds-function.d.ts +1 -1
  32. package/lib/image-builders/aws-image-builder/filter-failed-builds-function.js +23 -0
  33. package/lib/image-builders/aws-image-builder/filter-failed-builds.lambda.js +18 -0
  34. package/lib/{providers/image-builders → image-builders}/aws-image-builder/index.js +1 -1
  35. package/lib/{providers/image-builders → image-builders}/aws-image-builder/versioner-function.d.ts +1 -1
  36. package/lib/image-builders/aws-image-builder/versioner-function.js +23 -0
  37. package/lib/image-builders/aws-image-builder/versioner.lambda.js +96 -0
  38. package/lib/{providers/image-builders → image-builders}/codebuild-deprecated.d.ts +2 -2
  39. package/lib/image-builders/codebuild-deprecated.js +373 -0
  40. package/lib/{providers/image-builders → image-builders}/codebuild.d.ts +2 -2
  41. package/lib/image-builders/codebuild.js +287 -0
  42. package/lib/{providers/image-builders → image-builders}/common.d.ts +4 -2
  43. package/lib/image-builders/common.js +61 -0
  44. package/lib/{providers/image-builders → image-builders}/components.d.ts +8 -2
  45. package/lib/image-builders/components.js +568 -0
  46. package/lib/{providers/image-builders → image-builders}/index.js +1 -1
  47. package/lib/{providers/image-builders → image-builders}/static.d.ts +1 -1
  48. package/lib/image-builders/static.js +58 -0
  49. package/lib/providers/codebuild.d.ts +1 -1
  50. package/lib/providers/codebuild.js +4 -4
  51. package/lib/providers/common.js +3 -3
  52. package/lib/providers/ec2.d.ts +1 -1
  53. package/lib/providers/ec2.js +4 -4
  54. package/lib/providers/ecs.d.ts +1 -1
  55. package/lib/providers/ecs.js +3 -3
  56. package/lib/providers/fargate.d.ts +1 -1
  57. package/lib/providers/fargate.js +4 -4
  58. package/lib/providers/index.d.ts +1 -1
  59. package/lib/providers/index.js +2 -2
  60. package/lib/providers/lambda.d.ts +1 -1
  61. package/lib/providers/lambda.js +4 -4
  62. package/lib/runner.js +1 -1
  63. package/lib/secrets.js +1 -1
  64. package/package.json +10 -10
  65. package/lib/providers/image-builders/api.js +0 -47
  66. package/lib/providers/image-builders/aws-image-builder/ami.js +0 -81
  67. package/lib/providers/image-builders/aws-image-builder/builder.js +0 -520
  68. package/lib/providers/image-builders/aws-image-builder/common.js +0 -46
  69. package/lib/providers/image-builders/aws-image-builder/container.js +0 -63
  70. package/lib/providers/image-builders/aws-image-builder/delete-ami-function.js +0 -23
  71. package/lib/providers/image-builders/aws-image-builder/delete-ami.lambda.js +0 -87
  72. package/lib/providers/image-builders/aws-image-builder/deprecated/ami.js +0 -240
  73. package/lib/providers/image-builders/aws-image-builder/deprecated/common.js +0 -144
  74. package/lib/providers/image-builders/aws-image-builder/deprecated/container.js +0 -222
  75. package/lib/providers/image-builders/aws-image-builder/deprecated/linux-components.js +0 -172
  76. package/lib/providers/image-builders/aws-image-builder/deprecated/windows-components.js +0 -129
  77. package/lib/providers/image-builders/aws-image-builder/filter-failed-builds-function.js +0 -23
  78. package/lib/providers/image-builders/aws-image-builder/filter-failed-builds.lambda.js +0 -18
  79. package/lib/providers/image-builders/aws-image-builder/versioner-function.js +0 -23
  80. package/lib/providers/image-builders/aws-image-builder/versioner.lambda.js +0 -96
  81. package/lib/providers/image-builders/codebuild-deprecated.js +0 -373
  82. package/lib/providers/image-builders/codebuild.js +0 -287
  83. package/lib/providers/image-builders/common.js +0 -61
  84. package/lib/providers/image-builders/components.js +0 -535
  85. package/lib/providers/image-builders/static.js +0 -58
  86. /package/lib/{providers/image-builders → image-builders}/api.d.ts +0 -0
  87. /package/lib/{providers/image-builders → image-builders}/aws-image-builder/common.d.ts +0 -0
  88. /package/lib/{providers/image-builders → image-builders}/aws-image-builder/delete-ami.lambda.d.ts +0 -0
  89. /package/lib/{providers/image-builders → image-builders}/aws-image-builder/deprecated/index.d.ts +0 -0
  90. /package/lib/{providers/image-builders → image-builders}/aws-image-builder/filter-failed-builds.lambda.d.ts +0 -0
  91. /package/lib/{providers/image-builders → image-builders}/aws-image-builder/index.d.ts +0 -0
  92. /package/lib/{providers/image-builders → image-builders}/aws-image-builder/versioner.lambda.d.ts +0 -0
  93. /package/lib/{providers/image-builders → image-builders}/index.d.ts +0 -0
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ImageBuilderObjectBase = void 0;
4
+ const cdk = require("aws-cdk-lib");
5
+ const aws_cdk_lib_1 = require("aws-cdk-lib");
6
+ const versioner_function_1 = require("./versioner-function");
7
+ const utils_1 = require("../../utils");
8
+ /**
9
+ * @internal
10
+ */
11
+ class ImageBuilderObjectBase extends cdk.Resource {
12
+ constructor(scope, id) {
13
+ super(scope, id);
14
+ }
15
+ version(type, name, data) {
16
+ return new aws_cdk_lib_1.CustomResource(this, 'Version', {
17
+ serviceToken: this.versionFunction().functionArn,
18
+ resourceType: `Custom::ImageBuilder-${type}-Version`,
19
+ removalPolicy: cdk.RemovalPolicy.RETAIN,
20
+ properties: {
21
+ ObjectType: type,
22
+ ObjectName: name,
23
+ VersionedData: data, // get a new version every time something changes, like Image Builder wants
24
+ },
25
+ }).ref;
26
+ }
27
+ versionFunction() {
28
+ return (0, utils_1.singletonLambda)(versioner_function_1.VersionerFunction, this, 'aws-image-builder-versioner', {
29
+ description: 'Custom resource handler that bumps up Image Builder versions',
30
+ initialPolicy: [
31
+ new aws_cdk_lib_1.aws_iam.PolicyStatement({
32
+ actions: [
33
+ 'imagebuilder:ListComponents',
34
+ 'imagebuilder:ListContainerRecipes',
35
+ 'imagebuilder:ListImageRecipes',
36
+ ],
37
+ resources: ['*'],
38
+ }),
39
+ ],
40
+ logRetention: aws_cdk_lib_1.aws_logs.RetentionDays.ONE_MONTH,
41
+ timeout: cdk.Duration.minutes(5),
42
+ });
43
+ }
44
+ }
45
+ exports.ImageBuilderObjectBase = ImageBuilderObjectBase;
46
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2ltYWdlLWJ1aWxkZXJzL2F3cy1pbWFnZS1idWlsZGVyL2NvbW1vbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FBbUM7QUFDbkMsNkNBQStFO0FBRS9FLDZEQUF5RDtBQUN6RCx1Q0FBOEM7QUFFOUM7O0dBRUc7QUFDSCxNQUFzQixzQkFBdUIsU0FBUSxHQUFHLENBQUMsUUFBUTtJQUMvRCxZQUFzQixLQUFnQixFQUFFLEVBQVU7UUFDaEQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNuQixDQUFDO0lBRVMsT0FBTyxDQUFDLElBQXFELEVBQUUsSUFBWSxFQUFFLElBQVM7UUFDOUYsT0FBTyxJQUFJLDRCQUFjLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRTtZQUN6QyxZQUFZLEVBQUUsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDLFdBQVc7WUFDaEQsWUFBWSxFQUFFLHdCQUF3QixJQUFJLFVBQVU7WUFDcEQsYUFBYSxFQUFFLEdBQUcsQ0FBQyxhQUFhLENBQUMsTUFBTTtZQUN2QyxVQUFVLEVBQUU7Z0JBQ1YsVUFBVSxFQUFFLElBQUk7Z0JBQ2hCLFVBQVUsRUFBRSxJQUFJO2dCQUNoQixhQUFhLEVBQUUsSUFBSSxFQUFFLDJFQUEyRTthQUNqRztTQUNGLENBQUMsQ0FBQyxHQUFHLENBQUM7SUFDVCxDQUFDO0lBRU8sZUFBZTtRQUNyQixPQUFPLElBQUEsdUJBQWUsRUFBQyxzQ0FBaUIsRUFBRSxJQUFJLEVBQUUsNkJBQTZCLEVBQUU7WUFDN0UsV0FBVyxFQUFFLDhEQUE4RDtZQUMzRSxhQUFhLEVBQUU7Z0JBQ2IsSUFBSSxxQkFBRyxDQUFDLGVBQWUsQ0FBQztvQkFDdEIsT0FBTyxFQUFFO3dCQUNQLDZCQUE2Qjt3QkFDN0IsbUNBQW1DO3dCQUNuQywrQkFBK0I7cUJBQ2hDO29CQUNELFNBQVMsRUFBRSxDQUFDLEdBQUcsQ0FBQztpQkFDakIsQ0FBQzthQUNIO1lBQ0QsWUFBWSxFQUFFLHNCQUFJLENBQUMsYUFBYSxDQUFDLFNBQVM7WUFDMUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztTQUNqQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUFuQ0Qsd0RBbUNDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgY2RrIGZyb20gJ2F3cy1jZGstbGliJztcbmltcG9ydCB7IGF3c19pYW0gYXMgaWFtLCBhd3NfbG9ncyBhcyBsb2dzLCBDdXN0b21SZXNvdXJjZSB9IGZyb20gJ2F3cy1jZGstbGliJztcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuaW1wb3J0IHsgVmVyc2lvbmVyRnVuY3Rpb24gfSBmcm9tICcuL3ZlcnNpb25lci1mdW5jdGlvbic7XG5pbXBvcnQgeyBzaW5nbGV0b25MYW1iZGEgfSBmcm9tICcuLi8uLi91dGlscyc7XG5cbi8qKlxuICogQGludGVybmFsXG4gKi9cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBJbWFnZUJ1aWxkZXJPYmplY3RCYXNlIGV4dGVuZHMgY2RrLlJlc291cmNlIHtcbiAgcHJvdGVjdGVkIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuICB9XG5cbiAgcHJvdGVjdGVkIHZlcnNpb24odHlwZTogJ0NvbXBvbmVudCcgfCAnSW1hZ2VSZWNpcGUnIHwgJ0NvbnRhaW5lclJlY2lwZScsIG5hbWU6IHN0cmluZywgZGF0YTogYW55KTogc3RyaW5nIHtcbiAgICByZXR1cm4gbmV3IEN1c3RvbVJlc291cmNlKHRoaXMsICdWZXJzaW9uJywge1xuICAgICAgc2VydmljZVRva2VuOiB0aGlzLnZlcnNpb25GdW5jdGlvbigpLmZ1bmN0aW9uQXJuLFxuICAgICAgcmVzb3VyY2VUeXBlOiBgQ3VzdG9tOjpJbWFnZUJ1aWxkZXItJHt0eXBlfS1WZXJzaW9uYCxcbiAgICAgIHJlbW92YWxQb2xpY3k6IGNkay5SZW1vdmFsUG9saWN5LlJFVEFJTiwgLy8gbm8gcG9pbnQgaW4gZGVsZXRpbmcgYXMgaXQgZG9lc24ndCBldmVuIGNyZWF0ZSBhbnl0aGluZ1xuICAgICAgcHJvcGVydGllczoge1xuICAgICAgICBPYmplY3RUeXBlOiB0eXBlLFxuICAgICAgICBPYmplY3ROYW1lOiBuYW1lLFxuICAgICAgICBWZXJzaW9uZWREYXRhOiBkYXRhLCAvLyBnZXQgYSBuZXcgdmVyc2lvbiBldmVyeSB0aW1lIHNvbWV0aGluZyBjaGFuZ2VzLCBsaWtlIEltYWdlIEJ1aWxkZXIgd2FudHNcbiAgICAgIH0sXG4gICAgfSkucmVmO1xuICB9XG5cbiAgcHJpdmF0ZSB2ZXJzaW9uRnVuY3Rpb24oKTogVmVyc2lvbmVyRnVuY3Rpb24ge1xuICAgIHJldHVybiBzaW5nbGV0b25MYW1iZGEoVmVyc2lvbmVyRnVuY3Rpb24sIHRoaXMsICdhd3MtaW1hZ2UtYnVpbGRlci12ZXJzaW9uZXInLCB7XG4gICAgICBkZXNjcmlwdGlvbjogJ0N1c3RvbSByZXNvdXJjZSBoYW5kbGVyIHRoYXQgYnVtcHMgdXAgSW1hZ2UgQnVpbGRlciB2ZXJzaW9ucycsXG4gICAgICBpbml0aWFsUG9saWN5OiBbXG4gICAgICAgIG5ldyBpYW0uUG9saWN5U3RhdGVtZW50KHtcbiAgICAgICAgICBhY3Rpb25zOiBbXG4gICAgICAgICAgICAnaW1hZ2VidWlsZGVyOkxpc3RDb21wb25lbnRzJyxcbiAgICAgICAgICAgICdpbWFnZWJ1aWxkZXI6TGlzdENvbnRhaW5lclJlY2lwZXMnLFxuICAgICAgICAgICAgJ2ltYWdlYnVpbGRlcjpMaXN0SW1hZ2VSZWNpcGVzJyxcbiAgICAgICAgICBdLFxuICAgICAgICAgIHJlc291cmNlczogWycqJ10sXG4gICAgICAgIH0pLFxuICAgICAgXSxcbiAgICAgIGxvZ1JldGVudGlvbjogbG9ncy5SZXRlbnRpb25EYXlzLk9ORV9NT05USCxcbiAgICAgIHRpbWVvdXQ6IGNkay5EdXJhdGlvbi5taW51dGVzKDUpLFxuICAgIH0pO1xuICB9XG59XG5cbiJdfQ==
@@ -2,7 +2,7 @@ import { aws_ecr as ecr } from 'aws-cdk-lib';
2
2
  import { Construct } from 'constructs';
3
3
  import { ImageBuilderComponent } from './builder';
4
4
  import { ImageBuilderObjectBase } from './common';
5
- import { Os } from '../../common';
5
+ import { Os } from '../../providers/common';
6
6
  /**
7
7
  * Properties for ContainerRecipe construct.
8
8
  *
@@ -0,0 +1,63 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.defaultBaseDockerImage = exports.ContainerRecipe = void 0;
4
+ const aws_cdk_lib_1 = require("aws-cdk-lib");
5
+ const common_1 = require("./common");
6
+ const common_2 = require("../../providers/common");
7
+ const common_3 = require("../common");
8
+ /**
9
+ * Image builder recipe for a Docker container image.
10
+ *
11
+ * @internal
12
+ */
13
+ class ContainerRecipe extends common_1.ImageBuilderObjectBase {
14
+ constructor(scope, id, props) {
15
+ super(scope, id);
16
+ const name = (0, common_3.uniqueImageBuilderName)(this);
17
+ let components = props.components.map(component => {
18
+ return {
19
+ componentArn: component.arn,
20
+ };
21
+ });
22
+ const recipe = new aws_cdk_lib_1.aws_imagebuilder.CfnContainerRecipe(this, 'Recipe', {
23
+ name: name,
24
+ version: this.version('ContainerRecipe', name, {
25
+ platform: props.platform,
26
+ components,
27
+ dockerfileTemplate: props.dockerfileTemplate,
28
+ }),
29
+ parentImage: props.parentImage ?? 'mcr.microsoft.com/windows/servercore:ltsc2019-amd64',
30
+ components,
31
+ containerType: 'DOCKER',
32
+ targetRepository: {
33
+ service: 'ECR',
34
+ repositoryName: props.targetRepository.repositoryName,
35
+ },
36
+ dockerfileTemplateData: props.dockerfileTemplate,
37
+ });
38
+ this.arn = recipe.attrArn;
39
+ this.name = name;
40
+ }
41
+ }
42
+ exports.ContainerRecipe = ContainerRecipe;
43
+ /**
44
+ * Default base Docker image for given OS.
45
+ *
46
+ * @internal
47
+ */
48
+ function defaultBaseDockerImage(os) {
49
+ if (os.is(common_2.Os.WINDOWS)) {
50
+ return 'mcr.microsoft.com/windows/servercore:ltsc2019-amd64';
51
+ }
52
+ else if (os.is(common_2.Os.LINUX_UBUNTU)) {
53
+ return 'public.ecr.aws/lts/ubuntu:22.04';
54
+ }
55
+ else if (os.is(common_2.Os.LINUX_AMAZON_2)) {
56
+ return 'public.ecr.aws/amazonlinux/amazonlinux:2';
57
+ }
58
+ else {
59
+ throw new Error(`OS ${os.name} not supported for Docker runner image`);
60
+ }
61
+ }
62
+ exports.defaultBaseDockerImage = defaultBaseDockerImage;
63
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGFpbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2ltYWdlLWJ1aWxkZXJzL2F3cy1pbWFnZS1idWlsZGVyL2NvbnRhaW5lci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBK0U7QUFHL0UscUNBQWtEO0FBQ2xELG1EQUE0QztBQUM1QyxzQ0FBbUQ7QUE0Q25EOzs7O0dBSUc7QUFDSCxNQUFhLGVBQWdCLFNBQVEsK0JBQXNCO0lBSXpELFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZ0M7UUFDeEUsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVqQixNQUFNLElBQUksR0FBRyxJQUFBLCtCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO1FBRTFDLElBQUksVUFBVSxHQUFHLEtBQUssQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxFQUFFO1lBQ2hELE9BQU87Z0JBQ0wsWUFBWSxFQUFFLFNBQVMsQ0FBQyxHQUFHO2FBQzVCLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztRQUVILE1BQU0sTUFBTSxHQUFHLElBQUksOEJBQVksQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFO1lBQ2pFLElBQUksRUFBRSxJQUFJO1lBQ1YsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsaUJBQWlCLEVBQUUsSUFBSSxFQUFFO2dCQUM3QyxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVE7Z0JBQ3hCLFVBQVU7Z0JBQ1Ysa0JBQWtCLEVBQUUsS0FBSyxDQUFDLGtCQUFrQjthQUM3QyxDQUFDO1lBQ0YsV0FBVyxFQUFFLEtBQUssQ0FBQyxXQUFXLElBQUkscURBQXFEO1lBQ3ZGLFVBQVU7WUFDVixhQUFhLEVBQUUsUUFBUTtZQUN2QixnQkFBZ0IsRUFBRTtnQkFDaEIsT0FBTyxFQUFFLEtBQUs7Z0JBQ2QsY0FBYyxFQUFFLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjO2FBQ3REO1lBQ0Qsc0JBQXNCLEVBQUUsS0FBSyxDQUFDLGtCQUFrQjtTQUNqRCxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsR0FBRyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUM7UUFDMUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7SUFDbkIsQ0FBQztDQUNGO0FBbkNELDBDQW1DQztBQUVEOzs7O0dBSUc7QUFDSCxTQUFnQixzQkFBc0IsQ0FBQyxFQUFNO0lBQzNDLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxXQUFFLENBQUMsT0FBTyxDQUFDLEVBQUU7UUFDckIsT0FBTyxxREFBcUQsQ0FBQztLQUM5RDtTQUFNLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxXQUFFLENBQUMsWUFBWSxDQUFDLEVBQUU7UUFDakMsT0FBTyxpQ0FBaUMsQ0FBQztLQUMxQztTQUFNLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxXQUFFLENBQUMsY0FBYyxDQUFDLEVBQUU7UUFDbkMsT0FBTywwQ0FBMEMsQ0FBQztLQUNuRDtTQUFNO1FBQ0wsTUFBTSxJQUFJLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLHdDQUF3QyxDQUFDLENBQUM7S0FDeEU7QUFDSCxDQUFDO0FBVkQsd0RBVUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBhd3NfZWNyIGFzIGVjciwgYXdzX2ltYWdlYnVpbGRlciBhcyBpbWFnZWJ1aWxkZXIgfSBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdjb25zdHJ1Y3RzJztcbmltcG9ydCB7IEltYWdlQnVpbGRlckNvbXBvbmVudCB9IGZyb20gJy4vYnVpbGRlcic7XG5pbXBvcnQgeyBJbWFnZUJ1aWxkZXJPYmplY3RCYXNlIH0gZnJvbSAnLi9jb21tb24nO1xuaW1wb3J0IHsgT3MgfSBmcm9tICcuLi8uLi9wcm92aWRlcnMvY29tbW9uJztcbmltcG9ydCB7IHVuaXF1ZUltYWdlQnVpbGRlck5hbWUgfSBmcm9tICcuLi9jb21tb24nO1xuXG4vKipcbiAqIFByb3BlcnRpZXMgZm9yIENvbnRhaW5lclJlY2lwZSBjb25zdHJ1Y3QuXG4gKlxuICogQGludGVybmFsXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgQ29udGFpbmVyUmVjaXBlUHJvcGVydGllcyB7XG4gIC8qKlxuICAgKiBUYXJnZXQgcGxhdGZvcm0uIE11c3QgbWF0Y2ggYnVpbGRlciBwbGF0Zm9ybS5cbiAgICovXG4gIHJlYWRvbmx5IHBsYXRmb3JtOiAnTGludXgnIHwgJ1dpbmRvd3MnO1xuXG4gIC8qKlxuICAgKiBDb21wb25lbnRzIHRvIGFkZCB0byB0YXJnZXQgY29udGFpbmVyIGltYWdlLlxuICAgKi9cbiAgcmVhZG9ubHkgY29tcG9uZW50czogSW1hZ2VCdWlsZGVyQ29tcG9uZW50W107XG5cbiAgLyoqXG4gICAqIEVDUiByZXBvc2l0b3J5IHdoZXJlIHJlc3VsdGluZyBjb250YWluZXIgaW1hZ2Ugd2lsbCBiZSB1cGxvYWRlZC5cbiAgICovXG4gIHJlYWRvbmx5IHRhcmdldFJlcG9zaXRvcnk6IGVjci5JUmVwb3NpdG9yeTtcblxuICAvKipcbiAgICogRG9ja2VyZmlsZSB0ZW1wbGF0ZSB3aGVyZSBhbGwgdGhlIGNvbXBvbmVudHMgd2lsbCBiZSBhZGRlZC5cbiAgICpcbiAgICogTXVzdCBjb250YWluIGF0IGxlYXN0IHRoZSBmb2xsb3dpbmcgcGxhY2Vob2xkZXJzOlxuICAgKlxuICAgKiBgYGBcbiAgICogRlJPTSB7e3sgaW1hZ2VidWlsZGVyOnBhcmVudEltYWdlIH19fVxuICAgKiB7e3sgaW1hZ2VidWlsZGVyOmVudmlyb25tZW50cyB9fX1cbiAgICoge3t7IGltYWdlYnVpbGRlcjpjb21wb25lbnRzIH19fVxuICAgKiBgYGBcbiAgICovXG4gIHJlYWRvbmx5IGRvY2tlcmZpbGVUZW1wbGF0ZTogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBQYXJlbnQgaW1hZ2UgZm9yIHRoZSBuZXcgRG9ja2VyIEltYWdlLlxuICAgKlxuICAgKiBAZGVmYXVsdCAnbWNyLm1pY3Jvc29mdC5jb20vd2luZG93cy9zZXJ2ZXJjb3JlOmx0c2MyMDE5LWFtZDY0J1xuICAgKi9cbiAgcmVhZG9ubHkgcGFyZW50SW1hZ2U/OiBzdHJpbmc7XG59XG5cbi8qKlxuICogSW1hZ2UgYnVpbGRlciByZWNpcGUgZm9yIGEgRG9ja2VyIGNvbnRhaW5lciBpbWFnZS5cbiAqXG4gKiBAaW50ZXJuYWxcbiAqL1xuZXhwb3J0IGNsYXNzIENvbnRhaW5lclJlY2lwZSBleHRlbmRzIEltYWdlQnVpbGRlck9iamVjdEJhc2Uge1xuICBwdWJsaWMgcmVhZG9ubHkgYXJuOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSBuYW1lOiBzdHJpbmc7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IENvbnRhaW5lclJlY2lwZVByb3BlcnRpZXMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuXG4gICAgY29uc3QgbmFtZSA9IHVuaXF1ZUltYWdlQnVpbGRlck5hbWUodGhpcyk7XG5cbiAgICBsZXQgY29tcG9uZW50cyA9IHByb3BzLmNvbXBvbmVudHMubWFwKGNvbXBvbmVudCA9PiB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICBjb21wb25lbnRBcm46IGNvbXBvbmVudC5hcm4sXG4gICAgICB9O1xuICAgIH0pO1xuXG4gICAgY29uc3QgcmVjaXBlID0gbmV3IGltYWdlYnVpbGRlci5DZm5Db250YWluZXJSZWNpcGUodGhpcywgJ1JlY2lwZScsIHtcbiAgICAgIG5hbWU6IG5hbWUsXG4gICAgICB2ZXJzaW9uOiB0aGlzLnZlcnNpb24oJ0NvbnRhaW5lclJlY2lwZScsIG5hbWUsIHtcbiAgICAgICAgcGxhdGZvcm06IHByb3BzLnBsYXRmb3JtLFxuICAgICAgICBjb21wb25lbnRzLFxuICAgICAgICBkb2NrZXJmaWxlVGVtcGxhdGU6IHByb3BzLmRvY2tlcmZpbGVUZW1wbGF0ZSxcbiAgICAgIH0pLFxuICAgICAgcGFyZW50SW1hZ2U6IHByb3BzLnBhcmVudEltYWdlID8/ICdtY3IubWljcm9zb2Z0LmNvbS93aW5kb3dzL3NlcnZlcmNvcmU6bHRzYzIwMTktYW1kNjQnLFxuICAgICAgY29tcG9uZW50cyxcbiAgICAgIGNvbnRhaW5lclR5cGU6ICdET0NLRVInLFxuICAgICAgdGFyZ2V0UmVwb3NpdG9yeToge1xuICAgICAgICBzZXJ2aWNlOiAnRUNSJyxcbiAgICAgICAgcmVwb3NpdG9yeU5hbWU6IHByb3BzLnRhcmdldFJlcG9zaXRvcnkucmVwb3NpdG9yeU5hbWUsXG4gICAgICB9LFxuICAgICAgZG9ja2VyZmlsZVRlbXBsYXRlRGF0YTogcHJvcHMuZG9ja2VyZmlsZVRlbXBsYXRlLFxuICAgIH0pO1xuXG4gICAgdGhpcy5hcm4gPSByZWNpcGUuYXR0ckFybjtcbiAgICB0aGlzLm5hbWUgPSBuYW1lO1xuICB9XG59XG5cbi8qKlxuICogRGVmYXVsdCBiYXNlIERvY2tlciBpbWFnZSBmb3IgZ2l2ZW4gT1MuXG4gKlxuICogQGludGVybmFsXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBkZWZhdWx0QmFzZURvY2tlckltYWdlKG9zOiBPcykge1xuICBpZiAob3MuaXMoT3MuV0lORE9XUykpIHtcbiAgICByZXR1cm4gJ21jci5taWNyb3NvZnQuY29tL3dpbmRvd3Mvc2VydmVyY29yZTpsdHNjMjAxOS1hbWQ2NCc7XG4gIH0gZWxzZSBpZiAob3MuaXMoT3MuTElOVVhfVUJVTlRVKSkge1xuICAgIHJldHVybiAncHVibGljLmVjci5hd3MvbHRzL3VidW50dToyMi4wNCc7XG4gIH0gZWxzZSBpZiAob3MuaXMoT3MuTElOVVhfQU1BWk9OXzIpKSB7XG4gICAgcmV0dXJuICdwdWJsaWMuZWNyLmF3cy9hbWF6b25saW51eC9hbWF6b25saW51eDoyJztcbiAgfSBlbHNlIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoYE9TICR7b3MubmFtZX0gbm90IHN1cHBvcnRlZCBmb3IgRG9ja2VyIHJ1bm5lciBpbWFnZWApO1xuICB9XG59XG5cbiJdfQ==
@@ -6,7 +6,7 @@ import { Construct } from 'constructs';
6
6
  export interface DeleteAmiFunctionProps extends lambda.FunctionOptions {
7
7
  }
8
8
  /**
9
- * An AWS Lambda function which executes src/providers/image-builders/aws-image-builder/delete-ami.
9
+ * An AWS Lambda function which executes src/image-builders/aws-image-builder/delete-ami.
10
10
  */
11
11
  export declare class DeleteAmiFunction extends lambda.Function {
12
12
  constructor(scope: Construct, id: string, props?: DeleteAmiFunctionProps);
@@ -0,0 +1,23 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.DeleteAmiFunction = void 0;
4
+ // ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
5
+ const path = require("path");
6
+ const lambda = require("aws-cdk-lib/aws-lambda");
7
+ /**
8
+ * An AWS Lambda function which executes src/image-builders/aws-image-builder/delete-ami.
9
+ */
10
+ class DeleteAmiFunction extends lambda.Function {
11
+ constructor(scope, id, props) {
12
+ super(scope, id, {
13
+ description: 'src/image-builders/aws-image-builder/delete-ami.lambda.ts',
14
+ ...props,
15
+ runtime: new lambda.Runtime('nodejs16.x', lambda.RuntimeFamily.NODEJS),
16
+ handler: 'index.handler',
17
+ code: lambda.Code.fromAsset(path.join(__dirname, '../../../assets/image-builders/aws-image-builder/delete-ami.lambda')),
18
+ });
19
+ this.addEnvironment('AWS_NODEJS_CONNECTION_REUSE_ENABLED', '1', { removeInEdge: true });
20
+ }
21
+ }
22
+ exports.DeleteAmiFunction = DeleteAmiFunction;
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVsZXRlLWFtaS1mdW5jdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9pbWFnZS1idWlsZGVycy9hd3MtaW1hZ2UtYnVpbGRlci9kZWxldGUtYW1pLWZ1bmN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZFQUE2RTtBQUM3RSw2QkFBNkI7QUFDN0IsaURBQWlEO0FBU2pEOztHQUVHO0FBQ0gsTUFBYSxpQkFBa0IsU0FBUSxNQUFNLENBQUMsUUFBUTtJQUNwRCxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQThCO1FBQ3RFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFO1lBQ2YsV0FBVyxFQUFFLDJEQUEyRDtZQUN4RSxHQUFHLEtBQUs7WUFDUixPQUFPLEVBQUUsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxNQUFNLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQztZQUN0RSxPQUFPLEVBQUUsZUFBZTtZQUN4QixJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsb0VBQW9FLENBQUMsQ0FBQztTQUN4SCxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsY0FBYyxDQUFDLHFDQUFxQyxFQUFFLEdBQUcsRUFBRSxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQzFGLENBQUM7Q0FDRjtBQVhELDhDQVdDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gfn4gR2VuZXJhdGVkIGJ5IHByb2plbi4gVG8gbW9kaWZ5LCBlZGl0IC5wcm9qZW5yYy5qcyBhbmQgcnVuIFwibnB4IHByb2plblwiLlxuaW1wb3J0ICogYXMgcGF0aCBmcm9tICdwYXRoJztcbmltcG9ydCAqIGFzIGxhbWJkYSBmcm9tICdhd3MtY2RrLWxpYi9hd3MtbGFtYmRhJztcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuXG4vKipcbiAqIFByb3BzIGZvciBEZWxldGVBbWlGdW5jdGlvblxuICovXG5leHBvcnQgaW50ZXJmYWNlIERlbGV0ZUFtaUZ1bmN0aW9uUHJvcHMgZXh0ZW5kcyBsYW1iZGEuRnVuY3Rpb25PcHRpb25zIHtcbn1cblxuLyoqXG4gKiBBbiBBV1MgTGFtYmRhIGZ1bmN0aW9uIHdoaWNoIGV4ZWN1dGVzIHNyYy9pbWFnZS1idWlsZGVycy9hd3MtaW1hZ2UtYnVpbGRlci9kZWxldGUtYW1pLlxuICovXG5leHBvcnQgY2xhc3MgRGVsZXRlQW1pRnVuY3Rpb24gZXh0ZW5kcyBsYW1iZGEuRnVuY3Rpb24ge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wcz86IERlbGV0ZUFtaUZ1bmN0aW9uUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQsIHtcbiAgICAgIGRlc2NyaXB0aW9uOiAnc3JjL2ltYWdlLWJ1aWxkZXJzL2F3cy1pbWFnZS1idWlsZGVyL2RlbGV0ZS1hbWkubGFtYmRhLnRzJyxcbiAgICAgIC4uLnByb3BzLFxuICAgICAgcnVudGltZTogbmV3IGxhbWJkYS5SdW50aW1lKCdub2RlanMxNi54JywgbGFtYmRhLlJ1bnRpbWVGYW1pbHkuTk9ERUpTKSxcbiAgICAgIGhhbmRsZXI6ICdpbmRleC5oYW5kbGVyJyxcbiAgICAgIGNvZGU6IGxhbWJkYS5Db2RlLmZyb21Bc3NldChwYXRoLmpvaW4oX19kaXJuYW1lLCAnLi4vLi4vLi4vYXNzZXRzL2ltYWdlLWJ1aWxkZXJzL2F3cy1pbWFnZS1idWlsZGVyL2RlbGV0ZS1hbWkubGFtYmRhJykpLFxuICAgIH0pO1xuICAgIHRoaXMuYWRkRW52aXJvbm1lbnQoJ0FXU19OT0RFSlNfQ09OTkVDVElPTl9SRVVTRV9FTkFCTEVEJywgJzEnLCB7IHJlbW92ZUluRWRnZTogdHJ1ZSB9KTtcbiAgfVxufSJdfQ==
@@ -0,0 +1,87 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ /* eslint-disable-next-line import/no-extraneous-dependencies */
4
+ const AWS = require("aws-sdk");
5
+ const lambda_helpers_1 = require("../../lambda-helpers");
6
+ const ec2 = new AWS.EC2();
7
+ async function deleteAmis(launchTemplateId, stackName, builderName, deleteAll) {
8
+ // this runs daily and images are built once a week, so there shouldn't be a need for pagination
9
+ const images = await ec2.describeImages({
10
+ Owners: ['self'],
11
+ Filters: [
12
+ {
13
+ Name: 'tag:GitHubRunners:Stack',
14
+ Values: [stackName],
15
+ },
16
+ {
17
+ Name: 'tag:GitHubRunners:Builder',
18
+ Values: [builderName],
19
+ },
20
+ ],
21
+ }).promise();
22
+ let imagesToDelete = images.Images ?? [];
23
+ console.log(`Found ${imagesToDelete.length} AMIs`);
24
+ console.log(JSON.stringify(imagesToDelete.map(i => i.ImageId)));
25
+ if (!deleteAll) {
26
+ // get launch template information to filter out the active image
27
+ const launchTemplates = await ec2.describeLaunchTemplateVersions({
28
+ LaunchTemplateId: launchTemplateId,
29
+ Versions: ['$Default'],
30
+ }).promise();
31
+ if (!launchTemplates.LaunchTemplateVersions) {
32
+ console.error(`Unable to describe launch template ${launchTemplateId}`);
33
+ return;
34
+ }
35
+ const launchTemplate = launchTemplates.LaunchTemplateVersions[0];
36
+ // non-active images
37
+ imagesToDelete = imagesToDelete.filter(i => i.ImageId != launchTemplate.LaunchTemplateData?.ImageId);
38
+ // images older than two days to avoid race conditions where an image is created while we're cleaning up
39
+ imagesToDelete = imagesToDelete.filter(i => i.CreationDate && Date.parse(i.CreationDate) < (Date.now() - 1000 * 60 * 60 * 48));
40
+ console.log(`${imagesToDelete.length} AMIs left after filtering by date and excluding AMI used by launch template`);
41
+ }
42
+ // delete all that we found
43
+ for (const image of imagesToDelete) {
44
+ if (!image.ImageId) {
45
+ console.warn(`No image id? ${JSON.stringify(image)}`);
46
+ continue;
47
+ }
48
+ console.log(`Deregistering ${image.ImageId}`);
49
+ await ec2.deregisterImage({
50
+ ImageId: image.ImageId,
51
+ }).promise();
52
+ for (const blockMapping of image.BlockDeviceMappings ?? []) {
53
+ if (blockMapping.Ebs?.SnapshotId) {
54
+ console.log(`Deleting ${blockMapping.Ebs.SnapshotId}`);
55
+ await ec2.deleteSnapshot({
56
+ SnapshotId: blockMapping.Ebs.SnapshotId,
57
+ }).promise();
58
+ }
59
+ }
60
+ }
61
+ }
62
+ /* eslint-disable @typescript-eslint/no-require-imports, import/no-extraneous-dependencies */
63
+ exports.handler = async function (event, context) {
64
+ try {
65
+ console.log(JSON.stringify({ ...event, ResponseURL: '...' }));
66
+ switch (event.RequestType) {
67
+ case 'Scheduled':
68
+ await deleteAmis(event.LaunchTemplateId, event.StackName, event.BuilderName, false);
69
+ return;
70
+ case 'Create':
71
+ case 'Update':
72
+ await (0, lambda_helpers_1.customResourceRespond)(event, 'SUCCESS', 'OK', 'DeleteAmis', {});
73
+ break;
74
+ case 'Delete':
75
+ await deleteAmis('', event.ResourceProperties.StackName, event.ResourceProperties.BuilderName, true);
76
+ await (0, lambda_helpers_1.customResourceRespond)(event, 'SUCCESS', 'OK', event.PhysicalResourceId, {});
77
+ break;
78
+ }
79
+ }
80
+ catch (e) {
81
+ console.error(e);
82
+ if (event.RequestType != 'Scheduled') {
83
+ await (0, lambda_helpers_1.customResourceRespond)(event, 'FAILED', e.message || 'Internal Error', context.logStreamName, {});
84
+ }
85
+ }
86
+ };
87
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"delete-ami.lambda.js","sourceRoot":"","sources":["../../../src/image-builders/aws-image-builder/delete-ami.lambda.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable-next-line import/no-extraneous-dependencies,import/no-unresolved */\nimport * as AWSLambda from 'aws-lambda';\n/* eslint-disable-next-line import/no-extraneous-dependencies */\nimport * as AWS from 'aws-sdk';\nimport { customResourceRespond } from '../../lambda-helpers';\n\n\nconst ec2 = new AWS.EC2();\n\ntype DeleteAmiInput = {\n  RequestType: 'Scheduled';\n  StackName: string;\n  BuilderName: string;\n  LaunchTemplateId: string;\n}\n\nasync function deleteAmis(launchTemplateId: string, stackName: string, builderName: string, deleteAll: boolean) {\n  // this runs daily and images are built once a week, so there shouldn't be a need for pagination\n  const images = await ec2.describeImages({\n    Owners: ['self'],\n    Filters: [\n      {\n        Name: 'tag:GitHubRunners:Stack',\n        Values: [stackName],\n      },\n      {\n        Name: 'tag:GitHubRunners:Builder',\n        Values: [builderName],\n      },\n    ],\n  }).promise();\n\n  let imagesToDelete = images.Images ?? [];\n\n  console.log(`Found ${imagesToDelete.length} AMIs`);\n  console.log(JSON.stringify(imagesToDelete.map(i => i.ImageId)));\n\n  if (!deleteAll) {\n    // get launch template information to filter out the active image\n    const launchTemplates = await ec2.describeLaunchTemplateVersions({\n      LaunchTemplateId: launchTemplateId,\n      Versions: ['$Default'],\n    }).promise();\n    if (!launchTemplates.LaunchTemplateVersions) {\n      console.error(`Unable to describe launch template ${launchTemplateId}`);\n      return;\n    }\n    const launchTemplate = launchTemplates.LaunchTemplateVersions[0];\n\n    // non-active images\n    imagesToDelete = imagesToDelete.filter(i => i.ImageId != launchTemplate.LaunchTemplateData?.ImageId);\n    // images older than two days to avoid race conditions where an image is created while we're cleaning up\n    imagesToDelete = imagesToDelete.filter(i => i.CreationDate && Date.parse(i.CreationDate) < (Date.now() - 1000 * 60 * 60 * 48));\n\n    console.log(`${imagesToDelete.length} AMIs left after filtering by date and excluding AMI used by launch template`);\n  }\n\n  // delete all that we found\n  for (const image of imagesToDelete) {\n    if (!image.ImageId) {\n      console.warn(`No image id? ${JSON.stringify(image)}`);\n      continue;\n    }\n\n    console.log(`Deregistering ${image.ImageId}`);\n\n    await ec2.deregisterImage({\n      ImageId: image.ImageId,\n    }).promise();\n\n    for (const blockMapping of image.BlockDeviceMappings ?? []) {\n      if (blockMapping.Ebs?.SnapshotId) {\n        console.log(`Deleting ${blockMapping.Ebs.SnapshotId}`);\n\n        await ec2.deleteSnapshot({\n          SnapshotId: blockMapping.Ebs.SnapshotId,\n        }).promise();\n      }\n    }\n  }\n}\n\n/* eslint-disable @typescript-eslint/no-require-imports, import/no-extraneous-dependencies */\nexports.handler = async function (event: DeleteAmiInput | AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) {\n  try {\n    console.log(JSON.stringify({ ...event, ResponseURL: '...' }));\n\n    switch (event.RequestType) {\n      case 'Scheduled':\n        await deleteAmis(event.LaunchTemplateId, event.StackName, event.BuilderName, false);\n        return;\n      case 'Create':\n      case 'Update':\n        await customResourceRespond(event, 'SUCCESS', 'OK', 'DeleteAmis', {});\n        break;\n      case 'Delete':\n        await deleteAmis('', event.ResourceProperties.StackName, event.ResourceProperties.BuilderName, true);\n        await customResourceRespond(event, 'SUCCESS', 'OK', event.PhysicalResourceId, {});\n        break;\n    }\n  } catch (e) {\n    console.error(e);\n    if (event.RequestType != 'Scheduled') {\n      await customResourceRespond(event, 'FAILED', (e as Error).message || 'Internal Error', context.logStreamName, {});\n    }\n  }\n};\n"]}
@@ -1,7 +1,7 @@
1
1
  import { aws_ec2 as ec2, aws_logs as logs, Duration, RemovalPolicy } from 'aws-cdk-lib';
2
2
  import { Construct } from 'constructs';
3
3
  import { ImageBuilderBase } from './common';
4
- import { Architecture, Os, RunnerAmi, RunnerImage, RunnerVersion } from '../../../common';
4
+ import { Architecture, Os, RunnerAmi, RunnerImage, RunnerVersion } from '../../../providers/common';
5
5
  import { ImageBuilderComponent } from '../builder';
6
6
  /**
7
7
  * Properties for {@link AmiBuilder} construct.
@@ -82,7 +82,7 @@ export interface AmiBuilderProps {
82
82
  */
83
83
  readonly logRemovalPolicy?: RemovalPolicy;
84
84
  /**
85
- * Install Docker inside the image, so it can be used by the runner. You may want to disable this if you are building a Windows image and don't have a Docker Desktop license.
85
+ * Install Docker inside the image, so it can be used by the runner.
86
86
  *
87
87
  * @default true
88
88
  */
@@ -0,0 +1,240 @@
1
+ "use strict";
2
+ var _a;
3
+ Object.defineProperty(exports, "__esModule", { value: true });
4
+ exports.AmiBuilder = void 0;
5
+ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
6
+ const cdk = require("aws-cdk-lib");
7
+ const aws_cdk_lib_1 = require("aws-cdk-lib");
8
+ const common_1 = require("./common");
9
+ const linux_components_1 = require("./linux-components");
10
+ const windows_components_1 = require("./windows-components");
11
+ const common_2 = require("../../../providers/common");
12
+ const utils_1 = require("../../../utils");
13
+ const common_3 = require("../../common");
14
+ const ami_1 = require("../ami");
15
+ const delete_ami_function_1 = require("../delete-ami-function");
16
+ /**
17
+ * 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}.
18
+ *
19
+ * Each builder re-runs automatically at a set interval to make sure the AMIs contain the latest versions of everything.
20
+ *
21
+ * You can create an instance of this construct to customize the AMI used to spin-up runners. Some runner providers may require custom components. Check the runner provider documentation.
22
+ *
23
+ * For example, to set a specific runner version, rebuild the image every 2 weeks, and add a few packages for the EC2 provider, use:
24
+ *
25
+ * ```
26
+ * const builder = new AmiBuilder(this, 'Builder', {
27
+ * runnerVersion: RunnerVersion.specific('2.293.0'),
28
+ * rebuildInterval: Duration.days(14),
29
+ * });
30
+ * builder.addComponent(new ImageBuilderComponent(scope, id, {
31
+ * platform: 'Linux',
32
+ * displayName: 'p7zip',
33
+ * description: 'Install some more packages',
34
+ * commands: [
35
+ * 'apt-get install p7zip',
36
+ * ],
37
+ * }));
38
+ * new Ec2Runner(this, 'EC2 provider', {
39
+ * label: 'custom-ec2',
40
+ * amiBuilder: builder,
41
+ * });
42
+ * ```
43
+ *
44
+ * @deprecated use RunnerImageBuilder
45
+ */
46
+ class AmiBuilder extends common_1.ImageBuilderBase {
47
+ constructor(scope, id, props) {
48
+ super(scope, id, {
49
+ os: props?.os,
50
+ supportedOs: [common_2.Os.LINUX, common_2.Os.LINUX_UBUNTU, common_2.Os.LINUX_AMAZON_2, common_2.Os.WINDOWS],
51
+ architecture: props?.architecture,
52
+ supportedArchitectures: [common_2.Architecture.X86_64, common_2.Architecture.ARM64],
53
+ instanceType: props?.instanceType,
54
+ vpc: props?.vpc,
55
+ securityGroups: props?.securityGroup ? [props.securityGroup] : props?.securityGroups,
56
+ subnetSelection: props?.subnetSelection,
57
+ logRemovalPolicy: props?.logRemovalPolicy,
58
+ logRetention: props?.logRetention,
59
+ runnerVersion: props?.runnerVersion,
60
+ rebuildInterval: props?.rebuildInterval,
61
+ imageTypeName: 'AMI',
62
+ });
63
+ // add all basic components
64
+ if (this.os.is(common_2.Os.WINDOWS)) {
65
+ this.addBaseWindowsComponents(props?.installDocker ?? true);
66
+ }
67
+ else if (this.os.is(common_2.Os.LINUX) || this.os.is(common_2.Os.LINUX_UBUNTU)) {
68
+ this.addBaseLinuxComponents(props?.installDocker ?? true);
69
+ }
70
+ else {
71
+ throw new Error(`Unsupported OS for AMI builder: ${this.os.name}`);
72
+ }
73
+ }
74
+ addBaseWindowsComponents(installDocker) {
75
+ this.addComponent(windows_components_1.WindowsComponents.cloudwatchAgent(this, 'CloudWatch agent'));
76
+ this.addComponent(windows_components_1.WindowsComponents.awsCli(this, 'AWS CLI'));
77
+ this.addComponent(windows_components_1.WindowsComponents.githubCli(this, 'GitHub CLI'));
78
+ this.addComponent(windows_components_1.WindowsComponents.git(this, 'git'));
79
+ this.addComponent(windows_components_1.WindowsComponents.githubRunner(this, 'GitHub Actions Runner', this.runnerVersion));
80
+ if (installDocker) {
81
+ this.addComponent(windows_components_1.WindowsComponents.docker(this, 'Docker'));
82
+ }
83
+ }
84
+ addBaseLinuxComponents(installDocker) {
85
+ this.addComponent(linux_components_1.LinuxUbuntuComponents.requiredPackages(this, 'Upgrade packages and install basics', this.architecture));
86
+ this.addComponent(linux_components_1.LinuxUbuntuComponents.runnerUser(this, 'User', this.architecture));
87
+ this.addComponent(linux_components_1.LinuxUbuntuComponents.awsCli(this, 'AWS CLI', this.architecture));
88
+ this.addComponent(linux_components_1.LinuxUbuntuComponents.githubCli(this, 'GitHub CLI', this.architecture));
89
+ this.addComponent(linux_components_1.LinuxUbuntuComponents.git(this, 'git', this.architecture));
90
+ this.addComponent(linux_components_1.LinuxUbuntuComponents.githubRunner(this, 'GitHub Actions Runner', this.runnerVersion, this.architecture));
91
+ if (installDocker) {
92
+ this.addComponent(linux_components_1.LinuxUbuntuComponents.docker(this, 'Docker', this.architecture));
93
+ }
94
+ }
95
+ /**
96
+ * Add a component to be installed before any other components. Useful for required system settings like certificates or proxy settings.
97
+ * @param component
98
+ */
99
+ prependComponent(component) {
100
+ if (this.boundAmi) {
101
+ throw new Error('AMI is already bound. Use this method before passing the builder to a runner provider.');
102
+ }
103
+ if (component.platform != this.platform) {
104
+ throw new Error('Component platform doesn\'t match builder platform');
105
+ }
106
+ this.components = [component].concat(this.components);
107
+ }
108
+ /**
109
+ * Add a component to be installed.
110
+ * @param component
111
+ */
112
+ addComponent(component) {
113
+ if (this.boundAmi) {
114
+ throw new Error('AMI is already bound. Use this method before passing the builder to a runner provider.');
115
+ }
116
+ if (component.platform != this.platform) {
117
+ throw new Error('Component platform doesn\'t match builder platform');
118
+ }
119
+ this.components.push(component);
120
+ }
121
+ /**
122
+ * Add extra trusted certificates. This helps deal with self-signed certificates for GitHub Enterprise Server.
123
+ *
124
+ * @param path path to directory containing a file called certs.pem containing all the required certificates
125
+ */
126
+ addExtraCertificates(path) {
127
+ if (this.platform == 'Linux') {
128
+ this.prependComponent(linux_components_1.LinuxUbuntuComponents.extraCertificates(this, 'Extra Certs', path));
129
+ }
130
+ else if (this.platform == 'Windows') {
131
+ this.prependComponent(windows_components_1.WindowsComponents.extraCertificates(this, 'Extra Certs', path));
132
+ }
133
+ else {
134
+ throw new Error(`Unknown platform: ${this.platform}`);
135
+ }
136
+ }
137
+ /**
138
+ * Called by IRunnerProvider to finalize settings and create the AMI builder.
139
+ */
140
+ bindAmi() {
141
+ if (this.boundAmi) {
142
+ return this.boundAmi;
143
+ }
144
+ const launchTemplate = new aws_cdk_lib_1.aws_ec2.LaunchTemplate(this, 'Launch template', {
145
+ requireImdsv2: true,
146
+ });
147
+ const stackName = cdk.Stack.of(this).stackName;
148
+ const builderName = this.node.path;
149
+ const dist = new aws_cdk_lib_1.aws_imagebuilder.CfnDistributionConfiguration(this, 'Distribution', {
150
+ name: (0, common_3.uniqueImageBuilderName)(this),
151
+ description: this.description,
152
+ distributions: [
153
+ {
154
+ region: aws_cdk_lib_1.Stack.of(this).region,
155
+ amiDistributionConfiguration: {
156
+ Name: `${cdk.Names.uniqueResourceName(this, {
157
+ maxLength: 100,
158
+ separator: '-',
159
+ allowedSpecialCharacters: '_-',
160
+ })}-{{ imagebuilder:buildDate }}`,
161
+ AmiTags: {
162
+ 'Name': this.node.id,
163
+ 'GitHubRunners:Stack': stackName,
164
+ 'GitHubRunners:Builder': builderName,
165
+ },
166
+ },
167
+ launchTemplateConfigurations: [
168
+ {
169
+ launchTemplateId: launchTemplate.launchTemplateId,
170
+ },
171
+ ],
172
+ },
173
+ ],
174
+ });
175
+ const recipe = new ami_1.AmiRecipe(this, 'Ami Recipe', {
176
+ platform: this.platform,
177
+ components: this.components,
178
+ architecture: this.architecture,
179
+ baseAmi: (0, ami_1.defaultBaseAmi)(this, this.os, this.architecture),
180
+ });
181
+ const log = this.createLog(recipe.name);
182
+ const infra = this.createInfrastructure([
183
+ aws_cdk_lib_1.aws_iam.ManagedPolicy.fromAwsManagedPolicyName('AmazonSSMManagedInstanceCore'),
184
+ aws_cdk_lib_1.aws_iam.ManagedPolicy.fromAwsManagedPolicyName('EC2InstanceProfileForImageBuilder'),
185
+ ]);
186
+ this.createImage(infra, dist, log, recipe.arn, undefined);
187
+ this.createPipeline(infra, dist, log, recipe.arn, undefined);
188
+ this.boundAmi = {
189
+ launchTemplate: launchTemplate,
190
+ architecture: this.architecture,
191
+ os: this.os,
192
+ logGroup: log,
193
+ runnerVersion: this.runnerVersion,
194
+ };
195
+ this.imageCleaner(launchTemplate, stackName, builderName);
196
+ return this.boundAmi;
197
+ }
198
+ imageCleaner(launchTemplate, stackName, builderName) {
199
+ const deleter = (0, utils_1.singletonLambda)(delete_ami_function_1.DeleteAmiFunction, this, 'delete-ami', {
200
+ description: 'Delete old GitHub Runner AMIs',
201
+ initialPolicy: [
202
+ new aws_cdk_lib_1.aws_iam.PolicyStatement({
203
+ actions: ['ec2:DescribeLaunchTemplateVersions', 'ec2:DescribeImages', 'ec2:DeregisterImage', 'ec2:DeleteSnapshot'],
204
+ resources: ['*'],
205
+ }),
206
+ ],
207
+ timeout: cdk.Duration.minutes(5),
208
+ logRetention: aws_cdk_lib_1.aws_logs.RetentionDays.ONE_MONTH,
209
+ });
210
+ // delete old AMIs on schedule
211
+ const eventRule = new aws_cdk_lib_1.aws_events.Rule(this, 'Delete AMI Schedule', {
212
+ schedule: aws_cdk_lib_1.aws_events.Schedule.rate(cdk.Duration.days(1)),
213
+ description: `Delete old AMIs for ${builderName}`,
214
+ });
215
+ eventRule.addTarget(new aws_cdk_lib_1.aws_events_targets.LambdaFunction(deleter, {
216
+ event: aws_cdk_lib_1.aws_events.RuleTargetInput.fromObject({
217
+ RequestType: 'Scheduled',
218
+ LaunchTemplateId: launchTemplate.launchTemplateId,
219
+ StackName: stackName,
220
+ BuilderName: builderName,
221
+ }),
222
+ }));
223
+ // delete all AMIs when this construct is removed
224
+ new aws_cdk_lib_1.CustomResource(this, 'AMI Deleter', {
225
+ serviceToken: deleter.functionArn,
226
+ resourceType: 'Custom::AmiDeleter',
227
+ properties: {
228
+ StackName: stackName,
229
+ BuilderName: builderName,
230
+ },
231
+ });
232
+ }
233
+ bindDockerImage() {
234
+ throw new Error('AmiBuilder cannot be used to build Docker images');
235
+ }
236
+ }
237
+ _a = JSII_RTTI_SYMBOL_1;
238
+ AmiBuilder[_a] = { fqn: "@cloudsnorkel/cdk-github-runners.AmiBuilder", version: "0.9.5" };
239
+ exports.AmiBuilder = AmiBuilder;
240
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ami.js","sourceRoot":"","sources":["../../../../src/image-builders/aws-image-builder/deprecated/ami.ts"],"names":[],"mappings":"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","sourcesContent":["import * as cdk from 'aws-cdk-lib';\nimport {\n  aws_ec2 as ec2,\n  aws_events as events,\n  aws_events_targets as events_targets,\n  aws_iam as iam,\n  aws_imagebuilder as imagebuilder,\n  aws_logs as logs,\n  CustomResource,\n  Duration,\n  RemovalPolicy,\n  Stack,\n} from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\nimport { ImageBuilderBase } from './common';\nimport { LinuxUbuntuComponents } from './linux-components';\nimport { WindowsComponents } from './windows-components';\nimport { Architecture, Os, RunnerAmi, RunnerImage, RunnerVersion } from '../../../providers/common';\nimport { singletonLambda } from '../../../utils';\nimport { uniqueImageBuilderName } from '../../common';\nimport { AmiRecipe, defaultBaseAmi } from '../ami';\nimport { ImageBuilderComponent } from '../builder';\nimport { DeleteAmiFunction } from '../delete-ami-function';\n\n/**\n * Properties for {@link AmiBuilder} construct.\n */\nexport interface AmiBuilderProps {\n  /**\n   * Image architecture.\n   *\n   * @default Architecture.X86_64\n   */\n  readonly architecture?: Architecture;\n\n  /**\n   * Image OS.\n   *\n   * @default OS.LINUX\n   */\n  readonly os?: Os;\n\n  /**\n   * Version of GitHub Runners to install.\n   *\n   * @default latest version available\n   */\n  readonly runnerVersion?: RunnerVersion;\n\n  /**\n   * Schedule the AMI to be rebuilt every given interval. Useful for keeping the AMI up-do-date with the latest GitHub runner version and latest OS updates.\n   *\n   * Set to zero to disable.\n   *\n   * @default Duration.days(7)\n   */\n  readonly rebuildInterval?: Duration;\n\n  /**\n   * VPC where builder instances will be launched.\n   *\n   * @default default account VPC\n   */\n  readonly vpc?: ec2.IVpc;\n\n  /**\n   * Security group to assign to launched builder instances.\n   *\n   * @default new security group\n   *\n   * @deprecated use {@link securityGroups}\n   */\n  readonly securityGroup?: ec2.ISecurityGroup;\n\n  /**\n   * Security groups to assign to launched builder instances.\n   *\n   * @default new security group\n   */\n  readonly securityGroups?: ec2.ISecurityGroup[];\n\n  /**\n   * Where to place the network interfaces within the VPC. Only the first matched subnet will be used.\n   *\n   * @default default VPC subnet\n   */\n  readonly subnetSelection?: ec2.SubnetSelection;\n\n  /**\n   * The instance type used to build the image.\n   *\n   * @default m5.large\n   */\n  readonly instanceType?: ec2.InstanceType;\n\n  /**\n   * The number of days log events are kept in CloudWatch Logs. When updating\n   * this property, unsetting it doesn't remove the log retention policy. To\n   * remove the retention policy, set the value to `INFINITE`.\n   *\n   * @default logs.RetentionDays.ONE_MONTH\n   */\n  readonly logRetention?: logs.RetentionDays;\n\n  /**\n   * Removal policy for logs of image builds. If deployment fails on the custom resource, try setting this to `RemovalPolicy.RETAIN`. This way the logs can still be viewed, and you can see why the build failed.\n   *\n   * We try to not leave anything behind when removed. But sometimes a log staying behind is useful.\n   *\n   * @default RemovalPolicy.DESTROY\n   */\n  readonly logRemovalPolicy?: RemovalPolicy;\n\n  /**\n   * Install Docker inside the image, so it can be used by the runner.\n   *\n   * @default true\n   */\n  readonly installDocker?: boolean;\n}\n\n/**\n * 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}.\n *\n * Each builder re-runs automatically at a set interval to make sure the AMIs contain the latest versions of everything.\n *\n * You can create an instance of this construct to customize the AMI used to spin-up runners. Some runner providers may require custom components. Check the runner provider documentation.\n *\n * For example, to set a specific runner version, rebuild the image every 2 weeks, and add a few packages for the EC2 provider, use:\n *\n * ```\n * const builder = new AmiBuilder(this, 'Builder', {\n *     runnerVersion: RunnerVersion.specific('2.293.0'),\n *     rebuildInterval: Duration.days(14),\n * });\n * builder.addComponent(new ImageBuilderComponent(scope, id, {\n *   platform: 'Linux',\n *   displayName: 'p7zip',\n *   description: 'Install some more packages',\n *   commands: [\n *     'apt-get install p7zip',\n *   ],\n * }));\n * new Ec2Runner(this, 'EC2 provider', {\n *     label: 'custom-ec2',\n *     amiBuilder: builder,\n * });\n * ```\n *\n * @deprecated use RunnerImageBuilder\n */\nexport class AmiBuilder extends ImageBuilderBase {\n  private boundAmi?: RunnerAmi;\n\n  constructor(scope: Construct, id: string, props?: AmiBuilderProps) {\n    super(scope, id, {\n      os: props?.os,\n      supportedOs: [Os.LINUX, Os.LINUX_UBUNTU, Os.LINUX_AMAZON_2, Os.WINDOWS],\n      architecture: props?.architecture,\n      supportedArchitectures: [Architecture.X86_64, Architecture.ARM64],\n      instanceType: props?.instanceType,\n      vpc: props?.vpc,\n      securityGroups: props?.securityGroup ? [props.securityGroup] : props?.securityGroups,\n      subnetSelection: props?.subnetSelection,\n      logRemovalPolicy: props?.logRemovalPolicy,\n      logRetention: props?.logRetention,\n      runnerVersion: props?.runnerVersion,\n      rebuildInterval: props?.rebuildInterval,\n      imageTypeName: 'AMI',\n    });\n\n    // add all basic components\n    if (this.os.is(Os.WINDOWS)) {\n      this.addBaseWindowsComponents(props?.installDocker ?? true);\n    } else if (this.os.is(Os.LINUX) || this.os.is(Os.LINUX_UBUNTU)) {\n      this.addBaseLinuxComponents(props?.installDocker ?? true);\n    } else {\n      throw new Error(`Unsupported OS for AMI builder: ${this.os.name}`);\n    }\n  }\n\n  private addBaseWindowsComponents(installDocker: boolean) {\n    this.addComponent(WindowsComponents.cloudwatchAgent(this, 'CloudWatch agent'));\n    this.addComponent(WindowsComponents.awsCli(this, 'AWS CLI'));\n    this.addComponent(WindowsComponents.githubCli(this, 'GitHub CLI'));\n    this.addComponent(WindowsComponents.git(this, 'git'));\n    this.addComponent(WindowsComponents.githubRunner(this, 'GitHub Actions Runner', this.runnerVersion));\n    if (installDocker) {\n      this.addComponent(WindowsComponents.docker(this, 'Docker'));\n    }\n  }\n\n  private addBaseLinuxComponents(installDocker: boolean) {\n    this.addComponent(LinuxUbuntuComponents.requiredPackages(this, 'Upgrade packages and install basics', this.architecture));\n    this.addComponent(LinuxUbuntuComponents.runnerUser(this, 'User', this.architecture));\n    this.addComponent(LinuxUbuntuComponents.awsCli(this, 'AWS CLI', this.architecture));\n    this.addComponent(LinuxUbuntuComponents.githubCli(this, 'GitHub CLI', this.architecture));\n    this.addComponent(LinuxUbuntuComponents.git(this, 'git', this.architecture));\n    this.addComponent(LinuxUbuntuComponents.githubRunner(this, 'GitHub Actions Runner', this.runnerVersion, this.architecture));\n    if (installDocker) {\n      this.addComponent(LinuxUbuntuComponents.docker(this, 'Docker', this.architecture));\n    }\n  }\n\n  /**\n   * Add a component to be installed before any other components. Useful for required system settings like certificates or proxy settings.\n   * @param component\n   */\n  prependComponent(component: ImageBuilderComponent) {\n    if (this.boundAmi) {\n      throw new Error('AMI is already bound. Use this method before passing the builder to a runner provider.');\n    }\n    if (component.platform != this.platform) {\n      throw new Error('Component platform doesn\\'t match builder platform');\n    }\n    this.components = [component].concat(this.components);\n  }\n\n  /**\n   * Add a component to be installed.\n   * @param component\n   */\n  addComponent(component: ImageBuilderComponent) {\n    if (this.boundAmi) {\n      throw new Error('AMI is already bound. Use this method before passing the builder to a runner provider.');\n    }\n    if (component.platform != this.platform) {\n      throw new Error('Component platform doesn\\'t match builder platform');\n    }\n    this.components.push(component);\n  }\n\n  /**\n   * Add extra trusted certificates. This helps deal with self-signed certificates for GitHub Enterprise Server.\n   *\n   * @param path path to directory containing a file called certs.pem containing all the required certificates\n   */\n  public addExtraCertificates(path: string) {\n    if (this.platform == 'Linux') {\n      this.prependComponent(LinuxUbuntuComponents.extraCertificates(this, 'Extra Certs', path));\n    } else if (this.platform == 'Windows') {\n      this.prependComponent(WindowsComponents.extraCertificates(this, 'Extra Certs', path));\n    } else {\n      throw new Error(`Unknown platform: ${this.platform}`);\n    }\n  }\n\n  /**\n   * Called by IRunnerProvider to finalize settings and create the AMI builder.\n   */\n  bindAmi(): RunnerAmi {\n    if (this.boundAmi) {\n      return this.boundAmi;\n    }\n\n    const launchTemplate = new ec2.LaunchTemplate(this, 'Launch template', {\n      requireImdsv2: true,\n    });\n\n    const stackName = cdk.Stack.of(this).stackName;\n    const builderName = this.node.path;\n\n    const dist = new imagebuilder.CfnDistributionConfiguration(this, 'Distribution', {\n      name: uniqueImageBuilderName(this),\n      description: this.description,\n      distributions: [\n        {\n          region: Stack.of(this).region,\n          amiDistributionConfiguration: {\n            Name: `${cdk.Names.uniqueResourceName(this, {\n              maxLength: 100,\n              separator: '-',\n              allowedSpecialCharacters: '_-',\n            })}-{{ imagebuilder:buildDate }}`,\n            AmiTags: {\n              'Name': this.node.id,\n              'GitHubRunners:Stack': stackName,\n              'GitHubRunners:Builder': builderName,\n            },\n          },\n          launchTemplateConfigurations: [\n            {\n              launchTemplateId: launchTemplate.launchTemplateId,\n            },\n          ],\n        },\n      ],\n    });\n\n    const recipe = new AmiRecipe(this, 'Ami Recipe', {\n      platform: this.platform,\n      components: this.components,\n      architecture: this.architecture,\n      baseAmi: defaultBaseAmi(this, this.os, this.architecture),\n    });\n\n    const log = this.createLog(recipe.name);\n    const infra = this.createInfrastructure([\n      iam.ManagedPolicy.fromAwsManagedPolicyName('AmazonSSMManagedInstanceCore'),\n      iam.ManagedPolicy.fromAwsManagedPolicyName('EC2InstanceProfileForImageBuilder'),\n    ]);\n    this.createImage(infra, dist, log, recipe.arn, undefined);\n    this.createPipeline(infra, dist, log, recipe.arn, undefined);\n\n    this.boundAmi = {\n      launchTemplate: launchTemplate,\n      architecture: this.architecture,\n      os: this.os,\n      logGroup: log,\n      runnerVersion: this.runnerVersion,\n    };\n\n    this.imageCleaner(launchTemplate, stackName, builderName);\n\n    return this.boundAmi;\n  }\n\n  private imageCleaner(launchTemplate: ec2.LaunchTemplate, stackName: string, builderName: string) {\n    const deleter = singletonLambda(DeleteAmiFunction, this, 'delete-ami', {\n      description: 'Delete old GitHub Runner AMIs',\n      initialPolicy: [\n        new iam.PolicyStatement({\n          actions: ['ec2:DescribeLaunchTemplateVersions', 'ec2:DescribeImages', 'ec2:DeregisterImage', 'ec2:DeleteSnapshot'],\n          resources: ['*'],\n        }),\n      ],\n      timeout: cdk.Duration.minutes(5),\n      logRetention: logs.RetentionDays.ONE_MONTH,\n    });\n\n    // delete old AMIs on schedule\n    const eventRule = new events.Rule(this, 'Delete AMI Schedule', {\n      schedule: events.Schedule.rate(cdk.Duration.days(1)),\n      description: `Delete old AMIs for ${builderName}`,\n    });\n    eventRule.addTarget(new events_targets.LambdaFunction(deleter, {\n      event: events.RuleTargetInput.fromObject({\n        RequestType: 'Scheduled',\n        LaunchTemplateId: launchTemplate.launchTemplateId,\n        StackName: stackName,\n        BuilderName: builderName,\n      }),\n    }));\n\n    // delete all AMIs when this construct is removed\n    new CustomResource(this, 'AMI Deleter', {\n      serviceToken: deleter.functionArn,\n      resourceType: 'Custom::AmiDeleter',\n      properties: {\n        StackName: stackName,\n        BuilderName: builderName,\n      },\n    });\n  }\n\n  bindDockerImage(): RunnerImage {\n    throw new Error('AmiBuilder cannot be used to build Docker images');\n  }\n}\n"]}
@@ -1,6 +1,6 @@
1
1
  import { aws_ec2 as ec2, aws_iam as iam, aws_imagebuilder as imagebuilder, aws_logs as logs } from 'aws-cdk-lib';
2
2
  import { Construct } from 'constructs';
3
- import { Architecture, Os, RunnerAmi, RunnerImage, RunnerVersion } from '../../../common';
3
+ import { Architecture, Os, RunnerAmi, RunnerImage, RunnerVersion } from '../../../providers/common';
4
4
  import { ImageBuilderBaseProps, IRunnerImageBuilder } from '../../common';
5
5
  import { ImageBuilderComponent } from '../builder';
6
6
  /**