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

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

@@ -6,7 +6,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-dms");
 /**
  * The `AWS::DMS::Certificate` resource creates an Secure Sockets Layer (SSL) certificate that encrypts connections between AWS DMS endpoints and the replication instance.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-dms");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html
  */
 class CfnCertificatePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnCertificatePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnCertificatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificateIdentifier", "certificatePem", "certificateWallet"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnCertificatePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -53,12 +52,7 @@ class CfnCertificatePropsMixin extends cdk.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);
         }
     }
 }
@@ -74,7 +68,7 @@ exports.CfnCertificatePropsMixin = CfnCertificatePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html
  */
 class CfnEndpointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnEndpointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificateArn", "databaseName", "docDbSettings", "dynamoDbSettings", "elasticsearchSettings", "endpointIdentifier", "endpointType", "engineName", "extraConnectionAttributes", "gcpMySqlSettings", "ibmDb2Settings", "kafkaSettings", "kinesisSettings", "kmsKeyId", "microsoftSqlServerSettings", "mongoDbSettings", "mySqlSettings", "neptuneSettings", "oracleSettings", "password", "port", "postgreSqlSettings", "redisSettings", "redshiftSettings", "resourceIdentifier", "s3Settings", "serverName", "sslMode", "sybaseSettings", "tags", "username"];
     props;
     strategy;
@@ -97,7 +91,7 @@ class CfnEndpointPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -110,12 +104,7 @@ class CfnEndpointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -131,7 +120,7 @@ exports.CfnEndpointPropsMixin = CfnEndpointPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html
  */
 class CfnEventSubscriptionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnEventSubscriptionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnEventSubscriptionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["enabled", "eventCategories", "snsTopicArn", "sourceIds", "sourceType", "subscriptionName", "tags"];
     props;
     strategy;
@@ -154,7 +143,7 @@ class CfnEventSubscriptionPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -167,12 +156,7 @@ class CfnEventSubscriptionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEventSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEventSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEventSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -186,7 +170,7 @@ exports.CfnEventSubscriptionPropsMixin = CfnEventSubscriptionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationconfig.html
  */
 class CfnReplicationConfigPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnReplicationConfigPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnReplicationConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["computeConfig", "replicationConfigIdentifier", "replicationSettings", "replicationType", "resourceIdentifier", "sourceEndpointArn", "supplementalSettings", "tableMappings", "tags", "targetEndpointArn"];
     props;
     strategy;
@@ -209,7 +193,7 @@ class CfnReplicationConfigPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -222,12 +206,7 @@ class CfnReplicationConfigPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnReplicationConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnReplicationConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnReplicationConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -243,7 +222,7 @@ exports.CfnReplicationConfigPropsMixin = CfnReplicationConfigPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html
  */
 class CfnReplicationInstancePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnReplicationInstancePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnReplicationInstancePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allocatedStorage", "allowMajorVersionUpgrade", "autoMinorVersionUpgrade", "availabilityZone", "dnsNameServers", "engineVersion", "kmsKeyId", "multiAz", "networkType", "preferredMaintenanceWindow", "publiclyAccessible", "replicationInstanceClass", "replicationInstanceIdentifier", "replicationSubnetGroupIdentifier", "resourceIdentifier", "tags", "vpcSecurityGroupIds"];
     props;
     strategy;
@@ -266,7 +245,7 @@ class CfnReplicationInstancePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -279,12 +258,7 @@ class CfnReplicationInstancePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnReplicationInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnReplicationInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnReplicationInstancePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -302,7 +276,7 @@ exports.CfnReplicationInstancePropsMixin = CfnReplicationInstancePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html
  */
 class CfnReplicationSubnetGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnReplicationSubnetGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnReplicationSubnetGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["replicationSubnetGroupDescription", "replicationSubnetGroupIdentifier", "subnetIds", "tags"];
     props;
     strategy;
@@ -325,7 +299,7 @@ class CfnReplicationSubnetGroupPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -338,12 +312,7 @@ class CfnReplicationSubnetGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnReplicationSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnReplicationSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnReplicationSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -357,7 +326,7 @@ exports.CfnReplicationSubnetGroupPropsMixin = CfnReplicationSubnetGroupPropsMixi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html
  */
 class CfnReplicationTaskPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnReplicationTaskPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnReplicationTaskPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cdcStartPosition", "cdcStartTime", "cdcStopPosition", "migrationType", "replicationInstanceArn", "replicationTaskIdentifier", "replicationTaskSettings", "resourceIdentifier", "sourceEndpointArn", "tableMappings", "tags", "targetEndpointArn", "taskData"];
     props;
     strategy;
@@ -380,7 +349,7 @@ class CfnReplicationTaskPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -393,12 +362,7 @@ class CfnReplicationTaskPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnReplicationTaskPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnReplicationTaskPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnReplicationTaskPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -412,7 +376,7 @@ exports.CfnReplicationTaskPropsMixin = CfnReplicationTaskPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-datamigration.html
  */
 class CfnDataMigrationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnDataMigrationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnDataMigrationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dataMigrationIdentifier", "dataMigrationName", "dataMigrationSettings", "dataMigrationType", "migrationProjectIdentifier", "serviceAccessRoleArn", "sourceDataSettings", "tags"];
     props;
     strategy;
@@ -435,7 +399,7 @@ class CfnDataMigrationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -448,12 +412,7 @@ class CfnDataMigrationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataMigrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataMigrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataMigrationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -467,7 +426,7 @@ exports.CfnDataMigrationPropsMixin = CfnDataMigrationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-dataprovider.html
  */
 class CfnDataProviderPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnDataProviderPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnDataProviderPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dataProviderIdentifier", "dataProviderName", "description", "engine", "exactSettings", "settings", "tags"];
     props;
     strategy;
@@ -490,7 +449,7 @@ class CfnDataProviderPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -503,12 +462,7 @@ class CfnDataProviderPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataProviderPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -522,7 +476,7 @@ exports.CfnDataProviderPropsMixin = CfnDataProviderPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-instanceprofile.html
  */
 class CfnInstanceProfilePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnInstanceProfilePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnInstanceProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["availabilityZone", "description", "instanceProfileIdentifier", "instanceProfileName", "kmsKeyArn", "networkType", "publiclyAccessible", "subnetGroupIdentifier", "tags", "vpcSecurityGroups"];
     props;
     strategy;
@@ -545,7 +499,7 @@ class CfnInstanceProfilePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -558,12 +512,7 @@ class CfnInstanceProfilePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInstanceProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInstanceProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInstanceProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -577,7 +526,7 @@ exports.CfnInstanceProfilePropsMixin = CfnInstanceProfilePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-migrationproject.html
  */
 class CfnMigrationProjectPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnMigrationProjectPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_dms.mixins.CfnMigrationProjectPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "instanceProfileArn", "instanceProfileIdentifier", "instanceProfileName", "migrationProjectCreationTime", "migrationProjectIdentifier", "migrationProjectName", "schemaConversionApplicationAttributes", "sourceDataProviderDescriptors", "tags", "targetDataProviderDescriptors", "transformationRules"];
     props;
     strategy;
@@ -600,7 +549,7 @@ class CfnMigrationProjectPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -613,12 +562,7 @@ class CfnMigrationProjectPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMigrationProjectPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMigrationProjectPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMigrationProjectPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

package/lib/services/aws-docdb/.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.docdb"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.DocDB",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.DocDB"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.DocDB"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_docdb"

package/lib/services/aws-docdb/.mixins.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.docdb.mixins"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.DocDB.Mixins",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.DocDB.Mixins"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.DocDB.Mixins"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_docdb.mixins"

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

@@ -15,7 +15,7 @@ import * as service from "aws-cdk-lib/aws-docdb";
 export declare class CfnDBClusterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBClusterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DocDB::DBCluster`.
      *
@@ -392,7 +392,7 @@ export interface CfnDBClusterMixinProps {
 export declare class CfnDBClusterParameterGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBClusterParameterGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DocDB::DBClusterParameterGroup`.
      *
