@aws-cdk/mixins-preview 2.241.0-alpha.0 → 2.242.0-alpha.0

package/lib/services/aws-imagebuilder/cfn-props-mixins.generated.js

@@ -6,7 +6,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-imagebuilder");
 /**
  * Creates a new component that can be used to build, validate, test, and assess your image.
@@ -22,7 +21,7 @@ const service = require("aws-cdk-lib/aws-imagebuilder");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html
  */
 class CfnComponentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnComponentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnComponentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["changeDescription", "data", "description", "kmsKeyId", "name", "platform", "supportedOsVersions", "tags", "uri", "version"];
     props;
     strategy;
@@ -45,7 +44,7 @@ class CfnComponentPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -58,12 +57,7 @@ class CfnComponentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnComponentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnComponentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnComponentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -79,7 +73,7 @@ exports.CfnComponentPropsMixin = CfnComponentPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html
  */
 class CfnContainerRecipePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnContainerRecipePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnContainerRecipePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["components", "containerType", "description", "dockerfileTemplateData", "dockerfileTemplateUri", "imageOsVersionOverride", "instanceConfiguration", "kmsKeyId", "name", "parentImage", "platformOverride", "tags", "targetRepository", "version", "workingDirectory"];
     props;
     strategy;
@@ -101,8 +95,11 @@ class CfnContainerRecipePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnContainerRecipeMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -115,16 +112,27 @@ class CfnContainerRecipePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnContainerRecipePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnContainerRecipePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnContainerRecipePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnContainerRecipePropsMixin = CfnContainerRecipePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnContainerRecipePropsMixinTargetContainerRepositoryProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        repositoryName: (!props.repositoryName ? undefined : cdk.getRefProperty(props.repositoryName?.repositoryRef, 'repositoryName') ?? cdk.ensureStringOrUndefined(props.repositoryName, "repositoryName", "ecr.IRepositoryRef | string")),
+        service: (!props.service ? undefined : props.service)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnContainerRecipeMixinProps(props) {
+    const ret = {};
+    if ((props.targetRepository !== undefined))
+        ret.targetRepository = flattenCfnContainerRecipePropsMixinTargetContainerRepositoryProperty(props.targetRepository);
+    return ret;
+}
 /**
  * A distribution configuration allows you to specify the name and description of your output AMI, authorize other AWS account s to launch the AMI, and replicate the AMI to other AWS Regions .
  *
@@ -136,7 +144,7 @@ exports.CfnContainerRecipePropsMixin = CfnContainerRecipePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-distributionconfiguration.html
  */
 class CfnDistributionConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnDistributionConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnDistributionConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "distributions", "name", "tags"];
     props;
     strategy;
