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

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

@@ -5,9 +5,7 @@ const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
-const core = require("../../core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-cloudfront");
 /**
  * A cache policy.
@@ -24,8 +22,8 @@ const service = require("aws-cdk-lib/aws-cloudfront");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cachepolicy.html
  */
-class CfnCachePolicyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnCachePolicyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnCachePolicyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnCachePolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cachePolicyConfig"];
     props;
     strategy;
@@ -48,7 +46,7 @@ class CfnCachePolicyPropsMixin extends core.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
@@ -61,12 +59,7 @@ class CfnCachePolicyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCachePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCachePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCachePolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -81,8 +74,8 @@ exports.CfnCachePolicyPropsMixin = CfnCachePolicyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cloudfrontoriginaccessidentity.html
  */
-class CfnCloudFrontOriginAccessIdentityPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnCloudFrontOriginAccessIdentityPropsMixin", version: "2.240.0-alpha.0" };
+class CfnCloudFrontOriginAccessIdentityPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnCloudFrontOriginAccessIdentityPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cloudFrontOriginAccessIdentityConfig"];
     props;
     strategy;
@@ -105,7 +98,7 @@ class CfnCloudFrontOriginAccessIdentityPropsMixin extends core.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
@@ -118,12 +111,7 @@ class CfnCloudFrontOriginAccessIdentityPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCloudFrontOriginAccessIdentityPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCloudFrontOriginAccessIdentityPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCloudFrontOriginAccessIdentityPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -140,8 +128,8 @@ exports.CfnCloudFrontOriginAccessIdentityPropsMixin = CfnCloudFrontOriginAccessI
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-continuousdeploymentpolicy.html
  */
-class CfnContinuousDeploymentPolicyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnContinuousDeploymentPolicyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnContinuousDeploymentPolicyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnContinuousDeploymentPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["continuousDeploymentPolicyConfig"];
     props;
     strategy;
@@ -164,7 +152,7 @@ class CfnContinuousDeploymentPolicyPropsMixin extends core.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
@@ -177,12 +165,7 @@ class CfnContinuousDeploymentPolicyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnContinuousDeploymentPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnContinuousDeploymentPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnContinuousDeploymentPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -195,8 +178,8 @@ exports.CfnContinuousDeploymentPolicyPropsMixin = CfnContinuousDeploymentPolicyP
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html
  */
-class CfnDistributionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnDistributionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDistributionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnDistributionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["distributionConfig", "tags"];
     props;
     strategy;
