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

package/lib/services/aws-rds/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-rds");
 /**
  * Creates a custom DB engine version (CEV).
@@ -17,8 +15,8 @@ const service = require("aws-cdk-lib/aws-rds");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-customdbengineversion.html
  */
-class CfnCustomDBEngineVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnCustomDBEngineVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnCustomDBEngineVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnCustomDBEngineVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["databaseInstallationFilesS3BucketName", "databaseInstallationFilesS3Prefix", "description", "engine", "engineVersion", "imageId", "kmsKeyId", "manifest", "sourceCustomDbEngineVersionIdentifier", "status", "tags", "useAwsProvidedLatestImage"];
     props;
     strategy;
@@ -41,7 +39,7 @@ class CfnCustomDBEngineVersionPropsMixin 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
@@ -54,12 +52,7 @@ class CfnCustomDBEngineVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCustomDBEngineVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCustomDBEngineVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCustomDBEngineVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -99,8 +92,8 @@ exports.CfnCustomDBEngineVersionPropsMixin = CfnCustomDBEngineVersionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html
  */
-class CfnDBClusterPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBClusterPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBClusterPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allocatedStorage", "associatedRoles", "autoMinorVersionUpgrade", "availabilityZones", "backtrackWindow", "backupRetentionPeriod", "clusterScalabilityType", "copyTagsToSnapshot", "databaseInsightsMode", "databaseName", "dbClusterIdentifier", "dbClusterInstanceClass", "dbClusterParameterGroupName", "dbInstanceParameterGroupName", "dbSubnetGroupName", "dbSystemId", "deleteAutomatedBackups", "deletionProtection", "domain", "domainIamRoleName", "enableCloudwatchLogsExports", "enableGlobalWriteForwarding", "enableHttpEndpoint", "enableIamDatabaseAuthentication", "enableLocalWriteForwarding", "engine", "engineLifecycleSupport", "engineMode", "engineVersion", "globalClusterIdentifier", "iops", "kmsKeyId", "manageMasterUserPassword", "masterUserAuthenticationType", "masterUsername", "masterUserPassword", "masterUserSecret", "monitoringInterval", "monitoringRoleArn", "networkType", "performanceInsightsEnabled", "performanceInsightsKmsKeyId", "performanceInsightsRetentionPeriod", "port", "preferredBackupWindow", "preferredMaintenanceWindow", "publiclyAccessible", "replicationSourceIdentifier", "restoreToTime", "restoreType", "scalingConfiguration", "serverlessV2ScalingConfiguration", "snapshotIdentifier", "sourceDbClusterIdentifier", "sourceDbClusterResourceId", "sourceRegion", "storageEncrypted", "storageType", "tags", "useLatestRestorableTime", "vpcSecurityGroupIds"];
     props;
     strategy;
@@ -122,8 +115,11 @@ class CfnDBClusterPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDBClusterMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -136,16 +132,48 @@ class CfnDBClusterPropsMixin extends core.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);
         }
     }
 }
 exports.CfnDBClusterPropsMixin = CfnDBClusterPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDBClusterPropsMixinMasterUserSecretProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        kmsKeyId: (!props.kmsKeyId ? undefined : cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.kmsKeyId, "kmsKeyId", "kms.IKeyRef | string")),