@@ -158,8 +166,11 @@ class CfnDistributionConfigurationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDistributionConfigurationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -172,16 +183,42 @@ class CfnDistributionConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDistributionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDistributionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDistributionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDistributionConfigurationPropsMixin = CfnDistributionConfigurationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDistributionConfigurationPropsMixinLaunchTemplateConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        accountId: (!props.accountId ? undefined : props.accountId),
+        launchTemplateId: (!props.launchTemplateId ? undefined : cdk.getRefProperty(props.launchTemplateId?.launchTemplateRef, 'launchTemplateId') ?? cdk.ensureStringOrUndefined(props.launchTemplateId, "launchTemplateId", "ec2.ILaunchTemplateRef | string")),
+        setDefaultVersion: (!props.setDefaultVersion ? undefined : props.setDefaultVersion)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDistributionConfigurationPropsMixinDistributionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        amiDistributionConfiguration: (!props.amiDistributionConfiguration ? undefined : props.amiDistributionConfiguration),
+        containerDistributionConfiguration: (!props.containerDistributionConfiguration ? undefined : props.containerDistributionConfiguration),
+        fastLaunchConfigurations: (!props.fastLaunchConfigurations ? undefined : props.fastLaunchConfigurations),
+        launchTemplateConfigurations: (!props.launchTemplateConfigurations ? undefined : (cdk.isResolvableObject(props.launchTemplateConfigurations) ? props.launchTemplateConfigurations : (!props.launchTemplateConfigurations ? undefined : cdk.mapArrayInPlace(props.launchTemplateConfigurations, (item) => flattenCfnDistributionConfigurationPropsMixinLaunchTemplateConfigurationProperty(item))))),
+        licenseConfigurationArns: (!props.licenseConfigurationArns ? undefined : props.licenseConfigurationArns),
+        region: (!props.region ? undefined : props.region),
+        ssmParameterConfigurations: (!props.ssmParameterConfigurations ? undefined : props.ssmParameterConfigurations)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDistributionConfigurationMixinProps(props) {
+    const ret = {};
+    if ((props.distributions !== undefined))
+        ret.distributions = (cdk.isResolvableObject(props.distributions) ? props.distributions : cdk.mapArrayInPlace(props.distributions, (item) => flattenCfnDistributionConfigurationPropsMixinDistributionProperty(item)));
+    return ret;
+}
 /**
  * Creates a new image.
  *
@@ -193,7 +230,7 @@ exports.CfnDistributionConfigurationPropsMixin = CfnDistributionConfigurationPro
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-image.html
  */
 class CfnImagePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnImagePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnImagePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["containerRecipeArn", "deletionSettings", "distributionConfigurationArn", "enhancedImageMetadataEnabled", "executionRole", "imagePipelineExecutionSettings", "imageRecipeArn", "imageScanningConfiguration", "imageTestsConfiguration", "infrastructureConfigurationArn", "loggingConfiguration", "tags", "workflows"];
     props;
     strategy;
@@ -215,8 +252,11 @@ class CfnImagePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnImageMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -229,16 +269,22 @@ class CfnImagePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnImagePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnImagePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnImagePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnImagePropsMixin = CfnImagePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnImageMixinProps(props) {
+    const ret = {};
+    if ((props.distributionConfigurationArn !== undefined))
+        ret.distributionConfigurationArn = cdk.getRefProperty(props.distributionConfigurationArn?.distributionConfigurationRef, 'distributionConfigurationArn') ?? cdk.ensureStringOrUndefined(props.distributionConfigurationArn, "distributionConfigurationArn", "imagebuilder.IDistributionConfigurationRef | string");
+    if ((props.imageRecipeArn !== undefined))
+        ret.imageRecipeArn = cdk.getRefProperty(props.imageRecipeArn?.imageRecipeRef, 'imageRecipeArn') ?? cdk.ensureStringOrUndefined(props.imageRecipeArn, "imageRecipeArn", "imagebuilder.IImageRecipeRef | string");
+    if ((props.infrastructureConfigurationArn !== undefined))
+        ret.infrastructureConfigurationArn = cdk.getRefProperty(props.infrastructureConfigurationArn?.infrastructureConfigurationRef, 'infrastructureConfigurationArn') ?? cdk.ensureStringOrUndefined(props.infrastructureConfigurationArn, "infrastructureConfigurationArn", "imagebuilder.IInfrastructureConfigurationRef | string");
+    return ret;
+}
 /**
  * An image pipeline is the automation configuration for building secure OS images on AWS .
  *
@@ -250,7 +296,7 @@ exports.CfnImagePropsMixin = CfnImagePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html
  */
 class CfnImagePipelinePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnImagePipelinePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnImagePipelinePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["containerRecipeArn", "description", "distributionConfigurationArn", "enhancedImageMetadataEnabled", "executionRole", "imageRecipeArn", "imageScanningConfiguration", "imageTestsConfiguration", "infrastructureConfigurationArn", "loggingConfiguration", "name", "schedule", "status", "tags", "workflows"];
     props;
     strategy;
