Addressed review comments

Author: Tarun Belani

packages/@aws-cdk/aws-imagebuilder-alpha/lib/image-recipe.ts

@@ -321,7 +321,7 @@ export class ImageRecipe extends ImageRecipeBase {
 
     this.validateImageRecipeName();
 
-    this.addBlockDevices(...(props.blockDevices ?? []));
+    this.addBlockDevice(...(props.blockDevices ?? []));
 
     const components: CfnImageRecipe.ComponentConfigurationProperty[] | undefined = props.components?.map(
       (component) => ({
@@ -362,10 +362,17 @@ export class ImageRecipe extends ImageRecipeBase {
    *
    * @param blockDevices The list of block devices to attach
    */
-  public addBlockDevices(...blockDevices: ec2.BlockDevice[]): void {
+  public addBlockDevice(...blockDevices: ec2.BlockDevice[]): void {
     this.blockDevices.push(...blockDevices);
   }
 
+  /**
+   * Renders the input block devices, into the `BlockDeviceMapping[]` structure that CfnImageRecipe expects to receive.
+   * This is rendered at synthesis time, as users can add additional block devices with `addBlockDevice`, after the
+   * construct has been instantiated.
+   *
+   * @private
+   */
   private renderBlockDevices(): CfnImageRecipe.InstanceBlockDeviceMappingProperty[] | undefined {
     const blockDevices = this.blockDevices.map((blockDevice): CfnImageRecipe.InstanceBlockDeviceMappingProperty => {
       const ebsDevice = blockDevice.volume.ebsDevice;
@@ -380,18 +387,24 @@ export class ImageRecipe extends ImageRecipeBase {
         ...(ebsDevice?.volumeType !== undefined && { volumeType: ebsDevice.volumeType }),
       };
 
-      const mappingEnabled = blockDevice.mappingEnabled ?? true;
       return {
         deviceName: blockDevice.deviceName,
         virtualName: blockDevice.volume.virtualName,
-        ...(!mappingEnabled && { noDevice: '' }),
+        ...(blockDevice.mappingEnabled === false && { noDevice: '' }),
         ...(Object.keys(ebs).length && { ebs }),
       };
     });
 
     return blockDevices.length ? blockDevices : undefined;
   }
 
+  /**
+   * Generates the additional instance configuration property into the `AdditionalInstanceConfiguration` type in the
+   * CloudFormation L1 definition.
+   *
+   * @param props The props passed as input to the construct
+   * @private
+   */
   private buildAdditionalInstanceConfiguration(
     props: ImageRecipeProps,
   ): CfnImageRecipe.AdditionalInstanceConfigurationProperty | undefined {

packages/@aws-cdk/aws-imagebuilder-alpha/test/image-recipe.test.ts

@@ -181,7 +181,7 @@ describe('Image Recipe', () => {
       },
     });
 
-    imageRecipe.addBlockDevices(
+    imageRecipe.addBlockDevice(
       {
         deviceName: '/dev/sda2',
         volume: ec2.BlockDeviceVolume.ebs(75, {

packages/@aws-cdk/aws-imagebuilder-alpha/test/integ.all-parameters.image-recipe.js.snapshot/aws-cdk-imagebuilder-image-recipe-all-parameters.assets.json

@@ -116,6 +116,16 @@
    }
   }
  },
+ "Outputs": {
+  "ImageRecipeVersion": {
+   "Value": {
+    "Fn::GetAtt": [
+     "ImageRecipe8C789631",
+     "Version"
+    ]
+   }
+  }
+ },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",

packages/@aws-cdk/aws-imagebuilder-alpha/test/integ.all-parameters.image-recipe.js.snapshot/aws-cdk-imagebuilder-image-recipe-all-parameters.template.json

@@ -84,7 +84,7 @@ const imageRecipe = new imagebuilder.ImageRecipe(stack, 'ImageRecipe', {
   },
 });
 
-imageRecipe.addBlockDevices({
+imageRecipe.addBlockDevice({
   deviceName: '/dev/sda2',
   volume: ec2.BlockDeviceVolume.ebs(75, {
     encrypted: true,
@@ -96,6 +96,8 @@ imageRecipe.addBlockDevices({
   }),
 });
 
+new cdk.CfnOutput(stack, 'ImageRecipeVersion', { value: imageRecipe.imageRecipeVersion });
+
 new integ.IntegTest(app, 'ImageRecipeTest', {
   testCases: [stack],
 });

packages/@aws-cdk/aws-imagebuilder-alpha/test/integ.all-parameters.image-recipe.js.snapshot/manifest.json

@@ -9,6 +9,16 @@
    }
   }
  },
+ "Outputs": {
+  "ImageRecipeVersion": {
+   "Value": {
+    "Fn::GetAtt": [
+     "ImageRecipe8C789631",
+     "Version"
+    ]
+   }
+  }
+ },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",