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

package/lib/services/aws-redshift/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-redshift");
 /**
  * Specifies a cluster. A *cluster* is a fully managed data warehouse that consists of a set of compute nodes.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-redshift");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html
  */
-class CfnClusterPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnClusterPropsMixin", version: "2.240.0-alpha.0" };
+class CfnClusterPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allowVersionUpgrade", "aquaConfigurationStatus", "automatedSnapshotRetentionPeriod", "availabilityZone", "availabilityZoneRelocation", "availabilityZoneRelocationStatus", "classic", "clusterIdentifier", "clusterParameterGroupName", "clusterSecurityGroups", "clusterSubnetGroupName", "clusterType", "clusterVersion", "dbName", "deferMaintenance", "deferMaintenanceDuration", "deferMaintenanceEndTime", "deferMaintenanceStartTime", "destinationRegion", "elasticIp", "encrypted", "endpoint", "enhancedVpcRouting", "hsmClientCertificateIdentifier", "hsmConfigurationIdentifier", "iamRoles", "kmsKeyId", "loggingProperties", "maintenanceTrackName", "manageMasterPassword", "manualSnapshotRetentionPeriod", "masterPasswordSecretKmsKeyId", "masterUsername", "masterUserPassword", "multiAz", "namespaceResourcePolicy", "nodeType", "numberOfNodes", "ownerAccount", "port", "preferredMaintenanceWindow", "publiclyAccessible", "resourceAction", "revisionTarget", "rotateEncryptionKey", "snapshotClusterIdentifier", "snapshotCopyGrantName", "snapshotCopyManual", "snapshotCopyRetentionPeriod", "snapshotIdentifier", "tags", "vpcSecurityGroupIds"];
     props;
     strategy;