+        secretArn: (!props.secretArn ? undefined : props.secretArn)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDBClusterPropsMixinDBClusterRoleProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        featureName: (!props.featureName ? undefined : props.featureName),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDBClusterMixinProps(props) {
+    const ret = {};
+    if ((props.associatedRoles !== undefined))
+        ret.associatedRoles = (cdk.isResolvableObject(props.associatedRoles) ? props.associatedRoles : cdk.mapArrayInPlace(props.associatedRoles, (item) => flattenCfnDBClusterPropsMixinDBClusterRoleProperty(item)));
+    if ((props.dbClusterParameterGroupName !== undefined))
+        ret.dbClusterParameterGroupName = cdk.getRefProperty(props.dbClusterParameterGroupName?.dbClusterParameterGroupRef, 'dbClusterParameterGroupName') ?? cdk.ensureStringOrUndefined(props.dbClusterParameterGroupName, "dbClusterParameterGroupName", "rds.IDBClusterParameterGroupRef | string");
+    if ((props.dbSubnetGroupName !== undefined))
+        ret.dbSubnetGroupName = cdk.getRefProperty(props.dbSubnetGroupName?.dbSubnetGroupRef, 'dbSubnetGroupName') ?? cdk.ensureStringOrUndefined(props.dbSubnetGroupName, "dbSubnetGroupName", "rds.IDBSubnetGroupRef | string");
+    if ((props.globalClusterIdentifier !== undefined))
+        ret.globalClusterIdentifier = cdk.getRefProperty(props.globalClusterIdentifier?.globalClusterRef, 'globalClusterIdentifier') ?? cdk.ensureStringOrUndefined(props.globalClusterIdentifier, "globalClusterIdentifier", "rds.IGlobalClusterRef | string");
+    if ((props.kmsKeyId !== undefined))
+        ret.kmsKeyId = cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyArn') ?? cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.kmsKeyId, "kmsKeyId", "kms.IKeyRef | string");
+    if ((props.masterUserSecret !== undefined))
+        ret.masterUserSecret = flattenCfnDBClusterPropsMixinMasterUserSecretProperty(props.masterUserSecret);
+    if ((props.vpcSecurityGroupIds !== undefined))
+        ret.vpcSecurityGroupIds = cdk.mapArrayInPlace(props.vpcSecurityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "vpcSecurityGroupIds", "ec2.ISecurityGroupRef | string"));
+    return ret;
+}
 /**
  * The `AWS::RDS::DBClusterParameterGroup` resource creates a new Amazon RDS DB cluster parameter group.
  *
@@ -160,8 +188,8 @@ exports.CfnDBClusterPropsMixin = CfnDBClusterPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html
  */
-class CfnDBClusterParameterGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBClusterParameterGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBClusterParameterGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBClusterParameterGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dbClusterParameterGroupName", "description", "family", "parameters", "tags"];
     props;
     strategy;
@@ -184,7 +212,7 @@ class CfnDBClusterParameterGroupPropsMixin 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
@@ -197,12 +225,7 @@ class CfnDBClusterParameterGroupPropsMixin extends core.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);
         }
     }
 }
@@ -249,8 +272,8 @@ exports.CfnDBClusterParameterGroupPropsMixin = CfnDBClusterParameterGroupPropsMi
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html
  */
-class CfnDBInstancePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBInstancePropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBInstancePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBInstancePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["additionalStorageVolumes", "allocatedStorage", "allowMajorVersionUpgrade", "applyImmediately", "associatedRoles", "automaticBackupReplicationKmsKeyId", "automaticBackupReplicationRegion", "automaticBackupReplicationRetentionPeriod", "autoMinorVersionUpgrade", "availabilityZone", "backupRetentionPeriod", "backupTarget", "caCertificateIdentifier", "certificateRotationRestart", "characterSetName", "copyTagsToSnapshot", "customIamInstanceProfile", "databaseInsightsMode", "dbClusterIdentifier", "dbClusterSnapshotIdentifier", "dbInstanceClass", "dbInstanceIdentifier", "dbName", "dbParameterGroupName", "dbSecurityGroups", "dbSnapshotIdentifier", "dbSubnetGroupName", "dbSystemId", "dedicatedLogVolume", "deleteAutomatedBackups", "deletionProtection", "domain", "domainAuthSecretArn", "domainDnsIps", "domainFqdn", "domainIamRoleName", "domainOu", "enableCloudwatchLogsExports", "enableIamDatabaseAuthentication", "enablePerformanceInsights", "engine", "engineLifecycleSupport", "engineVersion", "iops", "kmsKeyId", "licenseModel", "manageMasterUserPassword", "masterUserAuthenticationType", "masterUsername", "masterUserPassword", "masterUserSecret", "maxAllocatedStorage", "monitoringInterval", "monitoringRoleArn", "multiAz", "ncharCharacterSetName", "networkType", "optionGroupName", "performanceInsightsKmsKeyId", "performanceInsightsRetentionPeriod", "port", "preferredBackupWindow", "preferredMaintenanceWindow", "processorFeatures", "promotionTier", "publiclyAccessible", "replicaMode", "restoreTime", "sourceDbClusterIdentifier", "sourceDbInstanceAutomatedBackupsArn", "sourceDbInstanceIdentifier", "sourceDbiResourceId", "sourceRegion", "storageEncrypted", "storageThroughput", "storageType", "tags", "tdeCredentialArn", "tdeCredentialPassword", "timezone", "useDefaultProcessorFeatures", "useLatestRestorableTime", "vpcSecurityGroups"];
     props;
     strategy;
@@ -272,8 +295,11 @@ class CfnDBInstancePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDBInstanceMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -286,16 +312,43 @@ class CfnDBInstancePropsMixin extends core.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);
         }
     }
 }
 exports.CfnDBInstancePropsMixin = CfnDBInstancePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDBInstancePropsMixinMasterUserSecretProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        kmsKeyId: (!props.kmsKeyId ? undefined : cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.kmsKeyId, "kmsKeyId", "kms.IKeyRef | string")),
+        secretArn: (!props.secretArn ? undefined : props.secretArn)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDBInstanceMixinProps(props) {
+    const ret = {};
+    if ((props.dbClusterIdentifier !== undefined))
+        ret.dbClusterIdentifier = cdk.getRefProperty(props.dbClusterIdentifier?.dbClusterRef, 'dbClusterIdentifier') ?? cdk.ensureStringOrUndefined(props.dbClusterIdentifier, "dbClusterIdentifier", "rds.IDBClusterRef | string");
+    if ((props.dbParameterGroupName !== undefined))
+        ret.dbParameterGroupName = cdk.getRefProperty(props.dbParameterGroupName?.dbParameterGroupRef, 'dbParameterGroupName') ?? cdk.ensureStringOrUndefined(props.dbParameterGroupName, "dbParameterGroupName", "rds.IDBParameterGroupRef | string");
+    if ((props.dbSubnetGroupName !== undefined))
+        ret.dbSubnetGroupName = cdk.getRefProperty(props.dbSubnetGroupName?.dbSubnetGroupRef, 'dbSubnetGroupName') ?? cdk.ensureStringOrUndefined(props.dbSubnetGroupName, "dbSubnetGroupName", "rds.IDBSubnetGroupRef | string");
+    if ((props.kmsKeyId !== undefined))
+        ret.kmsKeyId = cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyArn') ?? cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.kmsKeyId, "kmsKeyId", "kms.IKeyRef | string");
+    if ((props.masterUserSecret !== undefined))
+        ret.masterUserSecret = flattenCfnDBInstancePropsMixinMasterUserSecretProperty(props.masterUserSecret);
+    if ((props.monitoringRoleArn !== undefined))
+        ret.monitoringRoleArn = cdk.getRefProperty(props.monitoringRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.monitoringRoleArn, "monitoringRoleArn", "iam.IRoleRef | string");
+    if ((props.performanceInsightsKmsKeyId !== undefined))
+        ret.performanceInsightsKmsKeyId = cdk.getRefProperty(props.performanceInsightsKmsKeyId?.keyRef, 'keyArn') ?? cdk.getRefProperty(props.performanceInsightsKmsKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.performanceInsightsKmsKeyId, "performanceInsightsKmsKeyId", "kms.IKeyRef | string");
+    if ((props.sourceDbInstanceIdentifier !== undefined))
+        ret.sourceDbInstanceIdentifier = cdk.getRefProperty(props.sourceDbInstanceIdentifier?.dbInstanceRef, 'dbInstanceIdentifier') ?? cdk.ensureStringOrUndefined(props.sourceDbInstanceIdentifier, "sourceDbInstanceIdentifier", "rds.IDBInstanceRef | string");
+    if ((props.vpcSecurityGroups !== undefined))
+        ret.vpcSecurityGroups = cdk.mapArrayInPlace(props.vpcSecurityGroups, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "vpcSecurityGroups", "ec2.ISecurityGroupRef | string"));
+    return ret;
+}
 /**
  * The `AWS::RDS::DBParameterGroup` resource creates a custom parameter group for an RDS database family.
  *
@@ -312,8 +365,8 @@ exports.CfnDBInstancePropsMixin = CfnDBInstancePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbparametergroup.html
  */
-class CfnDBParameterGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBParameterGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBParameterGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBParameterGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dbParameterGroupName", "description", "family", "parameters", "tags"];
     props;
     strategy;