@@ -272,8 +318,11 @@ class CfnImagePipelinePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnImagePipelineMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -286,16 +335,24 @@ class CfnImagePipelinePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnImagePipelinePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnImagePipelinePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnImagePipelinePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnImagePipelinePropsMixin = CfnImagePipelinePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnImagePipelineMixinProps(props) {
+    const ret = {};
+    if ((props.containerRecipeArn !== undefined))
+        ret.containerRecipeArn = cdk.getRefProperty(props.containerRecipeArn?.containerRecipeRef, 'containerRecipeArn') ?? cdk.ensureStringOrUndefined(props.containerRecipeArn, "containerRecipeArn", "imagebuilder.IContainerRecipeRef | string");
+    if ((props.distributionConfigurationArn !== undefined))
+        ret.distributionConfigurationArn = cdk.getRefProperty(props.distributionConfigurationArn?.distributionConfigurationRef, 'distributionConfigurationArn') ?? cdk.ensureStringOrUndefined(props.distributionConfigurationArn, "distributionConfigurationArn", "imagebuilder.IDistributionConfigurationRef | string");
+    if ((props.imageRecipeArn !== undefined))
+        ret.imageRecipeArn = cdk.getRefProperty(props.imageRecipeArn?.imageRecipeRef, 'imageRecipeArn') ?? cdk.ensureStringOrUndefined(props.imageRecipeArn, "imageRecipeArn", "imagebuilder.IImageRecipeRef | string");
+    if ((props.infrastructureConfigurationArn !== undefined))
+        ret.infrastructureConfigurationArn = cdk.getRefProperty(props.infrastructureConfigurationArn?.infrastructureConfigurationRef, 'infrastructureConfigurationArn') ?? cdk.ensureStringOrUndefined(props.infrastructureConfigurationArn, "infrastructureConfigurationArn", "imagebuilder.IInfrastructureConfigurationRef | string");
+    return ret;
+}
 /**
  * Creates a new image recipe.
  *
@@ -307,7 +364,7 @@ exports.CfnImagePipelinePropsMixin = CfnImagePipelinePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html
  */
 class CfnImageRecipePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnImageRecipePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnImageRecipePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["additionalInstanceConfiguration", "amiTags", "blockDeviceMappings", "components", "description", "name", "parentImage", "tags", "version", "workingDirectory"];
     props;
     strategy;
@@ -329,8 +386,11 @@ class CfnImageRecipePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnImageRecipeMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -343,16 +403,27 @@ class CfnImageRecipePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnImageRecipePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnImageRecipePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnImageRecipePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnImageRecipePropsMixin = CfnImageRecipePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnImageRecipePropsMixinComponentConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        componentArn: (!props.componentArn ? undefined : cdk.getRefProperty(props.componentArn?.componentRef, 'componentArn') ?? cdk.ensureStringOrUndefined(props.componentArn, "componentArn", "imagebuilder.IComponentRef | string")),
+        parameters: (!props.parameters ? undefined : props.parameters)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnImageRecipeMixinProps(props) {
+    const ret = {};
+    if ((props.components !== undefined))
+        ret.components = (cdk.isResolvableObject(props.components) ? props.components : cdk.mapArrayInPlace(props.components, (item) => flattenCfnImageRecipePropsMixinComponentConfigurationProperty(item)));
+    return ret;
+}
 /**
  * Creates a new infrastructure configuration.
  *
@@ -364,7 +435,7 @@ exports.CfnImageRecipePropsMixin = CfnImageRecipePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html
  */
 class CfnInfrastructureConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnInfrastructureConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnInfrastructureConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "instanceMetadataOptions", "instanceProfileName", "instanceTypes", "keyPair", "logging", "name", "placement", "resourceTags", "securityGroupIds", "snsTopicArn", "subnetId", "tags", "terminateInstanceOnFailure"];
     props;
     strategy;
@@ -386,8 +457,11 @@ class CfnInfrastructureConfigurationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnInfrastructureConfigurationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -400,16 +474,39 @@ class CfnInfrastructureConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInfrastructureConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInfrastructureConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInfrastructureConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnInfrastructureConfigurationPropsMixin = CfnInfrastructureConfigurationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnInfrastructureConfigurationPropsMixinS3LogsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        s3BucketName: (!props.s3BucketName ? undefined : cdk.getRefProperty(props.s3BucketName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.s3BucketName, "s3BucketName", "s3.IBucketRef | string")),
+        s3KeyPrefix: (!props.s3KeyPrefix ? undefined : props.s3KeyPrefix)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnInfrastructureConfigurationPropsMixinLoggingProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        s3Logs: (!props.s3Logs ? undefined : (!props.s3Logs ? undefined : flattenCfnInfrastructureConfigurationPropsMixinS3LogsProperty(props.s3Logs)))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnInfrastructureConfigurationMixinProps(props) {
+    const ret = {};
+    if ((props.instanceProfileName !== undefined))
+        ret.instanceProfileName = cdk.getRefProperty(props.instanceProfileName?.instanceProfileRef, 'instanceProfileName') ?? cdk.ensureStringOrUndefined(props.instanceProfileName, "instanceProfileName", "iam.IInstanceProfileRef | string");
+    if ((props.logging !== undefined))
+        ret.logging = flattenCfnInfrastructureConfigurationPropsMixinLoggingProperty(props.logging);
+    if ((props.snsTopicArn !== undefined))
+        ret.snsTopicArn = cdk.getRefProperty(props.snsTopicArn?.topicRef, 'topicArn') ?? cdk.ensureStringOrUndefined(props.snsTopicArn, "snsTopicArn", "sns.ITopicRef | string");
+    return ret;
+}
 /**
  * Create a lifecycle policy resource.
  *
@@ -419,7 +516,7 @@ exports.CfnInfrastructureConfigurationPropsMixin = CfnInfrastructureConfiguratio
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-lifecyclepolicy.html
  */
 class CfnLifecyclePolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnLifecyclePolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnLifecyclePolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "executionRole", "name", "policyDetails", "resourceSelection", "resourceType", "status", "tags"];
     props;
     strategy;
@@ -442,7 +539,7 @@ class CfnLifecyclePolicyPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -455,12 +552,7 @@ class CfnLifecyclePolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLifecyclePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLifecyclePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLifecyclePolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -474,7 +566,7 @@ exports.CfnLifecyclePolicyPropsMixin = CfnLifecyclePolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-workflow.html
  */
 class CfnWorkflowPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnWorkflowPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_imagebuilder.mixins.CfnWorkflowPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["changeDescription", "data", "description", "kmsKeyId", "name", "tags", "type", "uri", "version"];
     props;
     strategy;
@@ -497,7 +589,7 @@ class CfnWorkflowPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -510,12 +602,7 @@ class CfnWorkflowPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnWorkflowPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnWorkflowPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnWorkflowPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

package/lib/services/aws-imagebuilder/events.d.ts

@@ -0,0 +1 @@
+export * from './events.generated';

package/lib/services/aws-imagebuilder/events.generated.d.ts