@@ -42,8 +40,11 @@ class CfnClusterPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnClusterMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -56,16 +57,45 @@ class CfnClusterPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClusterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnClusterPropsMixin = CfnClusterPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnClusterPropsMixinLoggingPropertiesProperty(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")),
+        logDestinationType: (!props.logDestinationType ? undefined : props.logDestinationType),
+        logExports: (!props.logExports ? undefined : props.logExports),
+        s3KeyPrefix: (!props.s3KeyPrefix ? undefined : props.s3KeyPrefix)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterMixinProps(props) {
+    const ret = {};
+    if ((props.clusterParameterGroupName !== undefined))
+        ret.clusterParameterGroupName = cdk.getRefProperty(props.clusterParameterGroupName?.clusterParameterGroupRef, 'parameterGroupName') ?? cdk.ensureStringOrUndefined(props.clusterParameterGroupName, "clusterParameterGroupName", "redshift.IClusterParameterGroupRef | string");
+    if ((props.clusterSecurityGroups !== undefined))
+        ret.clusterSecurityGroups = cdk.mapArrayInPlace(props.clusterSecurityGroups, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.getRefProperty(item?.clusterSecurityGroupRef, 'clusterSecurityGroupId') ?? cdk.ensureStringOrUndefined(item, "clusterSecurityGroups", "ec2.ISecurityGroupRef | redshift.IClusterSecurityGroupRef | string"));
+    if ((props.clusterSubnetGroupName !== undefined))
+        ret.clusterSubnetGroupName = cdk.getRefProperty(props.clusterSubnetGroupName?.clusterSubnetGroupRef, 'clusterSubnetGroupName') ?? cdk.ensureStringOrUndefined(props.clusterSubnetGroupName, "clusterSubnetGroupName", "redshift.IClusterSubnetGroupRef | string");
+    if ((props.elasticIp !== undefined))
+        ret.elasticIp = cdk.getRefProperty(props.elasticIp?.eipRef, 'publicIp') ?? cdk.getRefProperty(props.elasticIp?.eipRef, 'allocationId') ?? cdk.ensureStringOrUndefined(props.elasticIp, "elasticIp", "ec2.IEIPRef | string");
+    if ((props.iamRoles !== undefined))
+        ret.iamRoles = cdk.mapArrayInPlace(props.iamRoles, (item) => cdk.getRefProperty(item?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(item, "iamRoles", "iam.IRoleRef | 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.loggingProperties !== undefined))
+        ret.loggingProperties = flattenCfnClusterPropsMixinLoggingPropertiesProperty(props.loggingProperties);
+    if ((props.masterPasswordSecretKmsKeyId !== undefined))
+        ret.masterPasswordSecretKmsKeyId = cdk.getRefProperty(props.masterPasswordSecretKmsKeyId?.keyRef, 'keyArn') ?? cdk.getRefProperty(props.masterPasswordSecretKmsKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.masterPasswordSecretKmsKeyId, "masterPasswordSecretKmsKeyId", "kms.IKeyRef | string");
+    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;
+}
 /**
  * Describes a parameter group.
  *
@@ -74,8 +104,8 @@ exports.CfnClusterPropsMixin = CfnClusterPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html
  */
-class CfnClusterParameterGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnClusterParameterGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnClusterParameterGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnClusterParameterGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "parameterGroupFamily", "parameterGroupName", "parameters", "tags"];
     props;
     strategy;
@@ -98,7 +128,7 @@ class CfnClusterParameterGroupPropsMixin 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 +141,7 @@ class CfnClusterParameterGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClusterParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClusterParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClusterParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -131,8 +156,8 @@ exports.CfnClusterParameterGroupPropsMixin = CfnClusterParameterGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroup.html
  */
-class CfnClusterSecurityGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnClusterSecurityGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnClusterSecurityGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnClusterSecurityGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "tags"];
     props;
     strategy;
@@ -155,7 +180,7 @@ class CfnClusterSecurityGroupPropsMixin 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 +193,7 @@ class CfnClusterSecurityGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClusterSecurityGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClusterSecurityGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClusterSecurityGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -194,8 +214,8 @@ exports.CfnClusterSecurityGroupPropsMixin = CfnClusterSecurityGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html
  */
-class CfnClusterSecurityGroupIngressPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnClusterSecurityGroupIngressPropsMixin", version: "2.240.0-alpha.0" };
+class CfnClusterSecurityGroupIngressPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnClusterSecurityGroupIngressPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cidrip", "clusterSecurityGroupName", "ec2SecurityGroupName", "ec2SecurityGroupOwnerId"];
     props;
     strategy;
@@ -218,7 +238,7 @@ class CfnClusterSecurityGroupIngressPropsMixin 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
@@ -231,12 +251,7 @@ class CfnClusterSecurityGroupIngressPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClusterSecurityGroupIngressPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClusterSecurityGroupIngressPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClusterSecurityGroupIngressPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -253,8 +268,8 @@ exports.CfnClusterSecurityGroupIngressPropsMixin = CfnClusterSecurityGroupIngres
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersubnetgroup.html
  */
-class CfnClusterSubnetGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnClusterSubnetGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnClusterSubnetGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnClusterSubnetGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "subnetIds", "tags"];
     props;
     strategy;
@@ -276,8 +291,11 @@ class CfnClusterSubnetGroupPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnClusterSubnetGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -290,16 +308,18 @@ class CfnClusterSubnetGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClusterSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClusterSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClusterSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnClusterSubnetGroupPropsMixin = CfnClusterSubnetGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnClusterSubnetGroupMixinProps(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;
+}
 /**
  * Creates a Redshift-managed VPC endpoint.
  *
@@ -308,8 +328,8 @@ exports.CfnClusterSubnetGroupPropsMixin = CfnClusterSubnetGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html
  */
-class CfnEndpointAccessPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnEndpointAccessPropsMixin", version: "2.240.0-alpha.0" };
+class CfnEndpointAccessPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnEndpointAccessPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clusterIdentifier", "endpointName", "resourceOwner", "subnetGroupName", "vpcSecurityGroupIds"];
     props;
     strategy;
@@ -331,8 +351,11 @@ class CfnEndpointAccessPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnEndpointAccessMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -345,16 +368,30 @@ class CfnEndpointAccessPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEndpointAccessPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEndpointAccessPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEndpointAccessPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnEndpointAccessPropsMixin = CfnEndpointAccessPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnEndpointAccessPropsMixinVpcEndpointProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        networkInterfaces: (!props.networkInterfaces ? undefined : props.networkInterfaces),
+        vpcEndpointId: (!props.vpcEndpointId ? undefined : cdk.getRefProperty(props.vpcEndpointId?.vpcEndpointRef, 'vpcEndpointId') ?? cdk.ensureStringOrUndefined(props.vpcEndpointId, "vpcEndpointId", "ec2.IVPCEndpointRef | string")),
+        vpcId: (!props.vpcId ? undefined : props.vpcId)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnEndpointAccessMixinProps(props) {
+    const ret = {};
+    if ((props.subnetGroupName !== undefined))
+        ret.subnetGroupName = cdk.getRefProperty(props.subnetGroupName?.clusterSubnetGroupRef, 'clusterSubnetGroupName') ?? cdk.ensureStringOrUndefined(props.subnetGroupName, "subnetGroupName", "redshift.IClusterSubnetGroupRef | string");
+    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;
+}
 /**
  * Describes an endpoint authorization for authorizing Redshift-managed VPC endpoint access to a cluster across AWS accounts .
  *
@@ -363,8 +400,8 @@ exports.CfnEndpointAccessPropsMixin = CfnEndpointAccessPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointauthorization.html
  */
-class CfnEndpointAuthorizationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnEndpointAuthorizationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnEndpointAuthorizationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnEndpointAuthorizationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["account", "clusterIdentifier", "force", "vpcIds"];
     props;
     strategy;
@@ -386,8 +423,11 @@ class CfnEndpointAuthorizationPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnEndpointAuthorizationMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -400,16 +440,18 @@ class CfnEndpointAuthorizationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEndpointAuthorizationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEndpointAuthorizationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEndpointAuthorizationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnEndpointAuthorizationPropsMixin = CfnEndpointAuthorizationPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnEndpointAuthorizationMixinProps(props) {
+    const ret = {};
+    if ((props.vpcIds !== undefined))
+        ret.vpcIds = cdk.mapArrayInPlace(props.vpcIds, (item) => cdk.getRefProperty(item?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(item, "vpcIds", "ec2.IVPCRef | string"));
+    return ret;
+}
 /**
  * http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html.
  *
@@ -418,8 +460,8 @@ exports.CfnEndpointAuthorizationPropsMixin = CfnEndpointAuthorizationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html
  */
-class CfnEventSubscriptionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnEventSubscriptionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnEventSubscriptionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnEventSubscriptionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["enabled", "eventCategories", "severity", "snsTopicArn", "sourceIds", "sourceType", "subscriptionName", "tags"];
     props;
     strategy;
@@ -441,8 +483,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
@@ -455,16 +500,18 @@ 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");
+    return ret;
+}
 /**
  * Creates a scheduled action.
  *
@@ -475,8 +522,8 @@ exports.CfnEventSubscriptionPropsMixin = CfnEventSubscriptionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html
  */
-class CfnScheduledActionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnScheduledActionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnScheduledActionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnScheduledActionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["enable", "endTime", "iamRole", "schedule", "scheduledActionDescription", "scheduledActionName", "startTime", "targetAction"];
     props;
     strategy;
@@ -499,7 +546,7 @@ class CfnScheduledActionPropsMixin 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
@@ -512,12 +559,7 @@ class CfnScheduledActionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnScheduledActionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnScheduledActionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnScheduledActionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -530,8 +572,8 @@ exports.CfnScheduledActionPropsMixin = CfnScheduledActionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-integration.html
  */
-class CfnIntegrationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnIntegrationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnIntegrationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_redshift.mixins.CfnIntegrationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["additionalEncryptionContext", "integrationName", "kmsKeyId", "sourceArn", "tags", "targetArn"];
     props;
     strategy;
@@ -554,7 +596,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
@@ -567,12 +609,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);
         }
     }
 }

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

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

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

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

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

@@ -1,8 +1,8 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-redshiftserverless";
+import { aws_ec2 as ec2Refs, aws_iam as iamRefs, aws_kms as kmsRefs } from "aws-cdk-lib/interfaces";
 /**
  * A collection of database objects and users.
  *
@@ -11,10 +11,10 @@ import * as service from "aws-cdk-lib/aws-redshiftserverless";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-namespace.html
  */
-export declare class CfnNamespacePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnNamespacePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnNamespaceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RedshiftServerless::Namespace`.
      *
@@ -190,7 +190,7 @@ export interface CfnNamespaceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-namespace.html#cfn-redshiftserverless-namespace-defaultiamrolearn
      */
-    readonly defaultIamRoleArn?: string;
+    readonly defaultIamRoleArn?: iamRefs.IRoleRef | string;
     /**
      * The name of the snapshot to be created before the namespace is deleted.
      *
@@ -208,13 +208,13 @@ export interface CfnNamespaceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-namespace.html#cfn-redshiftserverless-namespace-iamroles
      */
-    readonly iamRoles?: Array<string>;
+    readonly iamRoles?: Array<iamRefs.IRoleRef | string>;
     /**
      * The ID of the AWS Key Management Service key used to encrypt your data.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-namespace.html#cfn-redshiftserverless-namespace-kmskeyid
      */
-    readonly kmsKeyId?: string;
+    readonly kmsKeyId?: kmsRefs.IKeyRef | string;
     /**
      * The types of logs the namespace can export.
      *
@@ -272,10 +272,10 @@ export interface CfnNamespaceMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-workgroup.html
  */
-export declare class CfnWorkgroupPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnWorkgroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnWorkgroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RedshiftServerless::Workgroup`.
      *
@@ -613,7 +613,7 @@ export interface CfnWorkgroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-workgroup.html#cfn-redshiftserverless-workgroup-securitygroupids
      */
-    readonly securityGroupIds?: Array<string>;
+    readonly securityGroupIds?: Array<ec2Refs.ISecurityGroupRef | string>;
     /**
      * The Amazon Resource Name (ARN) of the snapshot to restore from.
      *
@@ -637,7 +637,7 @@ export interface CfnWorkgroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-workgroup.html#cfn-redshiftserverless-workgroup-subnetids
      */
-    readonly subnetIds?: Array<string>;
+    readonly subnetIds?: Array<ec2Refs.ISubnetRef | string>;
     /**
      * The map of the key-value pairs used to tag the workgroup.
      *
@@ -673,10 +673,10 @@ export interface CfnWorkgroupMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-snapshot.html
  */
-export declare class CfnSnapshotPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnSnapshotPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSnapshotMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::RedshiftServerless::Snapshot`.
      *