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

package/lib/services/aws-ecr/cfn-props-mixins.generated.d.ts

@@ -2,6 +2,7 @@ import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-ecr";
+import { aws_ecr as ecrRefs, aws_kms as kmsRefs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::ECR::PublicRepository` resource specifies an Amazon Elastic Container Registry Public (Amazon ECR Public) repository, where users can push and pull Docker images, Open Container Initiative (OCI) images, and OCI compatible artifacts.
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-ecr";
 export declare class CfnPublicRepositoryPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPublicRepositoryMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ECR::PublicRepository`.
      *
@@ -133,7 +134,7 @@ export interface CfnPublicRepositoryMixinProps {
 export declare class CfnPullThroughCacheRulePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPullThroughCacheRuleMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ECR::PullThroughCacheRule`.
      *
@@ -208,7 +209,7 @@ export interface CfnPullThroughCacheRuleMixinProps {
 export declare class CfnRegistryPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRegistryPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ECR::RegistryPolicy`.
      *
@@ -255,7 +256,7 @@ export interface CfnRegistryPolicyMixinProps {
 export declare class CfnReplicationConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnReplicationConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ECR::ReplicationConfiguration`.
      *
@@ -328,7 +329,7 @@ export declare namespace CfnReplicationConfigurationPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-repositoryfilter.html#cfn-ecr-replicationconfiguration-repositoryfilter-filter
          */
-        readonly filter?: string;
+        readonly filter?: ecrRefs.IRepositoryRef | string;
         /**
          * The repository filter type.
          *
@@ -390,7 +391,7 @@ export interface CfnReplicationConfigurationMixinProps {
 export declare class CfnRepositoryPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRepositoryMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ECR::Repository`.
      *
@@ -458,7 +459,7 @@ export declare namespace CfnRepositoryPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-encryptionconfiguration.html#cfn-ecr-repository-encryptionconfiguration-kmskey
          */
-        readonly kmsKey?: string;
+        readonly kmsKey?: kmsRefs.IKeyRef | string;
     }
     /**
      * The `LifecyclePolicy` property type specifies a lifecycle policy.
@@ -601,7 +602,7 @@ export interface CfnRepositoryMixinProps {
 export declare class CfnPullTimeUpdateExclusionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPullTimeUpdateExclusionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ECR::PullTimeUpdateExclusion`.
      *
@@ -644,7 +645,7 @@ export interface CfnPullTimeUpdateExclusionMixinProps {
 export declare class CfnRegistryScanningConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRegistryScanningConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ECR::RegistryScanningConfiguration`.
      *
@@ -743,7 +744,7 @@ export interface CfnRegistryScanningConfigurationMixinProps {
 export declare class CfnRepositoryCreationTemplatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnRepositoryCreationTemplateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ECR::RepositoryCreationTemplate`.
      *
@@ -904,7 +905,7 @@ export interface CfnRepositoryCreationTemplateMixinProps {
 export declare class CfnSigningConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSigningConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ECR::SigningConfiguration`.
      *

package/lib/services/aws-ecr/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-ecr");
 /**
  * The `AWS::ECR::PublicRepository` resource specifies an Amazon Elastic Container Registry Public (Amazon ECR Public) repository, where users can push and pull Docker images, Open Container Initiative (OCI) images, and OCI compatible artifacts.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-ecr");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html
  */
 class CfnPublicRepositoryPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnPublicRepositoryPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnPublicRepositoryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["repositoryCatalogData", "repositoryName", "repositoryPolicyText", "tags"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnPublicRepositoryPropsMixin 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
@@ -55,12 +54,7 @@ class CfnPublicRepositoryPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPublicRepositoryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPublicRepositoryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPublicRepositoryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -76,7 +70,7 @@ exports.CfnPublicRepositoryPropsMixin = CfnPublicRepositoryPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-pullthroughcacherule.html
  */
 class CfnPullThroughCacheRulePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnPullThroughCacheRulePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnPullThroughCacheRulePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["credentialArn", "customRoleArn", "ecrRepositoryPrefix", "upstreamRegistry", "upstreamRegistryUrl", "upstreamRepositoryPrefix"];
     props;
     strategy;
@@ -99,7 +93,7 @@ class CfnPullThroughCacheRulePropsMixin 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
@@ -112,12 +106,7 @@ class CfnPullThroughCacheRulePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPullThroughCacheRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPullThroughCacheRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPullThroughCacheRulePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -133,7 +122,7 @@ exports.CfnPullThroughCacheRulePropsMixin = CfnPullThroughCacheRulePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-registrypolicy.html
  */
 class CfnRegistryPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnRegistryPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnRegistryPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["policyText"];
     props;
     strategy;
@@ -156,7 +145,7 @@ class CfnRegistryPolicyPropsMixin 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
@@ -169,12 +158,7 @@ class CfnRegistryPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRegistryPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRegistryPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRegistryPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -192,7 +176,7 @@ exports.CfnRegistryPolicyPropsMixin = CfnRegistryPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-replicationconfiguration.html
  */
 class CfnReplicationConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnReplicationConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnReplicationConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["replicationConfiguration"];
     props;
     strategy;
@@ -214,8 +198,11 @@ class CfnReplicationConfigurationPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnReplicationConfigurationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -228,16 +215,44 @@ class CfnReplicationConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnReplicationConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnReplicationConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnReplicationConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnReplicationConfigurationPropsMixin = CfnReplicationConfigurationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnReplicationConfigurationPropsMixinRepositoryFilterProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        filter: (!props.filter ? undefined : cdk.getRefProperty(props.filter?.repositoryRef, 'repositoryName') ?? cdk.ensureStringOrUndefined(props.filter, "filter", "ecr.IRepositoryRef | string")),
+        filterType: (!props.filterType ? undefined : props.filterType)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnReplicationConfigurationPropsMixinReplicationRuleProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        destinations: (!props.destinations ? undefined : props.destinations),
+        repositoryFilters: (!props.repositoryFilters ? undefined : (cdk.isResolvableObject(props.repositoryFilters) ? props.repositoryFilters : (!props.repositoryFilters ? undefined : cdk.mapArrayInPlace(props.repositoryFilters, (item) => flattenCfnReplicationConfigurationPropsMixinRepositoryFilterProperty(item)))))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnReplicationConfigurationPropsMixinReplicationConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        rules: (!props.rules ? undefined : (cdk.isResolvableObject(props.rules) ? props.rules : cdk.mapArrayInPlace(props.rules, (item) => flattenCfnReplicationConfigurationPropsMixinReplicationRuleProperty(item))))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnReplicationConfigurationMixinProps(props) {
+    const ret = {};
+    if ((props.replicationConfiguration !== undefined))
+        ret.replicationConfiguration = flattenCfnReplicationConfigurationPropsMixinReplicationConfigurationProperty(props.replicationConfiguration);
+    return ret;
+}
 /**
  * The `AWS::ECR::Repository` resource specifies an Amazon Elastic Container Registry (Amazon ECR) repository, where users can push and pull Docker images, Open Container Initiative (OCI) images, and OCI compatible artifacts.
  *
@@ -249,7 +264,7 @@ exports.CfnReplicationConfigurationPropsMixin = CfnReplicationConfigurationProps
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html
  */
 class CfnRepositoryPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnRepositoryPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnRepositoryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["emptyOnDelete", "encryptionConfiguration", "imageScanningConfiguration", "imageTagMutability", "imageTagMutabilityExclusionFilters", "lifecyclePolicy", "repositoryName", "repositoryPolicyText", "tags"];
     props;
     strategy;
@@ -271,8 +286,11 @@ class CfnRepositoryPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRepositoryMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -285,16 +303,27 @@ class CfnRepositoryPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRepositoryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRepositoryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRepositoryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnRepositoryPropsMixin = CfnRepositoryPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRepositoryPropsMixinEncryptionConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        encryptionType: (!props.encryptionType ? undefined : props.encryptionType),
+        kmsKey: (!props.kmsKey ? undefined : cdk.getRefProperty(props.kmsKey?.keyRef, 'keyArn') ?? cdk.ensureStringOrUndefined(props.kmsKey, "kmsKey", "kms.IKeyRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRepositoryMixinProps(props) {
+    const ret = {};
+    if ((props.encryptionConfiguration !== undefined))
+        ret.encryptionConfiguration = flattenCfnRepositoryPropsMixinEncryptionConfigurationProperty(props.encryptionConfiguration);
+    return ret;
+}
 /**
  * The ARN of the IAM principal to remove from the pull time update exclusion list.
  *
@@ -304,7 +333,7 @@ exports.CfnRepositoryPropsMixin = CfnRepositoryPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-pulltimeupdateexclusion.html
  */
 class CfnPullTimeUpdateExclusionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnPullTimeUpdateExclusionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnPullTimeUpdateExclusionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["principalArn"];
     props;
     strategy;
@@ -327,7 +356,7 @@ class CfnPullTimeUpdateExclusionPropsMixin 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
@@ -340,12 +369,7 @@ class CfnPullTimeUpdateExclusionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPullTimeUpdateExclusionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPullTimeUpdateExclusionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPullTimeUpdateExclusionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -359,7 +383,7 @@ exports.CfnPullTimeUpdateExclusionPropsMixin = CfnPullTimeUpdateExclusionPropsMi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-registryscanningconfiguration.html
  */
 class CfnRegistryScanningConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnRegistryScanningConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnRegistryScanningConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["rules", "scanType"];
     props;
     strategy;
@@ -382,7 +406,7 @@ class CfnRegistryScanningConfigurationPropsMixin 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
@@ -395,12 +419,7 @@ class CfnRegistryScanningConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRegistryScanningConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRegistryScanningConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRegistryScanningConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -414,7 +433,7 @@ exports.CfnRegistryScanningConfigurationPropsMixin = CfnRegistryScanningConfigur
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repositorycreationtemplate.html
  */
 class CfnRepositoryCreationTemplatePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnRepositoryCreationTemplatePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnRepositoryCreationTemplatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["appliedFor", "customRoleArn", "description", "encryptionConfiguration", "imageTagMutability", "imageTagMutabilityExclusionFilters", "lifecyclePolicy", "prefix", "repositoryPolicy", "resourceTags"];
     props;
     strategy;
@@ -437,7 +456,7 @@ class CfnRepositoryCreationTemplatePropsMixin 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
@@ -450,12 +469,7 @@ class CfnRepositoryCreationTemplatePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRepositoryCreationTemplatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRepositoryCreationTemplatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRepositoryCreationTemplatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -469,7 +483,7 @@ exports.CfnRepositoryCreationTemplatePropsMixin = CfnRepositoryCreationTemplateP
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-signingconfiguration.html
  */
 class CfnSigningConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnSigningConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_ecr.mixins.CfnSigningConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["rules"];
     props;
     strategy;
@@ -492,7 +506,7 @@ class CfnSigningConfigurationPropsMixin 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
@@ -505,12 +519,7 @@ class CfnSigningConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSigningConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSigningConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSigningConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }