chore: Switch to official CDK L2 constructs for EC2 Image Builder

.projenrc.js

@@ -7,7 +7,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
   author: 'Amir Szekely',
   authorAddress: 'amir@cloudsnorkel.com',
   stability: Stability.EXPERIMENTAL,
-  cdkVersion: '2.155.0', // 2.21.1 for lambda url, 2.29.0 for Names.uniqueResourceName(), 2.50.0 for JsonPath.base64Encode, 2.77.0 for node 16, 2.110.0 for ib lifecycle, 2.123.0 for lambda logs, 2.155.0 for launch template throughput
+  cdkVersion: '2.231.0', // 2.21.1 for lambda url, 2.29.0 for Names.uniqueResourceName(), 2.50.0 for JsonPath.base64Encode, 2.77.0 for node 16, 2.110.0 for ib lifecycle, 2.123.0 for lambda logs, 2.155.0 for launch template throughput, 2.231.0 for imagebuilder
   defaultReleaseBranch: 'main',
   name: '@cloudsnorkel/cdk-github-runners',
   repositoryUrl: 'https://github.com/CloudSnorkel/cdk-github-runners.git',
@@ -44,6 +44,9 @@ const project = new awscdk.AwsCdkConstructLibrary({
   ],
   deps: [
   ],
+  peerDeps: [
+    '@aws-cdk/aws-imagebuilder-alpha',
+  ],
   jsiiVersion: '5.8.x',
   typescriptVersion: '5.6.x',
   lambdaOptions: { runtime: awscdk.LambdaRuntime.NODEJS_22_X },

src/image-builders/aws-image-builder/ami.ts

@@ -1,9 +1,8 @@
+import * as imagebuilder2 from '@aws-cdk/aws-imagebuilder-alpha';
 import * as cdk from 'aws-cdk-lib';
-import { aws_imagebuilder as imagebuilder } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 import { ImageBuilderComponent } from './builder';
 import { amiRootDevice, Architecture, Os } from '../../providers';
-import { uniqueImageBuilderName } from '../common';
 
 /**
  * Properties for AmiRecipe construct.
@@ -48,6 +47,7 @@ interface AmiRecipeProperties {
  * @internal
  */
 export class AmiRecipe extends cdk.Resource {
+  public readonly recipe: imagebuilder2.ImageRecipe;
   public readonly arn: string;
   public readonly name: string;
   public readonly version: string;
@@ -57,22 +57,22 @@ export class AmiRecipe extends cdk.Resource {
 
     let components = props.components.map(component => {
       return {
-        componentArn: component.arn,
+        component: component.component,
       };
     });
 
     const blockDeviceMappings = props.storageSize ? [
       {
         deviceName: amiRootDevice(this, props.baseAmi).ref,
-        ebs: {
-          volumeSize: props.storageSize.toGibibytes(),
-          deleteOnTermination: true,
+        volume: {
+          ebsDevice: {
+            volumeSize: props.storageSize.toGibibytes(),
+            deleteOnTermination: true,
+          },
         },
       },
     ] : undefined;
 
-    this.name = uniqueImageBuilderName(this);
-
     let workingDirectory;
     if (props.platform == 'Linux') {
       workingDirectory = '/home/runner';
@@ -82,18 +82,18 @@ export class AmiRecipe extends cdk.Resource {
       throw new Error(`Unsupported AMI recipe platform: ${props.platform}`);
     }
 
-    const recipe = new imagebuilder.CfnImageRecipe(this, 'Recipe', {
-      name: this.name,
-      version: '1.0.x',
-      parentImage: props.baseAmi,
+    const recipe = new imagebuilder2.ImageRecipe(this, 'Recipe', {
+      baseImage: imagebuilder2.BaseImage.fromAmiId(props.baseAmi),
       components,
       workingDirectory,
       tags: props.tags,
-      blockDeviceMappings,
+      blockDevices: blockDeviceMappings,
     });
 
-    this.arn = recipe.attrArn;
-    this.version = recipe.getAtt('Version', cdk.ResolutionTypeHint.STRING).toString();
+    this.recipe = recipe;
+    this.arn = recipe.imageRecipeArn;
+    this.name = recipe.imageRecipeName;
+    this.version = recipe.imageRecipeVersion;
   }
 }