@@ -336,7 +389,7 @@ class CfnDBParameterGroupPropsMixin 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
@@ -349,12 +402,7 @@ class CfnDBParameterGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -377,8 +425,8 @@ exports.CfnDBParameterGroupPropsMixin = CfnDBParameterGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html
  */
-class CfnDBProxyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBProxyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBProxyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBProxyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["auth", "dbProxyName", "debugLogging", "defaultAuthScheme", "endpointNetworkType", "engineFamily", "idleClientTimeout", "requireTls", "roleArn", "tags", "targetConnectionNetworkType", "vpcSecurityGroupIds", "vpcSubnetIds"];
     props;
     strategy;
@@ -400,8 +448,11 @@ class CfnDBProxyPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDBProxyMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -414,16 +465,36 @@ class CfnDBProxyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBProxyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBProxyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBProxyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDBProxyPropsMixin = CfnDBProxyPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDBProxyPropsMixinAuthFormatProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        authScheme: (!props.authScheme ? undefined : props.authScheme),
+        clientPasswordAuthType: (!props.clientPasswordAuthType ? undefined : props.clientPasswordAuthType),
+        description: (!props.description ? undefined : props.description),
+        iamAuth: (!props.iamAuth ? undefined : props.iamAuth),
+        secretArn: (!props.secretArn ? undefined : cdk.getRefProperty(props.secretArn?.secretRef, 'secretId') ?? cdk.ensureStringOrUndefined(props.secretArn, "secretArn", "secretsmanager.ISecretRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDBProxyMixinProps(props) {
+    const ret = {};
+    if ((props.auth !== undefined))
+        ret.auth = (cdk.isResolvableObject(props.auth) ? props.auth : cdk.mapArrayInPlace(props.auth, (item) => flattenCfnDBProxyPropsMixinAuthFormatProperty(item)));
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    if ((props.vpcSecurityGroupIds !== undefined))
+        ret.vpcSecurityGroupIds = cdk.mapArrayInPlace(props.vpcSecurityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "vpcSecurityGroupIds", "ec2.ISecurityGroupRef | string"));
+    if ((props.vpcSubnetIds !== undefined))
+        ret.vpcSubnetIds = cdk.mapArrayInPlace(props.vpcSubnetIds, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "vpcSubnetIds", "ec2.ISubnetRef | string"));
+    return ret;
+}
 /**
  * The `AWS::RDS::DBProxyEndpoint` resource creates or updates a DB proxy endpoint.
  *
@@ -436,8 +507,8 @@ exports.CfnDBProxyPropsMixin = CfnDBProxyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html
  */
-class CfnDBProxyEndpointPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBProxyEndpointPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBProxyEndpointPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBProxyEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dbProxyEndpointName", "dbProxyName", "endpointNetworkType", "tags", "targetRole", "vpcSecurityGroupIds", "vpcSubnetIds"];
     props;
     strategy;
@@ -459,8 +530,11 @@ class CfnDBProxyEndpointPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDBProxyEndpointMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -473,16 +547,20 @@ class CfnDBProxyEndpointPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBProxyEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBProxyEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBProxyEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDBProxyEndpointPropsMixin = CfnDBProxyEndpointPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDBProxyEndpointMixinProps(props) {
+    const ret = {};
+    if ((props.vpcSecurityGroupIds !== undefined))
+        ret.vpcSecurityGroupIds = cdk.mapArrayInPlace(props.vpcSecurityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "vpcSecurityGroupIds", "ec2.ISecurityGroupRef | string"));
+    if ((props.vpcSubnetIds !== undefined))
+        ret.vpcSubnetIds = cdk.mapArrayInPlace(props.vpcSubnetIds, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "vpcSubnetIds", "ec2.ISubnetRef | string"));
+    return ret;
+}
 /**
  * The `AWS::RDS::DBProxyTargetGroup` resource represents a set of RDS DB instances, Aurora DB clusters, or both that a proxy can connect to.
  *
@@ -507,8 +585,8 @@ exports.CfnDBProxyEndpointPropsMixin = CfnDBProxyEndpointPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxytargetgroup.html
  */
-class CfnDBProxyTargetGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBProxyTargetGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBProxyTargetGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBProxyTargetGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["connectionPoolConfigurationInfo", "dbClusterIdentifiers", "dbInstanceIdentifiers", "dbProxyName", "targetGroupName"];
     props;
     strategy;