@@ -218,8 +201,11 @@ class CfnDistributionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDistributionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -232,16 +218,144 @@ class CfnDistributionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDistributionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDistributionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDistributionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDistributionPropsMixin = CfnDistributionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDistributionPropsMixinOriginProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        connectionAttempts: (!props.connectionAttempts ? undefined : props.connectionAttempts),
+        connectionTimeout: (!props.connectionTimeout ? undefined : props.connectionTimeout),
+        customOriginConfig: (!props.customOriginConfig ? undefined : props.customOriginConfig),
+        domainName: (!props.domainName ? undefined : cdk.getRefProperty(props.domainName?.domainNameRef, 'domainName') ?? cdk.ensureStringOrUndefined(props.domainName, "domainName", "apigateway.IDomainNameRef | string")),
+        id: (!props.id ? undefined : cdk.getRefProperty(props.id?.loadBalancerRef, 'loadBalancerArn') ?? cdk.ensureStringOrUndefined(props.id, "id", "elasticloadbalancingv2.ILoadBalancerRef | string")),
+        originAccessControlId: (!props.originAccessControlId ? undefined : cdk.getRefProperty(props.originAccessControlId?.originAccessControlRef, 'originAccessControlId') ?? cdk.ensureStringOrUndefined(props.originAccessControlId, "originAccessControlId", "cloudfront.IOriginAccessControlRef | string")),
+        originCustomHeaders: (!props.originCustomHeaders ? undefined : props.originCustomHeaders),
+        originPath: (!props.originPath ? undefined : props.originPath),
+        originShield: (!props.originShield ? undefined : props.originShield),
+        responseCompletionTimeout: (!props.responseCompletionTimeout ? undefined : props.responseCompletionTimeout),
+        s3OriginConfig: (!props.s3OriginConfig ? undefined : props.s3OriginConfig),
+        vpcOriginConfig: (!props.vpcOriginConfig ? undefined : props.vpcOriginConfig)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDistributionPropsMixinFunctionAssociationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        eventType: (!props.eventType ? undefined : props.eventType),
+        functionArn: (!props.functionArn ? undefined : cdk.getRefProperty(props.functionArn?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.functionArn, "functionArn", "cloudfront.IFunctionRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDistributionPropsMixinLambdaFunctionAssociationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        eventType: (!props.eventType ? undefined : props.eventType),
+        includeBody: (!props.includeBody ? undefined : props.includeBody),
+        lambdaFunctionArn: (!props.lambdaFunctionArn ? undefined : cdk.getRefProperty(props.lambdaFunctionArn?.versionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.lambdaFunctionArn, "lambdaFunctionArn", "lambda.IVersionRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDistributionPropsMixinDefaultCacheBehaviorProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        allowedMethods: (!props.allowedMethods ? undefined : props.allowedMethods),
+        cachedMethods: (!props.cachedMethods ? undefined : props.cachedMethods),
+        cachePolicyId: (!props.cachePolicyId ? undefined : cdk.getRefProperty(props.cachePolicyId?.cachePolicyRef, 'cachePolicyId') ?? cdk.ensureStringOrUndefined(props.cachePolicyId, "cachePolicyId", "cloudfront.ICachePolicyRef | string")),
+        compress: (!props.compress ? undefined : props.compress),
+        defaultTtl: (!props.defaultTtl ? undefined : props.defaultTtl),
+        fieldLevelEncryptionId: (!props.fieldLevelEncryptionId ? undefined : props.fieldLevelEncryptionId),
+        forwardedValues: (!props.forwardedValues ? undefined : props.forwardedValues),
+        functionAssociations: (!props.functionAssociations ? undefined : (cdk.isResolvableObject(props.functionAssociations) ? props.functionAssociations : (!props.functionAssociations ? undefined : cdk.mapArrayInPlace(props.functionAssociations, (item) => flattenCfnDistributionPropsMixinFunctionAssociationProperty(item))))),
+        grpcConfig: (!props.grpcConfig ? undefined : props.grpcConfig),
+        lambdaFunctionAssociations: (!props.lambdaFunctionAssociations ? undefined : (cdk.isResolvableObject(props.lambdaFunctionAssociations) ? props.lambdaFunctionAssociations : (!props.lambdaFunctionAssociations ? undefined : cdk.mapArrayInPlace(props.lambdaFunctionAssociations, (item) => flattenCfnDistributionPropsMixinLambdaFunctionAssociationProperty(item))))),
+        maxTtl: (!props.maxTtl ? undefined : props.maxTtl),
+        minTtl: (!props.minTtl ? undefined : props.minTtl),
+        originRequestPolicyId: (!props.originRequestPolicyId ? undefined : cdk.getRefProperty(props.originRequestPolicyId?.originRequestPolicyRef, 'originRequestPolicyId') ?? cdk.ensureStringOrUndefined(props.originRequestPolicyId, "originRequestPolicyId", "cloudfront.IOriginRequestPolicyRef | string")),
+        realtimeLogConfigArn: (!props.realtimeLogConfigArn ? undefined : cdk.getRefProperty(props.realtimeLogConfigArn?.realtimeLogConfigRef, 'realtimeLogConfigArn') ?? cdk.ensureStringOrUndefined(props.realtimeLogConfigArn, "realtimeLogConfigArn", "cloudfront.IRealtimeLogConfigRef | string")),
+        responseHeadersPolicyId: (!props.responseHeadersPolicyId ? undefined : cdk.getRefProperty(props.responseHeadersPolicyId?.responseHeadersPolicyRef, 'responseHeadersPolicyId') ?? cdk.ensureStringOrUndefined(props.responseHeadersPolicyId, "responseHeadersPolicyId", "cloudfront.IResponseHeadersPolicyRef | string")),
+        smoothStreaming: (!props.smoothStreaming ? undefined : props.smoothStreaming),
+        targetOriginId: (!props.targetOriginId ? undefined : cdk.getRefProperty(props.targetOriginId?.loadBalancerRef, 'loadBalancerArn') ?? cdk.ensureStringOrUndefined(props.targetOriginId, "targetOriginId", "elasticloadbalancingv2.ILoadBalancerRef | string")),
+        trustedKeyGroups: (!props.trustedKeyGroups ? undefined : cdk.mapArrayInPlace(props.trustedKeyGroups, (item) => cdk.getRefProperty(item?.keyGroupRef, 'keyGroupId') ?? cdk.ensureStringOrUndefined(item, "trustedKeyGroups", "cloudfront.IKeyGroupRef | string"))),
+        trustedSigners: (!props.trustedSigners ? undefined : props.trustedSigners),
+        viewerProtocolPolicy: (!props.viewerProtocolPolicy ? undefined : props.viewerProtocolPolicy)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDistributionPropsMixinCacheBehaviorProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        allowedMethods: (!props.allowedMethods ? undefined : props.allowedMethods),
+        cachedMethods: (!props.cachedMethods ? undefined : props.cachedMethods),
+        cachePolicyId: (!props.cachePolicyId ? undefined : cdk.getRefProperty(props.cachePolicyId?.cachePolicyRef, 'cachePolicyId') ?? cdk.ensureStringOrUndefined(props.cachePolicyId, "cachePolicyId", "cloudfront.ICachePolicyRef | string")),
+        compress: (!props.compress ? undefined : props.compress),
+        defaultTtl: (!props.defaultTtl ? undefined : props.defaultTtl),
+        fieldLevelEncryptionId: (!props.fieldLevelEncryptionId ? undefined : props.fieldLevelEncryptionId),
+        forwardedValues: (!props.forwardedValues ? undefined : props.forwardedValues),
+        functionAssociations: (!props.functionAssociations ? undefined : (cdk.isResolvableObject(props.functionAssociations) ? props.functionAssociations : (!props.functionAssociations ? undefined : cdk.mapArrayInPlace(props.functionAssociations, (item) => flattenCfnDistributionPropsMixinFunctionAssociationProperty(item))))),
+        grpcConfig: (!props.grpcConfig ? undefined : props.grpcConfig),
+        lambdaFunctionAssociations: (!props.lambdaFunctionAssociations ? undefined : (cdk.isResolvableObject(props.lambdaFunctionAssociations) ? props.lambdaFunctionAssociations : (!props.lambdaFunctionAssociations ? undefined : cdk.mapArrayInPlace(props.lambdaFunctionAssociations, (item) => flattenCfnDistributionPropsMixinLambdaFunctionAssociationProperty(item))))),
+        maxTtl: (!props.maxTtl ? undefined : props.maxTtl),
+        minTtl: (!props.minTtl ? undefined : props.minTtl),
+        originRequestPolicyId: (!props.originRequestPolicyId ? undefined : cdk.getRefProperty(props.originRequestPolicyId?.originRequestPolicyRef, 'originRequestPolicyId') ?? cdk.ensureStringOrUndefined(props.originRequestPolicyId, "originRequestPolicyId", "cloudfront.IOriginRequestPolicyRef | string")),
+        pathPattern: (!props.pathPattern ? undefined : props.pathPattern),
+        realtimeLogConfigArn: (!props.realtimeLogConfigArn ? undefined : props.realtimeLogConfigArn),
+        responseHeadersPolicyId: (!props.responseHeadersPolicyId ? undefined : cdk.getRefProperty(props.responseHeadersPolicyId?.responseHeadersPolicyRef, 'responseHeadersPolicyId') ?? cdk.ensureStringOrUndefined(props.responseHeadersPolicyId, "responseHeadersPolicyId", "cloudfront.IResponseHeadersPolicyRef | string")),
+        smoothStreaming: (!props.smoothStreaming ? undefined : props.smoothStreaming),
+        targetOriginId: (!props.targetOriginId ? undefined : props.targetOriginId),
+        trustedKeyGroups: (!props.trustedKeyGroups ? undefined : cdk.mapArrayInPlace(props.trustedKeyGroups, (item) => cdk.getRefProperty(item?.keyGroupRef, 'keyGroupId') ?? cdk.ensureStringOrUndefined(item, "trustedKeyGroups", "cloudfront.IKeyGroupRef | string"))),
+        trustedSigners: (!props.trustedSigners ? undefined : props.trustedSigners),
+        viewerProtocolPolicy: (!props.viewerProtocolPolicy ? undefined : props.viewerProtocolPolicy)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDistributionPropsMixinDistributionConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        aliases: (!props.aliases ? undefined : props.aliases),
+        anycastIpListId: (!props.anycastIpListId ? undefined : props.anycastIpListId),
+        cacheBehaviors: (!props.cacheBehaviors ? undefined : (cdk.isResolvableObject(props.cacheBehaviors) ? props.cacheBehaviors : (!props.cacheBehaviors ? undefined : cdk.mapArrayInPlace(props.cacheBehaviors, (item) => flattenCfnDistributionPropsMixinCacheBehaviorProperty(item))))),
+        cnamEs: (!props.cnamEs ? undefined : props.cnamEs),
+        comment: (!props.comment ? undefined : props.comment),
+        connectionFunctionAssociation: (!props.connectionFunctionAssociation ? undefined : props.connectionFunctionAssociation),
+        connectionMode: (!props.connectionMode ? undefined : props.connectionMode),
+        continuousDeploymentPolicyId: (!props.continuousDeploymentPolicyId ? undefined : props.continuousDeploymentPolicyId),
+        customErrorResponses: (!props.customErrorResponses ? undefined : props.customErrorResponses),
+        customOrigin: (!props.customOrigin ? undefined : props.customOrigin),
+        defaultCacheBehavior: (!props.defaultCacheBehavior ? undefined : flattenCfnDistributionPropsMixinDefaultCacheBehaviorProperty(props.defaultCacheBehavior)),
+        defaultRootObject: (!props.defaultRootObject ? undefined : props.defaultRootObject),
+        enabled: (!props.enabled ? undefined : props.enabled),
+        httpVersion: (!props.httpVersion ? undefined : props.httpVersion),
+        ipv6Enabled: (!props.ipv6Enabled ? undefined : props.ipv6Enabled),
+        logging: (!props.logging ? undefined : props.logging),
+        originGroups: (!props.originGroups ? undefined : props.originGroups),
+        origins: (!props.origins ? undefined : (cdk.isResolvableObject(props.origins) ? props.origins : (!props.origins ? undefined : cdk.mapArrayInPlace(props.origins, (item) => flattenCfnDistributionPropsMixinOriginProperty(item))))),
+        priceClass: (!props.priceClass ? undefined : props.priceClass),
+        restrictions: (!props.restrictions ? undefined : props.restrictions),
+        s3Origin: (!props.s3Origin ? undefined : props.s3Origin),
+        staging: (!props.staging ? undefined : props.staging),
+        tenantConfig: (!props.tenantConfig ? undefined : props.tenantConfig),
+        viewerCertificate: (!props.viewerCertificate ? undefined : props.viewerCertificate),
+        viewerMtlsConfig: (!props.viewerMtlsConfig ? undefined : props.viewerMtlsConfig),
+        webAclId: (!props.webAclId ? undefined : cdk.getRefProperty(props.webAclId?.webAclRef, 'webAclArn') ?? cdk.ensureStringOrUndefined(props.webAclId, "webAclId", "wafv2.IWebACLRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDistributionMixinProps(props) {
+    const ret = {};
+    if ((props.distributionConfig !== undefined))
+        ret.distributionConfig = flattenCfnDistributionPropsMixinDistributionConfigProperty(props.distributionConfig);
+    return ret;
+}
 /**
  * Creates a CloudFront function.
  *
@@ -258,8 +372,8 @@ exports.CfnDistributionPropsMixin = CfnDistributionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-function.html
  */
-class CfnFunctionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnFunctionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnFunctionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnFunctionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["autoPublish", "functionCode", "functionConfig", "functionMetadata", "name"];
     props;
     strategy;
@@ -282,7 +396,7 @@ class CfnFunctionPropsMixin extends core.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
@@ -295,12 +409,7 @@ class CfnFunctionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFunctionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFunctionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFunctionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -315,8 +424,8 @@ exports.CfnFunctionPropsMixin = CfnFunctionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-keygroup.html
  */
-class CfnKeyGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnKeyGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnKeyGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnKeyGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["keyGroupConfig"];
     props;
     strategy;
@@ -338,8 +447,11 @@ class CfnKeyGroupPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnKeyGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -352,16 +464,28 @@ class CfnKeyGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnKeyGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnKeyGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnKeyGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnKeyGroupPropsMixin = CfnKeyGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnKeyGroupPropsMixinKeyGroupConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        comment: (!props.comment ? undefined : props.comment),
+        items: (!props.items ? undefined : cdk.mapArrayInPlace(props.items, (item) => cdk.getRefProperty(item?.publicKeyRef, 'publicKeyId') ?? cdk.ensureStringOrUndefined(item, "items", "cloudfront.IPublicKeyRef | string"))),
+        name: (!props.name ? undefined : props.name)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnKeyGroupMixinProps(props) {
+    const ret = {};
+    if ((props.keyGroupConfig !== undefined))
+        ret.keyGroupConfig = flattenCfnKeyGroupPropsMixinKeyGroupConfigProperty(props.keyGroupConfig);
+    return ret;
+}
 /**
  * A monitoring subscription.
  *
@@ -372,8 +496,8 @@ exports.CfnKeyGroupPropsMixin = CfnKeyGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-monitoringsubscription.html
  */
-class CfnMonitoringSubscriptionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnMonitoringSubscriptionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnMonitoringSubscriptionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnMonitoringSubscriptionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["distributionId", "monitoringSubscription"];
     props;
     strategy;
@@ -395,8 +519,11 @@ class CfnMonitoringSubscriptionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnMonitoringSubscriptionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -409,16 +536,18 @@ class CfnMonitoringSubscriptionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMonitoringSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMonitoringSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMonitoringSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnMonitoringSubscriptionPropsMixin = CfnMonitoringSubscriptionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnMonitoringSubscriptionMixinProps(props) {
+    const ret = {};
+    if ((props.distributionId !== undefined))
+        ret.distributionId = cdk.getRefProperty(props.distributionId?.distributionRef, 'distributionId') ?? cdk.ensureStringOrUndefined(props.distributionId, "distributionId", "cloudfront.IDistributionRef | string");
+    return ret;
+}
 /**
  * Creates a new origin access control in CloudFront.
  *
@@ -433,8 +562,8 @@ exports.CfnMonitoringSubscriptionPropsMixin = CfnMonitoringSubscriptionPropsMixi
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-originaccesscontrol.html
  */
-class CfnOriginAccessControlPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnOriginAccessControlPropsMixin", version: "2.240.0-alpha.0" };
+class CfnOriginAccessControlPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnOriginAccessControlPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["originAccessControlConfig"];
     props;
     strategy;
@@ -457,7 +586,7 @@ class CfnOriginAccessControlPropsMixin extends core.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
@@ -470,12 +599,7 @@ class CfnOriginAccessControlPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnOriginAccessControlPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnOriginAccessControlPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnOriginAccessControlPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -496,8 +620,8 @@ exports.CfnOriginAccessControlPropsMixin = CfnOriginAccessControlPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-originrequestpolicy.html
  */
-class CfnOriginRequestPolicyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnOriginRequestPolicyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnOriginRequestPolicyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnOriginRequestPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["originRequestPolicyConfig"];
     props;
     strategy;
@@ -520,7 +644,7 @@ class CfnOriginRequestPolicyPropsMixin extends core.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
@@ -533,12 +657,7 @@ class CfnOriginRequestPolicyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnOriginRequestPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnOriginRequestPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnOriginRequestPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -553,8 +672,8 @@ exports.CfnOriginRequestPolicyPropsMixin = CfnOriginRequestPolicyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-publickey.html
  */
-class CfnPublicKeyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnPublicKeyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnPublicKeyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnPublicKeyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["publicKeyConfig"];
     props;
     strategy;
@@ -577,7 +696,7 @@ class CfnPublicKeyPropsMixin extends core.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
@@ -590,12 +709,7 @@ class CfnPublicKeyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPublicKeyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPublicKeyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPublicKeyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -608,8 +722,8 @@ exports.CfnPublicKeyPropsMixin = CfnPublicKeyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-realtimelogconfig.html
  */
-class CfnRealtimeLogConfigPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnRealtimeLogConfigPropsMixin", version: "2.240.0-alpha.0" };
+class CfnRealtimeLogConfigPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnRealtimeLogConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["endPoints", "fields", "name", "samplingRate"];
     props;
     strategy;
@@ -631,8 +745,11 @@ class CfnRealtimeLogConfigPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRealtimeLogConfigMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -645,16 +762,36 @@ class CfnRealtimeLogConfigPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRealtimeLogConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRealtimeLogConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRealtimeLogConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnRealtimeLogConfigPropsMixin = CfnRealtimeLogConfigPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRealtimeLogConfigPropsMixinKinesisStreamConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string")),
+        streamArn: (!props.streamArn ? undefined : cdk.getRefProperty(props.streamArn?.streamRef, 'streamArn') ?? cdk.ensureStringOrUndefined(props.streamArn, "streamArn", "kinesis.IStreamRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRealtimeLogConfigPropsMixinEndPointProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        kinesisStreamConfig: (!props.kinesisStreamConfig ? undefined : flattenCfnRealtimeLogConfigPropsMixinKinesisStreamConfigProperty(props.kinesisStreamConfig)),
+        streamType: (!props.streamType ? undefined : props.streamType)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnRealtimeLogConfigMixinProps(props) {
+    const ret = {};
+    if ((props.endPoints !== undefined))
+        ret.endPoints = (cdk.isResolvableObject(props.endPoints) ? props.endPoints : cdk.mapArrayInPlace(props.endPoints, (item) => flattenCfnRealtimeLogConfigPropsMixinEndPointProperty(item)));
+    return ret;
+}
 /**
  * A response headers policy.
  *
@@ -669,8 +806,8 @@ exports.CfnRealtimeLogConfigPropsMixin = CfnRealtimeLogConfigPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-responseheaderspolicy.html
  */
-class CfnResponseHeadersPolicyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnResponseHeadersPolicyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnResponseHeadersPolicyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnResponseHeadersPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["responseHeadersPolicyConfig"];
     props;
     strategy;
@@ -693,7 +830,7 @@ class CfnResponseHeadersPolicyPropsMixin extends core.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
@@ -706,12 +843,7 @@ class CfnResponseHeadersPolicyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResponseHeadersPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResponseHeadersPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResponseHeadersPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -726,8 +858,8 @@ exports.CfnResponseHeadersPolicyPropsMixin = CfnResponseHeadersPolicyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-streamingdistribution.html
  */
-class CfnStreamingDistributionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnStreamingDistributionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnStreamingDistributionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnStreamingDistributionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["streamingDistributionConfig", "tags"];
     props;
     strategy;
@@ -750,7 +882,7 @@ class CfnStreamingDistributionPropsMixin extends core.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
@@ -763,12 +895,7 @@ class CfnStreamingDistributionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnStreamingDistributionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnStreamingDistributionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnStreamingDistributionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -783,9 +910,9 @@ exports.CfnStreamingDistributionPropsMixin = CfnStreamingDistributionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-anycastiplist.html
  */
-class CfnAnycastIpListPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnAnycastIpListPropsMixin", version: "2.240.0-alpha.0" };
-    static CFN_PROPERTY_KEYS = ["ipAddressType", "ipamCidrConfigs", "ipCount", "name"];
+class CfnAnycastIpListPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnAnycastIpListPropsMixin", version: "2.242.0-alpha.0" };
+    static CFN_PROPERTY_KEYS = ["ipAddressType", "ipamCidrConfigs", "ipCount", "name", "tags"];
     props;
     strategy;
     /**
@@ -807,7 +934,7 @@ class CfnAnycastIpListPropsMixin extends core.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
@@ -820,12 +947,7 @@ class CfnAnycastIpListPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAnycastIpListPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAnycastIpListPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAnycastIpListPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -838,8 +960,8 @@ exports.CfnAnycastIpListPropsMixin = CfnAnycastIpListPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-connectionfunction.html
  */
-class CfnConnectionFunctionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnConnectionFunctionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnConnectionFunctionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnConnectionFunctionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["autoPublish", "connectionFunctionCode", "connectionFunctionConfig", "name", "tags"];
     props;
     strategy;
@@ -862,7 +984,7 @@ class CfnConnectionFunctionPropsMixin extends core.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
@@ -875,12 +997,7 @@ class CfnConnectionFunctionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnConnectionFunctionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnConnectionFunctionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnConnectionFunctionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -895,8 +1012,8 @@ exports.CfnConnectionFunctionPropsMixin = CfnConnectionFunctionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-connectiongroup.html
  */
-class CfnConnectionGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnConnectionGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnConnectionGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnConnectionGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["anycastIpListId", "enabled", "ipv6Enabled", "name", "tags"];
     props;
     strategy;
@@ -919,7 +1036,7 @@ class CfnConnectionGroupPropsMixin extends core.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
@@ -932,12 +1049,7 @@ class CfnConnectionGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnConnectionGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnConnectionGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnConnectionGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -950,8 +1062,8 @@ exports.CfnConnectionGroupPropsMixin = CfnConnectionGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distributiontenant.html
  */
-class CfnDistributionTenantPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnDistributionTenantPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDistributionTenantPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnDistributionTenantPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["connectionGroupId", "customizations", "distributionId", "domains", "enabled", "managedCertificateRequest", "name", "parameters", "tags"];
     props;
     strategy;
@@ -974,7 +1086,7 @@ class CfnDistributionTenantPropsMixin extends core.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
@@ -987,12 +1099,7 @@ class CfnDistributionTenantPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDistributionTenantPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDistributionTenantPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDistributionTenantPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1007,8 +1114,8 @@ exports.CfnDistributionTenantPropsMixin = CfnDistributionTenantPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-keyvaluestore.html
  */
-class CfnKeyValueStorePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnKeyValueStorePropsMixin", version: "2.240.0-alpha.0" };
+class CfnKeyValueStorePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnKeyValueStorePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["comment", "importSource", "name", "tags"];
     props;
     strategy;
@@ -1031,7 +1138,7 @@ class CfnKeyValueStorePropsMixin extends core.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
@@ -1044,12 +1151,7 @@ class CfnKeyValueStorePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnKeyValueStorePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnKeyValueStorePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnKeyValueStorePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1062,8 +1164,8 @@ exports.CfnKeyValueStorePropsMixin = CfnKeyValueStorePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-truststore.html
  */
-class CfnTrustStorePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnTrustStorePropsMixin", version: "2.240.0-alpha.0" };
+class CfnTrustStorePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnTrustStorePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["caCertificatesBundleSource", "name", "tags"];
     props;
     strategy;
@@ -1086,7 +1188,7 @@ class CfnTrustStorePropsMixin extends core.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
@@ -1099,12 +1201,7 @@ class CfnTrustStorePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTrustStorePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTrustStorePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTrustStorePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1117,8 +1214,8 @@ exports.CfnTrustStorePropsMixin = CfnTrustStorePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-vpcorigin.html
  */
-class CfnVpcOriginPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnVpcOriginPropsMixin", version: "2.240.0-alpha.0" };
+class CfnVpcOriginPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudfront.mixins.CfnVpcOriginPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["tags", "vpcOriginEndpointConfig"];
     props;
     strategy;
@@ -1141,7 +1238,7 @@ class CfnVpcOriginPropsMixin extends core.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
@@ -1154,12 +1251,7 @@ class CfnVpcOriginPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVpcOriginPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVpcOriginPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVpcOriginPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }