Resolve merge conflicts

Author: Tarun Belani

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

@@ -9,6 +9,7 @@ import { propertyInjectable } from 'aws-cdk-lib/core/lib/prop-injectable';
 import { Construct } from 'constructs';
 import { BaseContainerImage, ContainerInstanceImage } from './base-image';
 import { Repository } from './distribution-configuration';
+import { IImageRecipe } from './image-recipe';
 import { OSVersion } from './os-version';
 import { ComponentConfiguration, IRecipeBase } from './recipe-base';
 
@@ -378,6 +379,15 @@ export abstract class ContainerRecipeBase extends cdk.Resource implements IConta
   public _isContainerRecipe(): this is IContainerRecipe {
     return true;
   }
+
+  /**
+   * Indicates whether the recipe is an Image Recipe
+   *
+   * @internal
+   */
+  public _isImageRecipe(): this is IImageRecipe {
+    return false;
+  }
 }
 
 /**

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

@@ -5,6 +5,7 @@ import { CfnImageRecipe } from 'aws-cdk-lib/aws-imagebuilder';
 import { propertyInjectable } from 'aws-cdk-lib/core/lib/prop-injectable';
 import { Construct } from 'constructs';
 import { BaseImage } from './base-image';
+import { IContainerRecipe } from './container-recipe';
 import { ComponentConfiguration, IRecipeBase } from './recipe-base';
 
 const IMAGE_RECIPE_SYMBOL = Symbol.for('@aws-cdk/aws-imagebuilder-alpha.ImageRecipe');
@@ -204,6 +205,15 @@ abstract class ImageRecipeBase extends cdk.Resource implements IImageRecipe {
     return this.grant(grantee, 'imagebuilder:GetImageRecipe');
   }
 
+  /**
+   * Indicates whether the recipe is a Container Recipe
+   *
+   * @internal
+   */
+  public _isContainerRecipe(): this is IContainerRecipe {
+    return false;
+  }
+
   /**
    * Indicates whether the recipe is an Image Recipe
    *

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

@@ -70,7 +70,7 @@ export interface IRecipeBase extends cdk.IResource {
    * @internal
    */
   _isContainerRecipe(): this is IContainerRecipe;
-  
+
   /**
    * Indicates whether the recipe is an Image Recipe
    *

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

@@ -1,4 +1,5 @@
 import * as cdk from 'aws-cdk-lib';
+import * as ecr from 'aws-cdk-lib/aws-ecr';
 import * as ssm from 'aws-cdk-lib/aws-ssm';
 import { BaseContainerImage, BaseImage, ContainerInstanceImage } from '../lib';
 

packages/@aws-cdk/aws-imagebuilder-alpha/test/integ.asset.container-recipe.ts

@@ -19,6 +19,6 @@ new imagebuilder.ContainerRecipe(stack, 'ContainerRecipe', {
   ),
 });
 
-new integ.IntegTest(app, 'ContainerRecipeTest', {
+new integ.IntegTest(app, 'ContainerRecipeTest-Asset', {
   testCases: [stack],
 });

packages/@aws-cdk/aws-imagebuilder-alpha/test/integ.s3.container-recipe.ts

@@ -20,6 +20,6 @@ new imagebuilder.ContainerRecipe(stack, 'ContainerRecipe', {
   dockerfile: imagebuilder.DockerfileData.fromS3(asset.bucket, asset.s3ObjectKey),
 });
 
-new integ.IntegTest(app, 'ContainerRecipeTest', {
+new integ.IntegTest(app, 'ContainerRecipeTest-S3', {
   testCases: [stack],
 });