@@ -530,8 +608,11 @@ class CfnDBProxyTargetGroupPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDBProxyTargetGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -544,16 +625,20 @@ class CfnDBProxyTargetGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBProxyTargetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBProxyTargetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBProxyTargetGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDBProxyTargetGroupPropsMixin = CfnDBProxyTargetGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDBProxyTargetGroupMixinProps(props) {
+    const ret = {};
+    if ((props.dbClusterIdentifiers !== undefined))
+        ret.dbClusterIdentifiers = cdk.mapArrayInPlace(props.dbClusterIdentifiers, (item) => cdk.getRefProperty(item?.dbClusterRef, 'dbClusterIdentifier') ?? cdk.ensureStringOrUndefined(item, "dbClusterIdentifiers", "rds.IDBClusterRef | string"));
+    if ((props.dbProxyName !== undefined))
+        ret.dbProxyName = cdk.getRefProperty(props.dbProxyName?.dbProxyRef, 'dbProxyName') ?? cdk.ensureStringOrUndefined(props.dbProxyName, "dbProxyName", "rds.IDBProxyRef | string");
+    return ret;
+}
 /**
  * The `AWS::RDS::DBSecurityGroup` resource creates or updates an Amazon RDS DB security group.
  *
@@ -564,8 +649,8 @@ exports.CfnDBProxyTargetGroupPropsMixin = CfnDBProxyTargetGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsecuritygroup.html
  */
-class CfnDBSecurityGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBSecurityGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBSecurityGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBSecurityGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dbSecurityGroupIngress", "ec2VpcId", "groupDescription", "tags"];
     props;
     strategy;
@@ -588,7 +673,7 @@ class CfnDBSecurityGroupPropsMixin 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
@@ -601,12 +686,7 @@ class CfnDBSecurityGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBSecurityGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBSecurityGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBSecurityGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -627,8 +707,8 @@ exports.CfnDBSecurityGroupPropsMixin = CfnDBSecurityGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsecuritygroupingress.html
  */
-class CfnDBSecurityGroupIngressPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBSecurityGroupIngressPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBSecurityGroupIngressPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBSecurityGroupIngressPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cidrip", "dbSecurityGroupName", "ec2SecurityGroupId", "ec2SecurityGroupName", "ec2SecurityGroupOwnerId"];
     props;
     strategy;
@@ -651,7 +731,7 @@ class CfnDBSecurityGroupIngressPropsMixin 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
@@ -664,12 +744,7 @@ class CfnDBSecurityGroupIngressPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBSecurityGroupIngressPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBSecurityGroupIngressPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBSecurityGroupIngressPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -686,8 +761,8 @@ exports.CfnDBSecurityGroupIngressPropsMixin = CfnDBSecurityGroupIngressPropsMixi
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnetgroup.html
  */
-class CfnDBSubnetGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBSubnetGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBSubnetGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBSubnetGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dbSubnetGroupDescription", "dbSubnetGroupName", "subnetIds", "tags"];
     props;
     strategy;
@@ -709,8 +784,11 @@ class CfnDBSubnetGroupPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDBSubnetGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -723,16 +801,18 @@ class CfnDBSubnetGroupPropsMixin extends core.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);
         }
     }
 }
 exports.CfnDBSubnetGroupPropsMixin = CfnDBSubnetGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDBSubnetGroupMixinProps(props) {
+    const ret = {};
+    if ((props.subnetIds !== undefined))
+        ret.subnetIds = cdk.mapArrayInPlace(props.subnetIds, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnetIds", "ec2.ISubnetRef | string"));
+    return ret;
+}
 /**
  * The `AWS::RDS::EventSubscription` resource allows you to receive notifications for Amazon Relational Database Service events through the Amazon Simple Notification Service (Amazon SNS).
  *
@@ -743,8 +823,8 @@ exports.CfnDBSubnetGroupPropsMixin = CfnDBSubnetGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html
  */
-class CfnEventSubscriptionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnEventSubscriptionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnEventSubscriptionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnEventSubscriptionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["enabled", "eventCategories", "snsTopicArn", "sourceIds", "sourceType", "subscriptionName", "tags"];
     props;
     strategy;
@@ -766,8 +846,11 @@ class CfnEventSubscriptionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnEventSubscriptionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -780,16 +863,20 @@ class CfnEventSubscriptionPropsMixin extends core.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);
         }
     }
 }
 exports.CfnEventSubscriptionPropsMixin = CfnEventSubscriptionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnEventSubscriptionMixinProps(props) {
+    const ret = {};
+    if ((props.snsTopicArn !== undefined))
+        ret.snsTopicArn = cdk.getRefProperty(props.snsTopicArn?.topicRef, 'topicArn') ?? cdk.ensureStringOrUndefined(props.snsTopicArn, "snsTopicArn", "sns.ITopicRef | string");
+    if ((props.sourceIds !== undefined))
+        ret.sourceIds = cdk.mapArrayInPlace(props.sourceIds, (item) => cdk.getRefProperty(item?.dbClusterRef, 'dbClusterIdentifier') ?? cdk.getRefProperty(item?.dbInstanceRef, 'dbInstanceIdentifier') ?? cdk.ensureStringOrUndefined(item, "sourceIds", "rds.IDBClusterRef | rds.IDBInstanceRef | string"));
+    return ret;
+}
 /**
  * The `AWS::RDS::GlobalCluster` resource creates or updates an Amazon Aurora global database spread across multiple AWS Regions.
  *
@@ -804,8 +891,8 @@ exports.CfnEventSubscriptionPropsMixin = CfnEventSubscriptionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html
  */
