Remove common class for document data for dockerfile and component data

Author: Tarun Belani

packages/@aws-cdk/aws-imagebuilder-alpha/lib/component.ts

@@ -6,7 +6,7 @@ import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as s3assets from 'aws-cdk-lib/aws-s3-assets';
 import { propertyInjectable } from 'aws-cdk-lib/core/lib/prop-injectable';
 import { Construct } from 'constructs';
-import { ImageBuilderData } from './imagebuilder-data';
+import * as yaml from 'yaml';
 import { OSVersion, Platform } from './os-version';
 
 const COMPONENT_SYMBOL = Symbol.for('@aws-cdk/aws-imagebuilder-alpha.Component');
@@ -640,7 +640,7 @@ export enum ComponentSchemaVersion {
 /**
  * Helper class for referencing and uploading component data
  */
-export abstract class ComponentData extends ImageBuilderData {
+export abstract class ComponentData {
   /**
    * Uploads component data from a local file to S3 to use as the component data
    *
@@ -655,7 +655,7 @@ export abstract class ComponentData extends ImageBuilderData {
     path: string,
     options: s3assets.AssetOptions = {},
   ): S3ComponentData {
-    const asset = this.createAsset(scope, id, path, options);
+    const asset = new s3assets.Asset(scope, id, { ...options, path });
     return new S3ComponentDataFromAsset(asset);
   }
 
@@ -675,7 +675,7 @@ export abstract class ComponentData extends ImageBuilderData {
    * @param data An inline JSON object representing the component data
    */
   public static fromJsonObject(data: { [key: string]: any }): ComponentData {
-    const inlineData = this.createInlineYaml(data);
+    const inlineData = yaml.stringify(data, { indent: 2 });
     return new InlineComponentData(inlineData);
   }
 
@@ -721,6 +721,20 @@ export abstract class ComponentData extends ImageBuilderData {
   public static fromInline(data: string): ComponentData {
     return new InlineComponentData(data);
   }
+
+  /**
+   * Indicates that the provided component data is an S3 reference
+   */
+  abstract readonly isS3Reference: boolean;
+
+  /**
+   * The resulting inline string or S3 URL which references the component data
+   */
+  public readonly value: string;
+
+  protected constructor(value: string) {
+    this.value = value;
+  }
 }
 
 /**
@@ -742,7 +756,7 @@ export abstract class S3ComponentData extends ComponentData {
   /**
    * Grant put permissions to the given grantee for the component data in S3
    *
-   * @param grantee - The principal
+   * @param grantee The principal
    */
   public grantPut(grantee: iam.IGrantable): iam.Grant {
     return this.bucket.grantPut(grantee, this.key);
@@ -751,7 +765,7 @@ export abstract class S3ComponentData extends ComponentData {
   /**
    * Grant read permissions to the given grantee for the component data in S3
    *
-   * @param grantee - The principal
+   * @param grantee The principal
    */
   public grantRead(grantee: iam.IGrantable): iam.Grant {
     return this.bucket.grantRead(grantee, this.key);

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

@@ -9,7 +9,6 @@ import * as s3assets from 'aws-cdk-lib/aws-s3-assets';
 import { propertyInjectable } from 'aws-cdk-lib/core/lib/prop-injectable';
 import { Construct } from 'constructs';
 import { BaseContainerImage, ContainerInstanceImage } from './base-image';
-import { ImageBuilderData } from './imagebuilder-data';
 import { OSVersion } from './os-version';
 import { ComponentConfiguration, IRecipeBase } from './recipe-base';
 
@@ -180,7 +179,7 @@ export abstract class Repository {
 /**
  * Helper class for referencing and uploading dockerfile data for the container recipe
  */
-export abstract class DockerfileData extends ImageBuilderData {
+export abstract class DockerfileData {
   /**
    * Uploads dockerfile data from a local file to S3 to use as the dockerfile data
    *
@@ -195,7 +194,7 @@ export abstract class DockerfileData extends ImageBuilderData {
     path: string,
     options: s3assets.AssetOptions = {},
   ): S3DockerfileData {
-    const asset = this.createAsset(scope, id, path, options);
+    const asset = new s3assets.Asset(scope, id, { ...options, path });
     return new S3DockerfileDataFromAsset(asset);
   }
 
@@ -217,6 +216,20 @@ export abstract class DockerfileData extends ImageBuilderData {
   public static fromInline(data: string): DockerfileData {
     return new InlineDockerfileData(data);
   }
+
+  /**
+   * Indicates that the provided component data is an S3 reference
+   */
+  abstract readonly isS3Reference: boolean;
+
+  /**
+   * The resulting inline string or S3 URL which references the component data
+   */
+  public readonly value: string;
+
+  protected constructor(value: string) {
+    this.value = value;
+  }
 }
 
 /**