@@ -0,0 +1,186 @@
+import * as cdk from "aws-cdk-lib/core";
+import * as events from "aws-cdk-lib/aws-events";
+/**
+ * EventBridge event pattern for aws.imagebuilder@EC2ImageBuilderCVEDetected
+ */
+export declare class EC2ImageBuilderCVEDetected {
+    /**
+     * EventBridge event pattern for EC2 Image Builder CVE Detected
+     */
+    static ec2ImageBuilderCVEDetectedPattern(options?: EC2ImageBuilderCVEDetected.EC2ImageBuilderCVEDetectedProps): events.EventPattern;
+}
+export declare namespace EC2ImageBuilderCVEDetected {
+    /**
+     * Props type for aws.imagebuilder@EC2ImageBuilderCVEDetected event
+     */
+    interface EC2ImageBuilderCVEDetectedProps {
+        /**
+         * finding-severity-counts property
+         *
+         * Specify an array of string values to match this event if the actual value of finding-severity-counts is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly findingSeverityCounts?: EC2ImageBuilderCVEDetected.FindingSeverityCounts;
+        /**
+         * resource-id property
+         *
+         * Specify an array of string values to match this event if the actual value of resource-id is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly resourceId?: Array<string>;
+        /**
+         * EventBridge event metadata
+         *
+         * @default - -
+         */
+        readonly eventMetadata?: cdk.AWSEventMetadataProps;
+    }
+    /**
+     * Type definition for Finding-severity-counts
+     *
+     * @struct
+     */
+    interface FindingSeverityCounts {
+        /**
+         * all property
+         *
+         * Specify an array of string values to match this event if the actual value of all is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly all?: Array<string>;
+        /**
+         * critical property
+         *
+         * Specify an array of string values to match this event if the actual value of critical is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly critical?: Array<string>;
+        /**
+         * high property
+         *
+         * Specify an array of string values to match this event if the actual value of high is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly high?: Array<string>;
+        /**
+         * medium property
+         *
+         * Specify an array of string values to match this event if the actual value of medium is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly medium?: Array<string>;
+    }
+}
+/**
+ * EventBridge event pattern for aws.imagebuilder@EC2ImageBuilderImageStateChange
+ */
+export declare class EC2ImageBuilderImageStateChange {
+    /**
+     * EventBridge event pattern for EC2 Image Builder Image State Change
+     */
+    static ec2ImageBuilderImageStateChangePattern(options?: EC2ImageBuilderImageStateChange.EC2ImageBuilderImageStateChangeProps): events.EventPattern;
+}
+export declare namespace EC2ImageBuilderImageStateChange {
+    /**
+     * Props type for aws.imagebuilder@EC2ImageBuilderImageStateChange event
+     */
+    interface EC2ImageBuilderImageStateChangeProps {
+        /**
+         * previous-state property
+         *
+         * Specify an array of string values to match this event if the actual value of previous-state is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly previousState?: EC2ImageBuilderImageStateChange.ImageState;
+        /**
+         * state property
+         *
+         * Specify an array of string values to match this event if the actual value of state is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly state?: EC2ImageBuilderImageStateChange.ImageState;
+        /**
+         * EventBridge event metadata
+         *
+         * @default - -
+         */
+        readonly eventMetadata?: cdk.AWSEventMetadataProps;
+    }
+    /**
+     * Type definition for ImageState
+     *
+     * @struct
+     */
+    interface ImageState {
+        /**
+         * status property
+         *
+         * Specify an array of string values to match this event if the actual value of status is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly status?: Array<string>;
+        /**
+         * reason property
+         *
+         * Specify an array of string values to match this event if the actual value of reason is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly reason?: Array<string>;
+    }
+}
+/**
+ * EventBridge event pattern for aws.imagebuilder@EC2ImageBuilderWorkflowStepWaiting
+ */
+export declare class EC2ImageBuilderWorkflowStepWaiting {
+    /**
+     * EventBridge event pattern for EC2 Image Builder Workflow Step Waiting
+     */
+    static ec2ImageBuilderWorkflowStepWaitingPattern(options?: EC2ImageBuilderWorkflowStepWaiting.EC2ImageBuilderWorkflowStepWaitingProps): events.EventPattern;
+}
+export declare namespace EC2ImageBuilderWorkflowStepWaiting {
+    /**
+     * Props type for aws.imagebuilder@EC2ImageBuilderWorkflowStepWaiting event
+     */
+    interface EC2ImageBuilderWorkflowStepWaitingProps {
+        /**
+         * workflow-execution-id property
+         *
+         * Specify an array of string values to match this event if the actual value of workflow-execution-id is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly workflowExecutionId?: Array<string>;
+        /**
+         * workflow-step-execution-id property
+         *
+         * Specify an array of string values to match this event if the actual value of workflow-step-execution-id is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly workflowStepExecutionId?: Array<string>;
+        /**
+         * workflow-step-name property
+         *
+         * Specify an array of string values to match this event if the actual value of workflow-step-name is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly workflowStepName?: Array<string>;
+        /**
+         * EventBridge event metadata
+         *
+         * @default - -
+         */
+        readonly eventMetadata?: cdk.AWSEventMetadataProps;
+    }
+}