-class CfnGlobalClusterPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnGlobalClusterPropsMixin", version: "2.240.0-alpha.0" };
+class CfnGlobalClusterPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnGlobalClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deletionProtection", "engine", "engineLifecycleSupport", "engineVersion", "globalClusterIdentifier", "sourceDbClusterIdentifier", "storageEncrypted", "tags"];
     props;
     strategy;
@@ -827,8 +914,11 @@ class CfnGlobalClusterPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnGlobalClusterMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -841,16 +931,18 @@ class CfnGlobalClusterPropsMixin extends core.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);
         }
     }
 }
 exports.CfnGlobalClusterPropsMixin = CfnGlobalClusterPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnGlobalClusterMixinProps(props) {
+    const ret = {};
+    if ((props.sourceDbClusterIdentifier !== undefined))
+        ret.sourceDbClusterIdentifier = cdk.getRefProperty(props.sourceDbClusterIdentifier?.dbClusterRef, 'dbClusterIdentifier') ?? cdk.ensureStringOrUndefined(props.sourceDbClusterIdentifier, "sourceDbClusterIdentifier", "rds.IDBClusterRef | string");
+    return ret;
+}
 /**
  * The `AWS::RDS::OptionGroup` resource creates or updates an option group, to enable and configure features that are specific to a particular DB engine.
  *
@@ -859,8 +951,8 @@ exports.CfnGlobalClusterPropsMixin = CfnGlobalClusterPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html
  */
-class CfnOptionGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnOptionGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnOptionGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnOptionGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["engineName", "majorEngineVersion", "optionConfigurations", "optionGroupDescription", "optionGroupName", "tags"];
     props;
     strategy;
@@ -883,7 +975,7 @@ class CfnOptionGroupPropsMixin 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
@@ -896,12 +988,7 @@ class CfnOptionGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnOptionGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnOptionGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnOptionGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -918,8 +1005,8 @@ exports.CfnOptionGroupPropsMixin = CfnOptionGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbshardgroup.html
  */
-class CfnDBShardGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBShardGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDBShardGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnDBShardGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["computeRedundancy", "dbClusterIdentifier", "dbShardGroupIdentifier", "maxAcu", "minAcu", "publiclyAccessible", "tags"];
     props;
     strategy;
@@ -942,7 +1029,7 @@ class CfnDBShardGroupPropsMixin 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
@@ -955,12 +1042,7 @@ class CfnDBShardGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDBShardGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDBShardGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDBShardGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -973,8 +1055,8 @@ exports.CfnDBShardGroupPropsMixin = CfnDBShardGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-integration.html
  */
-class CfnIntegrationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnIntegrationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnIntegrationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_rds.mixins.CfnIntegrationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["additionalEncryptionContext", "dataFilter", "description", "integrationName", "kmsKeyId", "sourceArn", "tags", "targetArn"];
     props;
     strategy;
@@ -997,7 +1079,7 @@ class CfnIntegrationPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1010,12 +1092,7 @@ class CfnIntegrationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIntegrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIntegrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIntegrationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }