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

package/lib/services/aws-logs/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-logs");
 /**
  * Creates or updates an account-level data protection policy or subscription filter policy that applies to all log groups or a subset of log groups in the account.
@@ -72,8 +70,8 @@ const service = require("aws-cdk-lib/aws-logs");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-accountpolicy.html
  */
-class CfnAccountPolicyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnAccountPolicyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAccountPolicyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnAccountPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["policyDocument", "policyName", "policyType", "scope", "selectionCriteria"];
     props;
     strategy;
@@ -96,7 +94,7 @@ class CfnAccountPolicyPropsMixin 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
@@ -109,12 +107,7 @@ class CfnAccountPolicyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccountPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccountPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccountPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -129,8 +122,8 @@ exports.CfnAccountPolicyPropsMixin = CfnAccountPolicyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html
  */
-class CfnDestinationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnDestinationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDestinationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnDestinationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["destinationName", "destinationPolicy", "roleArn", "tags", "targetArn"];
     props;
     strategy;
@@ -152,8 +145,11 @@ class CfnDestinationPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDestinationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -166,16 +162,20 @@ class CfnDestinationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDestinationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDestinationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDestinationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDestinationPropsMixin = CfnDestinationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDestinationMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    if ((props.targetArn !== undefined))
+        ret.targetArn = cdk.getRefProperty(props.targetArn?.deliveryStreamRef, 'deliveryStreamArn') ?? cdk.getRefProperty(props.targetArn?.streamRef, 'streamArn') ?? cdk.getRefProperty(props.targetArn?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.targetArn, "targetArn", "kinesisfirehose.IDeliveryStreamRef | kinesis.IStreamRef | lambda.IFunctionRef | string");
+    return ret;
+}
 /**
  * The `AWS::Logs::LogGroup` resource specifies a log group.
  *
@@ -192,8 +192,8 @@ exports.CfnDestinationPropsMixin = CfnDestinationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html
  */
-class CfnLogGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnLogGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnLogGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnLogGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dataProtectionPolicy", "deletionProtectionEnabled", "fieldIndexPolicies", "kmsKeyId", "logGroupClass", "logGroupName", "resourcePolicyDocument", "retentionInDays", "tags"];
     props;
     strategy;
@@ -215,8 +215,11 @@ class CfnLogGroupPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnLogGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -229,16 +232,20 @@ class CfnLogGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLogGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLogGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLogGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnLogGroupPropsMixin = CfnLogGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnLogGroupMixinProps(props) {
+    const ret = {};
+    if ((props.kmsKeyId !== undefined))
+        ret.kmsKeyId = cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyArn') ?? cdk.ensureStringOrUndefined(props.kmsKeyId, "kmsKeyId", "kms.IKeyRef | string");
+    if ((props.logGroupName !== undefined))
+        ret.logGroupName = cdk.getRefProperty(props.logGroupName?.functionRef, 'functionName') ?? cdk.ensureStringOrUndefined(props.logGroupName, "logGroupName", "lambda.IFunctionRef | string");
+    return ret;
+}
 /**
  * The `AWS::Logs::LogStream` resource specifies an Amazon CloudWatch Logs log stream in a specific log group.
  *
@@ -257,8 +264,8 @@ exports.CfnLogGroupPropsMixin = CfnLogGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-logstream.html
  */
-class CfnLogStreamPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnLogStreamPropsMixin", version: "2.240.0-alpha.0" };
+class CfnLogStreamPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnLogStreamPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["logGroupName", "logStreamName"];
     props;
     strategy;
@@ -280,8 +287,11 @@ class CfnLogStreamPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnLogStreamMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -294,16 +304,18 @@ class CfnLogStreamPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLogStreamPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLogStreamPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLogStreamPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnLogStreamPropsMixin = CfnLogStreamPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnLogStreamMixinProps(props) {
+    const ret = {};
+    if ((props.logGroupName !== undefined))
+        ret.logGroupName = cdk.getRefProperty(props.logGroupName?.logGroupRef, 'logGroupName') ?? cdk.ensureStringOrUndefined(props.logGroupName, "logGroupName", "logs.ILogGroupRef | string");
+    return ret;
+}
 /**
  * The `AWS::Logs::MetricFilter` resource specifies a metric filter that describes how CloudWatch Logs extracts information from logs and transforms it into Amazon CloudWatch metrics.
  *
@@ -316,8 +328,8 @@ exports.CfnLogStreamPropsMixin = CfnLogStreamPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html
  */
-class CfnMetricFilterPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnMetricFilterPropsMixin", version: "2.240.0-alpha.0" };
+class CfnMetricFilterPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnMetricFilterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["applyOnTransformedLogs", "emitSystemFieldDimensions", "fieldSelectionCriteria", "filterName", "filterPattern", "logGroupName", "metricTransformations"];
     props;
     strategy;
@@ -339,8 +351,11 @@ class CfnMetricFilterPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnMetricFilterMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -353,16 +368,18 @@ class CfnMetricFilterPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMetricFilterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMetricFilterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMetricFilterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnMetricFilterPropsMixin = CfnMetricFilterPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnMetricFilterMixinProps(props) {
+    const ret = {};
+    if ((props.logGroupName !== undefined))
+        ret.logGroupName = cdk.getRefProperty(props.logGroupName?.logGroupRef, 'logGroupName') ?? cdk.ensureStringOrUndefined(props.logGroupName, "logGroupName", "logs.ILogGroupRef | string");
+    return ret;
+}
 /**
  * Creates a query definition for CloudWatch Logs Insights.
  *
@@ -373,8 +390,8 @@ exports.CfnMetricFilterPropsMixin = CfnMetricFilterPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-querydefinition.html
  */
-class CfnQueryDefinitionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnQueryDefinitionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnQueryDefinitionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnQueryDefinitionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["logGroupNames", "name", "queryLanguage", "queryString"];
     props;
     strategy;
@@ -396,8 +413,11 @@ class CfnQueryDefinitionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnQueryDefinitionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -410,16 +430,18 @@ class CfnQueryDefinitionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnQueryDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnQueryDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnQueryDefinitionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnQueryDefinitionPropsMixin = CfnQueryDefinitionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnQueryDefinitionMixinProps(props) {
+    const ret = {};
+    if ((props.logGroupNames !== undefined))
+        ret.logGroupNames = cdk.mapArrayInPlace(props.logGroupNames, (item) => cdk.getRefProperty(item?.logGroupRef, 'logGroupName') ?? cdk.ensureStringOrUndefined(item, "logGroupNames", "logs.ILogGroupRef | string"));
+    return ret;
+}
 /**
  * Creates or updates a resource policy that allows other AWS services to put log events to this account.
  *
@@ -430,8 +452,8 @@ exports.CfnQueryDefinitionPropsMixin = CfnQueryDefinitionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-resourcepolicy.html
  */
-class CfnResourcePolicyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnResourcePolicyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnResourcePolicyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnResourcePolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["policyDocument", "policyName"];
     props;
     strategy;
@@ -454,7 +476,7 @@ class CfnResourcePolicyPropsMixin 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
@@ -467,12 +489,7 @@ class CfnResourcePolicyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourcePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourcePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourcePolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -494,8 +511,8 @@ exports.CfnResourcePolicyPropsMixin = CfnResourcePolicyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html
  */
-class CfnSubscriptionFilterPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnSubscriptionFilterPropsMixin", version: "2.240.0-alpha.0" };
+class CfnSubscriptionFilterPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnSubscriptionFilterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["applyOnTransformedLogs", "destinationArn", "distribution", "emitSystemFields", "fieldSelectionCriteria", "filterName", "filterPattern", "logGroupName", "roleArn"];
     props;
     strategy;
@@ -517,8 +534,11 @@ class CfnSubscriptionFilterPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSubscriptionFilterMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -531,16 +551,22 @@ class CfnSubscriptionFilterPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSubscriptionFilterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSubscriptionFilterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSubscriptionFilterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSubscriptionFilterPropsMixin = CfnSubscriptionFilterPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSubscriptionFilterMixinProps(props) {
+    const ret = {};
+    if ((props.destinationArn !== undefined))
+        ret.destinationArn = cdk.getRefProperty(props.destinationArn?.functionRef, 'functionArn') ?? cdk.getRefProperty(props.destinationArn?.streamRef, 'streamArn') ?? cdk.getRefProperty(props.destinationArn?.deliveryStreamRef, 'deliveryStreamArn') ?? cdk.ensureStringOrUndefined(props.destinationArn, "destinationArn", "lambda.IFunctionRef | kinesis.IStreamRef | kinesisfirehose.IDeliveryStreamRef | string");
+    if ((props.logGroupName !== undefined))
+        ret.logGroupName = cdk.getRefProperty(props.logGroupName?.logGroupRef, 'logGroupName') ?? cdk.ensureStringOrUndefined(props.logGroupName, "logGroupName", "logs.ILogGroupRef | string");
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * This structure contains information about one *delivery* in your account.
  *
@@ -555,8 +581,8 @@ exports.CfnSubscriptionFilterPropsMixin = CfnSubscriptionFilterPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-delivery.html
  */
-class CfnDeliveryPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnDeliveryPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDeliveryPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnDeliveryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deliveryDestinationArn", "deliverySourceName", "fieldDelimiter", "recordFields", "s3EnableHiveCompatiblePath", "s3SuffixPath", "tags"];
     props;
     strategy;
@@ -579,7 +605,7 @@ class CfnDeliveryPropsMixin 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
@@ -592,12 +618,7 @@ class CfnDeliveryPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDeliveryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDeliveryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDeliveryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -621,8 +642,8 @@ exports.CfnDeliveryPropsMixin = CfnDeliveryPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-deliverydestination.html
  */
-class CfnDeliveryDestinationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnDeliveryDestinationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDeliveryDestinationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnDeliveryDestinationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deliveryDestinationPolicy", "deliveryDestinationType", "destinationResourceArn", "name", "outputFormat", "tags"];
     props;
     strategy;
@@ -645,7 +666,7 @@ class CfnDeliveryDestinationPropsMixin 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
@@ -658,12 +679,7 @@ class CfnDeliveryDestinationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDeliveryDestinationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDeliveryDestinationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDeliveryDestinationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -688,8 +704,8 @@ exports.CfnDeliveryDestinationPropsMixin = CfnDeliveryDestinationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-deliverysource.html
  */
-class CfnDeliverySourcePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnDeliverySourcePropsMixin", version: "2.240.0-alpha.0" };
+class CfnDeliverySourcePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnDeliverySourcePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["logType", "name", "resourceArn", "tags"];
     props;
     strategy;
@@ -712,7 +728,7 @@ class CfnDeliverySourcePropsMixin 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
@@ -725,12 +741,7 @@ class CfnDeliverySourcePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDeliverySourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDeliverySourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDeliverySourcePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -749,8 +760,8 @@ exports.CfnDeliverySourcePropsMixin = CfnDeliverySourcePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-integration.html
  */
-class CfnIntegrationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnIntegrationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnIntegrationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnIntegrationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["integrationName", "integrationType", "resourceConfig"];
     props;
     strategy;
@@ -773,7 +784,7 @@ class CfnIntegrationPropsMixin 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
@@ -786,12 +797,7 @@ class CfnIntegrationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIntegrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIntegrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIntegrationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -812,8 +818,8 @@ exports.CfnIntegrationPropsMixin = CfnIntegrationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loganomalydetector.html
  */
-class CfnLogAnomalyDetectorPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnLogAnomalyDetectorPropsMixin", version: "2.240.0-alpha.0" };
+class CfnLogAnomalyDetectorPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnLogAnomalyDetectorPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accountId", "anomalyVisibilityTime", "detectorName", "evaluationFrequency", "filterPattern", "kmsKeyId", "logGroupArnList"];
     props;
     strategy;
@@ -836,7 +842,7 @@ class CfnLogAnomalyDetectorPropsMixin 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
@@ -849,12 +855,7 @@ class CfnLogAnomalyDetectorPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLogAnomalyDetectorPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLogAnomalyDetectorPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLogAnomalyDetectorPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -867,8 +868,8 @@ exports.CfnLogAnomalyDetectorPropsMixin = CfnLogAnomalyDetectorPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-scheduledquery.html
  */
-class CfnScheduledQueryPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnScheduledQueryPropsMixin", version: "2.240.0-alpha.0" };
+class CfnScheduledQueryPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnScheduledQueryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "destinationConfiguration", "executionRoleArn", "logGroupIdentifiers", "name", "queryLanguage", "queryString", "scheduleEndTime", "scheduleExpression", "scheduleStartTime", "startTimeOffset", "state", "tags", "timezone"];
     props;
     strategy;
@@ -891,7 +892,7 @@ class CfnScheduledQueryPropsMixin 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
@@ -904,12 +905,7 @@ class CfnScheduledQueryPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnScheduledQueryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnScheduledQueryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnScheduledQueryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -936,8 +932,8 @@ exports.CfnScheduledQueryPropsMixin = CfnScheduledQueryPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-transformer.html
  */
-class CfnTransformerPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnTransformerPropsMixin", version: "2.240.0-alpha.0" };
+class CfnTransformerPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_logs.mixins.CfnTransformerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["logGroupIdentifier", "transformerConfig"];
     props;
     strategy;
@@ -960,7 +956,7 @@ class CfnTransformerPropsMixin 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
@@ -973,12 +969,7 @@ class CfnTransformerPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTransformerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTransformerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTransformerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }