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

package/lib/services/aws-iot/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-iot");
 /**
  * Use the `AWS::IoT::AccountAuditConfiguration` resource to configure or reconfigure the Device Defender audit settings for your account.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-iot");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-accountauditconfiguration.html
  */
-class CfnAccountAuditConfigurationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnAccountAuditConfigurationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAccountAuditConfigurationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnAccountAuditConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accountId", "auditCheckConfigurations", "auditNotificationTargetConfigurations", "roleArn"];
     props;
     strategy;
@@ -43,7 +41,7 @@ class CfnAccountAuditConfigurationPropsMixin 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
@@ -56,12 +54,7 @@ class CfnAccountAuditConfigurationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccountAuditConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccountAuditConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccountAuditConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -74,8 +67,8 @@ exports.CfnAccountAuditConfigurationPropsMixin = CfnAccountAuditConfigurationPro
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-authorizer.html
  */
-class CfnAuthorizerPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnAuthorizerPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAuthorizerPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnAuthorizerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["authorizerFunctionArn", "authorizerName", "enableCachingForHttp", "signingDisabled", "status", "tags", "tokenKeyName", "tokenSigningPublicKeys"];
     props;
     strategy;
@@ -98,7 +91,7 @@ class CfnAuthorizerPropsMixin 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
@@ -111,12 +104,7 @@ class CfnAuthorizerPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAuthorizerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAuthorizerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAuthorizerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -131,8 +119,8 @@ exports.CfnAuthorizerPropsMixin = CfnAuthorizerPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-billinggroup.html
  */
-class CfnBillingGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnBillingGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnBillingGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnBillingGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["billingGroupName", "billingGroupProperties", "tags"];
     props;
     strategy;
@@ -155,7 +143,7 @@ class CfnBillingGroupPropsMixin 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
@@ -168,12 +156,7 @@ class CfnBillingGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnBillingGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnBillingGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnBillingGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -186,8 +169,8 @@ exports.CfnBillingGroupPropsMixin = CfnBillingGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-cacertificate.html
  */
-class CfnCACertificatePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnCACertificatePropsMixin", version: "2.240.0-alpha.0" };
+class CfnCACertificatePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnCACertificatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["autoRegistrationStatus", "caCertificatePem", "certificateMode", "registrationConfig", "removeAutoRegistration", "status", "tags", "verificationCertificatePem"];
     props;
     strategy;
@@ -210,7 +193,7 @@ class CfnCACertificatePropsMixin 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
@@ -223,12 +206,7 @@ class CfnCACertificatePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCACertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCACertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCACertificatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -241,8 +219,8 @@ exports.CfnCACertificatePropsMixin = CfnCACertificatePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html
  */
-class CfnCertificatePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnCertificatePropsMixin", version: "2.240.0-alpha.0" };
+class CfnCertificatePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnCertificatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["caCertificatePem", "certificateMode", "certificatePem", "certificateSigningRequest", "status"];
     props;
     strategy;
@@ -265,7 +243,7 @@ class CfnCertificatePropsMixin 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
@@ -278,12 +256,7 @@ class CfnCertificatePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCertificatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -298,8 +271,8 @@ exports.CfnCertificatePropsMixin = CfnCertificatePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-custommetric.html
  */
-class CfnCustomMetricPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnCustomMetricPropsMixin", version: "2.240.0-alpha.0" };
+class CfnCustomMetricPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnCustomMetricPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["displayName", "metricName", "metricType", "tags"];
     props;
     strategy;
@@ -322,7 +295,7 @@ class CfnCustomMetricPropsMixin 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
@@ -335,12 +308,7 @@ class CfnCustomMetricPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCustomMetricPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCustomMetricPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCustomMetricPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -355,8 +323,8 @@ exports.CfnCustomMetricPropsMixin = CfnCustomMetricPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-dimension.html
  */
-class CfnDimensionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnDimensionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDimensionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnDimensionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["name", "stringValues", "tags", "type"];
     props;
     strategy;
@@ -379,7 +347,7 @@ class CfnDimensionPropsMixin 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
@@ -392,12 +360,7 @@ class CfnDimensionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDimensionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDimensionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDimensionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -410,8 +373,8 @@ exports.CfnDimensionPropsMixin = CfnDimensionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html
  */
-class CfnDomainConfigurationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnDomainConfigurationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDomainConfigurationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnDomainConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["applicationProtocol", "authenticationType", "authorizerConfig", "clientCertificateConfig", "domainConfigurationName", "domainConfigurationStatus", "domainName", "serverCertificateArns", "serverCertificateConfig", "serviceType", "tags", "tlsConfig", "validationCertificateArn"];
     props;
     strategy;
@@ -434,7 +397,7 @@ class CfnDomainConfigurationPropsMixin 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
@@ -447,12 +410,7 @@ class CfnDomainConfigurationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDomainConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDomainConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDomainConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -465,8 +423,8 @@ exports.CfnDomainConfigurationPropsMixin = CfnDomainConfigurationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html
  */
-class CfnFleetMetricPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnFleetMetricPropsMixin", version: "2.240.0-alpha.0" };
+class CfnFleetMetricPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnFleetMetricPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["aggregationField", "aggregationType", "description", "indexName", "metricName", "period", "queryString", "queryVersion", "tags", "unit"];
     props;
     strategy;
@@ -489,7 +447,7 @@ class CfnFleetMetricPropsMixin 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
@@ -502,12 +460,7 @@ class CfnFleetMetricPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFleetMetricPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFleetMetricPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFleetMetricPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -520,8 +473,8 @@ exports.CfnFleetMetricPropsMixin = CfnFleetMetricPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html
  */
-class CfnJobTemplatePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnJobTemplatePropsMixin", version: "2.240.0-alpha.0" };
+class CfnJobTemplatePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnJobTemplatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["abortConfig", "description", "destinationPackageVersions", "document", "documentSource", "jobArn", "jobExecutionsRetryConfig", "jobExecutionsRolloutConfig", "jobTemplateId", "maintenanceWindows", "presignedUrlConfig", "tags", "timeoutConfig"];
     props;
     strategy;
@@ -544,7 +497,7 @@ class CfnJobTemplatePropsMixin 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
@@ -557,12 +510,7 @@ class CfnJobTemplatePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnJobTemplatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnJobTemplatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnJobTemplatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -580,8 +528,8 @@ exports.CfnJobTemplatePropsMixin = CfnJobTemplatePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-logging.html
  */
-class CfnLoggingPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnLoggingPropsMixin", version: "2.240.0-alpha.0" };
+class CfnLoggingPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnLoggingPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accountId", "defaultLogLevel", "eventConfigurations", "roleArn"];
     props;
     strategy;
@@ -603,8 +551,11 @@ class CfnLoggingPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnLoggingMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -617,16 +568,18 @@ class CfnLoggingPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLoggingPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLoggingPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLoggingPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnLoggingPropsMixin = CfnLoggingPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnLoggingMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * Defines an action that can be applied to audit findings by using StartAuditMitigationActionsTask.
  *
@@ -637,8 +590,8 @@ exports.CfnLoggingPropsMixin = CfnLoggingPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-mitigationaction.html
  */
-class CfnMitigationActionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnMitigationActionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnMitigationActionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnMitigationActionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["actionName", "actionParams", "roleArn", "tags"];
     props;
     strategy;
@@ -661,7 +614,7 @@ class CfnMitigationActionPropsMixin 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
@@ -674,12 +627,7 @@ class CfnMitigationActionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMitigationActionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMitigationActionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMitigationActionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -694,8 +642,8 @@ exports.CfnMitigationActionPropsMixin = CfnMitigationActionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policy.html
  */
-class CfnPolicyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnPolicyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnPolicyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["policyDocument", "policyName", "tags"];
     props;
     strategy;
@@ -718,7 +666,7 @@ class CfnPolicyPropsMixin 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
@@ -731,12 +679,7 @@ class CfnPolicyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -751,8 +694,8 @@ exports.CfnPolicyPropsMixin = CfnPolicyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policyprincipalattachment.html
  */
-class CfnPolicyPrincipalAttachmentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnPolicyPrincipalAttachmentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnPolicyPrincipalAttachmentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnPolicyPrincipalAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["policyName", "principal"];
     props;
     strategy;
@@ -775,7 +718,7 @@ class CfnPolicyPrincipalAttachmentPropsMixin 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
@@ -788,12 +731,7 @@ class CfnPolicyPrincipalAttachmentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPolicyPrincipalAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPolicyPrincipalAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPolicyPrincipalAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -806,8 +744,8 @@ exports.CfnPolicyPrincipalAttachmentPropsMixin = CfnPolicyPrincipalAttachmentPro
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html
  */
-class CfnProvisioningTemplatePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnProvisioningTemplatePropsMixin", version: "2.240.0-alpha.0" };
+class CfnProvisioningTemplatePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnProvisioningTemplatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "enabled", "preProvisioningHook", "provisioningRoleArn", "tags", "templateBody", "templateName", "templateType"];
     props;
     strategy;