@@ -467,7 +467,7 @@ export interface CfnDBClusterParameterGroupMixinProps {
 export declare class CfnDBInstancePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBInstanceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DocDB::DBInstance`.
      *
@@ -602,7 +602,7 @@ export interface CfnDBInstanceMixinProps {
 export declare class CfnDBSubnetGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDBSubnetGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DocDB::DBSubnetGroup`.
      *
@@ -673,7 +673,7 @@ export interface CfnDBSubnetGroupMixinProps {
 export declare class CfnEventSubscriptionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnEventSubscriptionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DocDB::EventSubscription`.
      *
@@ -766,7 +766,7 @@ export interface CfnEventSubscriptionMixinProps {
 export declare class CfnGlobalClusterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGlobalClusterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DocDB::GlobalCluster`.
      *

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

@@ -6,7 +6,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-docdb");
 /**
  * The `AWS::DocDB::DBCluster` Amazon DocumentDB (with MongoDB compatibility) resource describes a DBCluster.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-docdb");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html
  */
 class CfnDBClusterPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnDBClusterPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnDBClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["availabilityZones", "backupRetentionPeriod", "copyTagsToSnapshot", "dbClusterIdentifier", "dbClusterParameterGroupName", "dbSubnetGroupName", "deletionProtection", "enableCloudwatchLogsExports", "engineVersion", "globalClusterIdentifier", "kmsKeyId", "manageMasterUserPassword", "masterUsername", "masterUserPassword", "masterUserSecretKmsKeyId", "networkType", "port", "preferredBackupWindow", "preferredMaintenanceWindow", "restoreToTime", "restoreType", "rotateMasterUserPassword", "serverlessV2ScalingConfiguration", "snapshotIdentifier", "sourceDbClusterIdentifier", "storageEncrypted", "storageType", "tags", "useLatestRestorableTime", "vpcSecurityGroupIds"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnDBClusterPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -55,12 +54,7 @@ class CfnDBClusterPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBClusterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -82,7 +76,7 @@ exports.CfnDBClusterPropsMixin = CfnDBClusterPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbclusterparametergroup.html
  */
 class CfnDBClusterParameterGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnDBClusterParameterGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnDBClusterParameterGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "family", "name", "parameters", "tags"];
     props;
     strategy;
@@ -105,7 +99,7 @@ class CfnDBClusterParameterGroupPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -118,12 +112,7 @@ class CfnDBClusterParameterGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBClusterParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBClusterParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBClusterParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -139,7 +128,7 @@ exports.CfnDBClusterParameterGroupPropsMixin = CfnDBClusterParameterGroupPropsMi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbinstance.html
  */
 class CfnDBInstancePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnDBInstancePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnDBInstancePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["autoMinorVersionUpgrade", "availabilityZone", "caCertificateIdentifier", "certificateRotationRestart", "dbClusterIdentifier", "dbInstanceClass", "dbInstanceIdentifier", "enablePerformanceInsights", "preferredMaintenanceWindow", "tags"];
     props;
     strategy;
@@ -162,7 +151,7 @@ class CfnDBInstancePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -175,12 +164,7 @@ class CfnDBInstancePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBInstancePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -196,7 +180,7 @@ exports.CfnDBInstancePropsMixin = CfnDBInstancePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbsubnetgroup.html
  */
 class CfnDBSubnetGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnDBSubnetGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnDBSubnetGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dbSubnetGroupDescription", "dbSubnetGroupName", "subnetIds", "tags"];
     props;
     strategy;
@@ -219,7 +203,7 @@ class CfnDBSubnetGroupPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -232,12 +216,7 @@ class CfnDBSubnetGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -257,7 +236,7 @@ exports.CfnDBSubnetGroupPropsMixin = CfnDBSubnetGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-eventsubscription.html
  */
 class CfnEventSubscriptionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnEventSubscriptionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnEventSubscriptionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["enabled", "eventCategories", "snsTopicArn", "sourceIds", "sourceType", "subscriptionName"];
     props;
     strategy;
@@ -280,7 +259,7 @@ class CfnEventSubscriptionPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -293,12 +272,7 @@ class CfnEventSubscriptionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEventSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEventSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEventSubscriptionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -312,7 +286,7 @@ exports.CfnEventSubscriptionPropsMixin = CfnEventSubscriptionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-globalcluster.html
  */
 class CfnGlobalClusterPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnGlobalClusterPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_docdb.mixins.CfnGlobalClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deletionProtection", "engine", "engineVersion", "globalClusterIdentifier", "sourceDbClusterIdentifier", "storageEncrypted", "tags"];
     props;
     strategy;
@@ -335,7 +309,7 @@ class CfnGlobalClusterPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -348,12 +322,7 @@ class CfnGlobalClusterPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGlobalClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGlobalClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGlobalClusterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

package/lib/services/aws-docdbelastic/.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.docdbelastic"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.DocDBElastic",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.DocDBElastic"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.DocDBElastic"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_docdbelastic"

package/lib/services/aws-docdbelastic/.mixins.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.docdbelastic.mixins"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.DocDBElastic.Mixins",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.DocDBElastic.Mixins"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.DocDBElastic.Mixins"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_docdbelastic.mixins"