@@ -829,8 +767,11 @@ class CfnProvisioningTemplatePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnProvisioningTemplateMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -843,16 +784,29 @@ class CfnProvisioningTemplatePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnProvisioningTemplatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnProvisioningTemplatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnProvisioningTemplatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnProvisioningTemplatePropsMixin = CfnProvisioningTemplatePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnProvisioningTemplatePropsMixinProvisioningHookProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        payloadVersion: (!props.payloadVersion ? undefined : props.payloadVersion),
+        targetArn: (!props.targetArn ? undefined : cdk.getRefProperty(props.targetArn?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.targetArn, "targetArn", "lambda.IFunctionRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnProvisioningTemplateMixinProps(props) {
+    const ret = {};
+    if ((props.preProvisioningHook !== undefined))
+        ret.preProvisioningHook = flattenCfnProvisioningTemplatePropsMixinProvisioningHookProperty(props.preProvisioningHook);
+    if ((props.provisioningRoleArn !== undefined))
+        ret.provisioningRoleArn = cdk.getRefProperty(props.provisioningRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.provisioningRoleArn, "provisioningRoleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * Configure resource-specific logging.
  *
@@ -861,8 +815,8 @@ exports.CfnProvisioningTemplatePropsMixin = CfnProvisioningTemplatePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-resourcespecificlogging.html
  */
-class CfnResourceSpecificLoggingPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnResourceSpecificLoggingPropsMixin", version: "2.240.0-alpha.0" };
+class CfnResourceSpecificLoggingPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnResourceSpecificLoggingPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["logLevel", "targetName", "targetType"];
     props;
     strategy;
@@ -885,7 +839,7 @@ class CfnResourceSpecificLoggingPropsMixin 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
@@ -898,12 +852,7 @@ class CfnResourceSpecificLoggingPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourceSpecificLoggingPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourceSpecificLoggingPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourceSpecificLoggingPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -918,8 +867,8 @@ exports.CfnResourceSpecificLoggingPropsMixin = CfnResourceSpecificLoggingPropsMi
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-rolealias.html
  */
-class CfnRoleAliasPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnRoleAliasPropsMixin", version: "2.240.0-alpha.0" };
+class CfnRoleAliasPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnRoleAliasPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["credentialDurationSeconds", "roleAlias", "roleArn", "tags"];
     props;
     strategy;
@@ -941,8 +890,11 @@ class CfnRoleAliasPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRoleAliasMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -955,16 +907,18 @@ class CfnRoleAliasPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRoleAliasPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRoleAliasPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRoleAliasPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnRoleAliasPropsMixin = CfnRoleAliasPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRoleAliasMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * Use the `AWS::IoT::ScheduledAudit` resource to create a scheduled audit that is run at a specified time interval.
  *
@@ -975,8 +929,8 @@ exports.CfnRoleAliasPropsMixin = CfnRoleAliasPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-scheduledaudit.html
  */
-class CfnScheduledAuditPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnScheduledAuditPropsMixin", version: "2.240.0-alpha.0" };
+class CfnScheduledAuditPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnScheduledAuditPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dayOfMonth", "dayOfWeek", "frequency", "scheduledAuditName", "tags", "targetCheckNames"];
     props;
     strategy;
@@ -999,7 +953,7 @@ class CfnScheduledAuditPropsMixin 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
@@ -1012,12 +966,7 @@ class CfnScheduledAuditPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnScheduledAuditPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnScheduledAuditPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnScheduledAuditPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1032,8 +981,8 @@ exports.CfnScheduledAuditPropsMixin = CfnScheduledAuditPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-securityprofile.html
  */
-class CfnSecurityProfilePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnSecurityProfilePropsMixin", version: "2.240.0-alpha.0" };
+class CfnSecurityProfilePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnSecurityProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["additionalMetricsToRetainV2", "alertTargets", "behaviors", "metricsExportConfig", "securityProfileDescription", "securityProfileName", "tags", "targetArns"];
     props;
     strategy;
@@ -1056,7 +1005,7 @@ class CfnSecurityProfilePropsMixin 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
@@ -1069,12 +1018,7 @@ class CfnSecurityProfilePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSecurityProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSecurityProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSecurityProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1089,8 +1033,8 @@ exports.CfnSecurityProfilePropsMixin = CfnSecurityProfilePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-softwarepackage.html
  */
-class CfnSoftwarePackagePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnSoftwarePackagePropsMixin", version: "2.240.0-alpha.0" };
+class CfnSoftwarePackagePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnSoftwarePackagePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "packageName", "tags"];
     props;
     strategy;
@@ -1113,7 +1057,7 @@ class CfnSoftwarePackagePropsMixin 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
@@ -1126,12 +1070,7 @@ class CfnSoftwarePackagePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSoftwarePackagePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSoftwarePackagePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSoftwarePackagePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1150,8 +1089,8 @@ exports.CfnSoftwarePackagePropsMixin = CfnSoftwarePackagePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-softwarepackageversion.html
  */
-class CfnSoftwarePackageVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnSoftwarePackageVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnSoftwarePackageVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnSoftwarePackageVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["artifact", "attributes", "description", "packageName", "recipe", "sbom", "tags", "versionName"];
     props;
     strategy;
@@ -1174,7 +1113,7 @@ class CfnSoftwarePackageVersionPropsMixin 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
@@ -1187,12 +1126,7 @@ class CfnSoftwarePackageVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSoftwarePackageVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSoftwarePackageVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSoftwarePackageVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1207,8 +1141,8 @@ exports.CfnSoftwarePackageVersionPropsMixin = CfnSoftwarePackageVersionPropsMixi
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thing.html
  */
-class CfnThingPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnThingPropsMixin", version: "2.240.0-alpha.0" };
+class CfnThingPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnThingPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["attributePayload", "thingName"];
     props;
     strategy;
@@ -1231,7 +1165,7 @@ class CfnThingPropsMixin 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
@@ -1244,12 +1178,7 @@ class CfnThingPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnThingPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnThingPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnThingPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1268,8 +1197,8 @@ exports.CfnThingPropsMixin = CfnThingPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thinggroup.html
  */
-class CfnThingGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnThingGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnThingGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnThingGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["parentGroupName", "queryString", "tags", "thingGroupName", "thingGroupProperties"];
     props;
     strategy;
@@ -1292,7 +1221,7 @@ class CfnThingGroupPropsMixin 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
@@ -1305,12 +1234,7 @@ class CfnThingGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnThingGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnThingGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnThingGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1325,8 +1249,8 @@ exports.CfnThingGroupPropsMixin = CfnThingGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thingprincipalattachment.html
  */
-class CfnThingPrincipalAttachmentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnThingPrincipalAttachmentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnThingPrincipalAttachmentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnThingPrincipalAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["principal", "thingName", "thingPrincipalType"];
     props;
     strategy;
@@ -1349,7 +1273,7 @@ class CfnThingPrincipalAttachmentPropsMixin 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
@@ -1362,12 +1286,7 @@ class CfnThingPrincipalAttachmentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnThingPrincipalAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnThingPrincipalAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnThingPrincipalAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1380,8 +1299,8 @@ exports.CfnThingPrincipalAttachmentPropsMixin = CfnThingPrincipalAttachmentProps
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thingtype.html
  */
-class CfnThingTypePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnThingTypePropsMixin", version: "2.240.0-alpha.0" };
+class CfnThingTypePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnThingTypePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deprecateThingType", "tags", "thingTypeName", "thingTypeProperties"];
     props;
     strategy;
@@ -1404,7 +1323,7 @@ class CfnThingTypePropsMixin 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
@@ -1417,12 +1336,7 @@ class CfnThingTypePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnThingTypePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnThingTypePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnThingTypePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1437,8 +1351,8 @@ exports.CfnThingTypePropsMixin = CfnThingTypePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicrule.html
  */
-class CfnTopicRulePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnTopicRulePropsMixin", version: "2.240.0-alpha.0" };
+class CfnTopicRulePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnTopicRulePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["ruleName", "tags", "topicRulePayload"];
     props;
     strategy;
@@ -1460,8 +1374,11 @@ class CfnTopicRulePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTopicRuleMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1474,16 +1391,159 @@ class CfnTopicRulePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTopicRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTopicRulePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTopicRulePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnTopicRulePropsMixin = CfnTopicRulePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinS3ActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketName: (!props.bucketName ? undefined : cdk.getRefProperty(props.bucketName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.bucketName, "bucketName", "s3.IBucketRef | string")),
+        cannedAcl: (!props.cannedAcl ? undefined : props.cannedAcl),
+        key: (!props.key ? undefined : props.key),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinIotEventsActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        batchMode: (!props.batchMode ? undefined : props.batchMode),
+        inputName: (!props.inputName ? undefined : cdk.getRefProperty(props.inputName?.inputRef, 'inputName') ?? cdk.ensureStringOrUndefined(props.inputName, "inputName", "iotevents.IInputRef | string")),
+        messageId: (!props.messageId ? undefined : props.messageId),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinFirehoseActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        batchMode: (!props.batchMode ? undefined : props.batchMode),
+        deliveryStreamName: (!props.deliveryStreamName ? undefined : cdk.getRefProperty(props.deliveryStreamName?.deliveryStreamRef, 'deliveryStreamName') ?? cdk.ensureStringOrUndefined(props.deliveryStreamName, "deliveryStreamName", "kinesisfirehose.IDeliveryStreamRef | string")),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string")),
+        separator: (!props.separator ? undefined : props.separator)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinRepublishActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        headers: (!props.headers ? undefined : props.headers),
+        qos: (!props.qos ? undefined : props.qos),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string")),
+        topic: (!props.topic ? undefined : props.topic)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinPutItemInputProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        tableName: (!props.tableName ? undefined : cdk.getRefProperty(props.tableName?.tableRef, 'tableName') ?? cdk.ensureStringOrUndefined(props.tableName, "tableName", "dynamodb.ITableRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinDynamoDBv2ActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        putItem: (!props.putItem ? undefined : (!props.putItem ? undefined : flattenCfnTopicRulePropsMixinPutItemInputProperty(props.putItem))),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinSqsActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        queueUrl: (!props.queueUrl ? undefined : cdk.getRefProperty(props.queueUrl?.queueRef, 'queueUrl') ?? cdk.ensureStringOrUndefined(props.queueUrl, "queueUrl", "sqs.IQueueRef | string")),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string")),
+        useBase64: (!props.useBase64 ? undefined : props.useBase64)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinIotAnalyticsActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        batchMode: (!props.batchMode ? undefined : props.batchMode),
+        channelName: (!props.channelName ? undefined : props.channelName),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinSnsActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        messageFormat: (!props.messageFormat ? undefined : props.messageFormat),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string")),
+        targetArn: (!props.targetArn ? undefined : cdk.getRefProperty(props.targetArn?.topicRef, 'topicArn') ?? cdk.ensureStringOrUndefined(props.targetArn, "targetArn", "sns.ITopicRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinLambdaActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        functionArn: (!props.functionArn ? undefined : cdk.getRefProperty(props.functionArn?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.functionArn, "functionArn", "lambda.IFunctionRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinActionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        cloudwatchAlarm: (!props.cloudwatchAlarm ? undefined : props.cloudwatchAlarm),
+        cloudwatchLogs: (!props.cloudwatchLogs ? undefined : props.cloudwatchLogs),
+        cloudwatchMetric: (!props.cloudwatchMetric ? undefined : props.cloudwatchMetric),
+        dynamoDb: (!props.dynamoDb ? undefined : props.dynamoDb),
+        dynamoDBv2: (!props.dynamoDBv2 ? undefined : (!props.dynamoDBv2 ? undefined : flattenCfnTopicRulePropsMixinDynamoDBv2ActionProperty(props.dynamoDBv2))),
+        elasticsearch: (!props.elasticsearch ? undefined : props.elasticsearch),
+        firehose: (!props.firehose ? undefined : (!props.firehose ? undefined : flattenCfnTopicRulePropsMixinFirehoseActionProperty(props.firehose))),
+        http: (!props.http ? undefined : props.http),
+        iotAnalytics: (!props.iotAnalytics ? undefined : (!props.iotAnalytics ? undefined : flattenCfnTopicRulePropsMixinIotAnalyticsActionProperty(props.iotAnalytics))),
+        iotEvents: (!props.iotEvents ? undefined : (!props.iotEvents ? undefined : flattenCfnTopicRulePropsMixinIotEventsActionProperty(props.iotEvents))),
+        iotSiteWise: (!props.iotSiteWise ? undefined : props.iotSiteWise),
+        kafka: (!props.kafka ? undefined : props.kafka),
+        kinesis: (!props.kinesis ? undefined : props.kinesis),
+        lambda: (!props.lambda ? undefined : (!props.lambda ? undefined : flattenCfnTopicRulePropsMixinLambdaActionProperty(props.lambda))),
+        location: (!props.location ? undefined : props.location),
+        openSearch: (!props.openSearch ? undefined : props.openSearch),
+        republish: (!props.republish ? undefined : (!props.republish ? undefined : flattenCfnTopicRulePropsMixinRepublishActionProperty(props.republish))),
+        s3: (!props.s3 ? undefined : (!props.s3 ? undefined : flattenCfnTopicRulePropsMixinS3ActionProperty(props.s3))),
+        sns: (!props.sns ? undefined : (!props.sns ? undefined : flattenCfnTopicRulePropsMixinSnsActionProperty(props.sns))),
+        sqs: (!props.sqs ? undefined : (!props.sqs ? undefined : flattenCfnTopicRulePropsMixinSqsActionProperty(props.sqs))),
+        stepFunctions: (!props.stepFunctions ? undefined : props.stepFunctions),
+        timestream: (!props.timestream ? undefined : props.timestream)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRulePropsMixinTopicRulePayloadProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        actions: (!props.actions ? undefined : (cdk.isResolvableObject(props.actions) ? props.actions : cdk.mapArrayInPlace(props.actions, (item) => flattenCfnTopicRulePropsMixinActionProperty(item)))),
+        awsIotSqlVersion: (!props.awsIotSqlVersion ? undefined : props.awsIotSqlVersion),
+        description: (!props.description ? undefined : props.description),
+        errorAction: (!props.errorAction ? undefined : (!props.errorAction ? undefined : flattenCfnTopicRulePropsMixinActionProperty(props.errorAction))),
+        ruleDisabled: (!props.ruleDisabled ? undefined : props.ruleDisabled),
+        sql: (!props.sql ? undefined : props.sql)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnTopicRuleMixinProps(props) {
+    const ret = {};
+    if ((props.topicRulePayload !== undefined))
+        ret.topicRulePayload = flattenCfnTopicRulePropsMixinTopicRulePayloadProperty(props.topicRulePayload);
+    return ret;
+}
 /**
  * A topic rule destination.
  *
@@ -1492,8 +1552,8 @@ exports.CfnTopicRulePropsMixin = CfnTopicRulePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicruledestination.html
  */
-class CfnTopicRuleDestinationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnTopicRuleDestinationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnTopicRuleDestinationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnTopicRuleDestinationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["httpUrlProperties", "status", "vpcProperties"];
     props;
     strategy;
@@ -1516,7 +1576,7 @@ class CfnTopicRuleDestinationPropsMixin 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
@@ -1529,12 +1589,7 @@ class CfnTopicRuleDestinationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTopicRuleDestinationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTopicRuleDestinationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTopicRuleDestinationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1549,8 +1604,8 @@ exports.CfnTopicRuleDestinationPropsMixin = CfnTopicRuleDestinationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificateprovider.html
  */
-class CfnCertificateProviderPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnCertificateProviderPropsMixin", version: "2.240.0-alpha.0" };
+class CfnCertificateProviderPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnCertificateProviderPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accountDefaultForOperations", "certificateProviderName", "lambdaFunctionArn", "tags"];
     props;
     strategy;
@@ -1573,7 +1628,7 @@ class CfnCertificateProviderPropsMixin 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
@@ -1586,12 +1641,7 @@ class CfnCertificateProviderPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCertificateProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCertificateProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCertificateProviderPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1604,8 +1654,8 @@ exports.CfnCertificateProviderPropsMixin = CfnCertificateProviderPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-command.html
  */
-class CfnCommandPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnCommandPropsMixin", version: "2.240.0-alpha.0" };
+class CfnCommandPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnCommandPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["commandId", "createdAt", "deprecated", "description", "displayName", "lastUpdatedAt", "mandatoryParameters", "namespace", "payload", "payloadTemplate", "pendingDeletion", "preprocessor", "roleArn", "tags"];
     props;
     strategy;
@@ -1628,7 +1678,7 @@ class CfnCommandPropsMixin 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
@@ -1641,12 +1691,7 @@ class CfnCommandPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCommandPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCommandPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCommandPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1661,8 +1706,8 @@ exports.CfnCommandPropsMixin = CfnCommandPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-encryptionconfiguration.html
  */
-class CfnEncryptionConfigurationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnEncryptionConfigurationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnEncryptionConfigurationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iot.mixins.CfnEncryptionConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["encryptionType", "kmsAccessRoleArn", "kmsKeyArn"];
     props;
     strategy;
@@ -1685,7 +1730,7 @@ class CfnEncryptionConfigurationPropsMixin 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
@@ -1698,12 +1743,7 @@ class CfnEncryptionConfigurationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEncryptionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEncryptionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEncryptionConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }