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

package/lib/services/aws-mpa/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-mpa");
 /**
  * Creates a new approval team.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-mpa");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mpa-approvalteam.html
  */
 class CfnApprovalTeamPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_mpa.mixins.CfnApprovalTeamPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_mpa.mixins.CfnApprovalTeamPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["approvalStrategy", "approvers", "description", "name", "policies", "tags"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnApprovalTeamPropsMixin 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 CfnApprovalTeamPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnApprovalTeamPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnApprovalTeamPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnApprovalTeamPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -76,7 +70,7 @@ exports.CfnApprovalTeamPropsMixin = CfnApprovalTeamPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mpa-identitysource.html
  */
 class CfnIdentitySourcePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_mpa.mixins.CfnIdentitySourcePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_mpa.mixins.CfnIdentitySourcePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["identitySourceParameters", "tags"];
     props;
     strategy;
@@ -99,7 +93,7 @@ class CfnIdentitySourcePropsMixin 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
@@ -112,12 +106,7 @@ class CfnIdentitySourcePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIdentitySourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIdentitySourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIdentitySourcePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -2,6 +2,7 @@ import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-msk";
+import { aws_acmpca as acmpcaRefs, aws_ec2 as ec2Refs, aws_kms as kmsRefs, aws_logs as logsRefs, aws_msk as mskRefs } from "aws-cdk-lib/interfaces";
 /**
  * Represents a secret stored in the AWS Secrets Manager that can be used to authenticate with a cluster using a user name and a password.
  *
@@ -13,7 +14,7 @@ import * as service from "aws-cdk-lib/aws-msk";
 export declare class CfnBatchScramSecretPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnBatchScramSecretMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::MSK::BatchScramSecret`.
      *
@@ -62,7 +63,7 @@ export interface CfnBatchScramSecretMixinProps {
 export declare class CfnClusterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnClusterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::MSK::Cluster`.
      *
@@ -118,7 +119,7 @@ export declare namespace CfnClusterPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-encryptionatrest.html#cfn-msk-cluster-encryptionatrest-datavolumekmskeyid
          */
-        readonly dataVolumeKmsKeyId?: string;
+        readonly dataVolumeKmsKeyId?: kmsRefs.IKeyRef | string;
     }
     /**
      * The settings for encrypting data in transit.
@@ -232,7 +233,7 @@ export declare namespace CfnClusterPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-configurationinfo.html#cfn-msk-cluster-configurationinfo-arn
          */
-        readonly arn?: string;
+        readonly arn?: mskRefs.IConfigurationRef | string;
         /**
          * The revision of the configuration to use.
          *
@@ -265,7 +266,7 @@ export declare namespace CfnClusterPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokernodegroupinfo.html#cfn-msk-cluster-brokernodegroupinfo-clientsubnets
          */
-        readonly clientSubnets?: Array<string>;
+        readonly clientSubnets?: Array<ec2Refs.ISubnetRef | string>;
         /**
          * Information about the cluster's connectivity setting.
          *
@@ -301,7 +302,7 @@ export declare namespace CfnClusterPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokernodegroupinfo.html#cfn-msk-cluster-brokernodegroupinfo-securitygroups
          */
-        readonly securityGroups?: Array<string>;
+        readonly securityGroups?: Array<ec2Refs.ISecurityGroupRef | string>;
         /**
          * Contains information about storage volumes attached to Amazon MSK broker nodes.
          *
@@ -620,7 +621,7 @@ export declare namespace CfnClusterPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-tls.html#cfn-msk-cluster-tls-certificateauthorityarnlist
          */
-        readonly certificateAuthorityArnList?: Array<string>;
+        readonly certificateAuthorityArnList?: Array<acmpcaRefs.ICertificateAuthorityRef | string>;
         /**
          * TLS authentication is enabled or not.
          *
@@ -739,7 +740,7 @@ export declare namespace CfnClusterPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-cloudwatchlogs.html#cfn-msk-cluster-cloudwatchlogs-loggroup
          */
-        readonly logGroup?: string;
+        readonly logGroup?: logsRefs.ILogGroupRef | string;
     }
     /**
      * @struct
@@ -855,7 +856,7 @@ export interface CfnClusterMixinProps {
 export declare class CfnClusterPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnClusterPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::MSK::ClusterPolicy`.
      *
@@ -917,7 +918,7 @@ export interface CfnClusterPolicyMixinProps {
 export declare class CfnConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::MSK::Configuration`.
      *
@@ -1021,7 +1022,7 @@ export interface CfnConfigurationMixinProps {
 export declare class CfnServerlessClusterPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnServerlessClusterMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::MSK::ServerlessCluster`.
      *
@@ -1048,11 +1049,11 @@ export declare namespace CfnServerlessClusterPropsMixin {
         /**
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-serverlesscluster-vpcconfig.html#cfn-msk-serverlesscluster-vpcconfig-securitygroups
          */
-        readonly securityGroups?: Array<string>;
+        readonly securityGroups?: Array<ec2Refs.ISecurityGroupRef | string>;
         /**
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-serverlesscluster-vpcconfig.html#cfn-msk-serverlesscluster-vpcconfig-subnetids
          */
-        readonly subnetIds?: Array<string>;
+        readonly subnetIds?: Array<ec2Refs.ISubnetRef | string>;
     }
     /**
      * Includes all client authentication information.
@@ -1148,7 +1149,7 @@ export interface CfnServerlessClusterMixinProps {
 export declare class CfnVpcConnectionPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnVpcConnectionMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::MSK::VpcConnection`.
      *
@@ -1221,7 +1222,7 @@ export interface CfnVpcConnectionMixinProps {
 export declare class CfnReplicatorPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnReplicatorMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::MSK::Replicator`.
      *
@@ -1510,7 +1511,7 @@ export interface CfnReplicatorMixinProps {
 export declare class CfnTopicPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTopicMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::MSK::Topic`.
      *

package/lib/services/aws-msk/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-msk");
 /**
  * Represents a secret stored in the AWS Secrets Manager that can be used to authenticate with a cluster using a user name and a password.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-msk");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-batchscramsecret.html
  */
 class CfnBatchScramSecretPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnBatchScramSecretPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnBatchScramSecretPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clusterArn", "secretArnList"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnBatchScramSecretPropsMixin 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 CfnBatchScramSecretPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnBatchScramSecretPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnBatchScramSecretPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnBatchScramSecretPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -72,7 +66,7 @@ exports.CfnBatchScramSecretPropsMixin = CfnBatchScramSecretPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html
  */
 class CfnClusterPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnClusterPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["brokerNodeGroupInfo", "clientAuthentication", "clusterName", "configurationInfo", "currentVersion", "encryptionInfo", "enhancedMonitoring", "kafkaVersion", "loggingInfo", "numberOfBrokerNodes", "openMonitoring", "rebalancing", "storageMode", "tags"];
     props;
     strategy;
@@ -94,8 +88,11 @@ class CfnClusterPropsMixin extends cdk.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
@@ -108,16 +105,111 @@ class CfnClusterPropsMixin extends cdk.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 flattenCfnClusterPropsMixinEncryptionAtRestProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        dataVolumeKmsKeyId: (!props.dataVolumeKmsKeyId ? undefined : cdk.getRefProperty(props.dataVolumeKmsKeyId?.keyRef, 'keyArn') ?? cdk.getRefProperty(props.dataVolumeKmsKeyId?.keyRef, 'keyId') ?? cdk.ensureStringOrUndefined(props.dataVolumeKmsKeyId, "dataVolumeKmsKeyId", "kms.IKeyRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterPropsMixinEncryptionInfoProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        encryptionAtRest: (!props.encryptionAtRest ? undefined : (!props.encryptionAtRest ? undefined : flattenCfnClusterPropsMixinEncryptionAtRestProperty(props.encryptionAtRest))),
+        encryptionInTransit: (!props.encryptionInTransit ? undefined : props.encryptionInTransit)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterPropsMixinConfigurationInfoProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        arn: (!props.arn ? undefined : cdk.getRefProperty(props.arn?.configurationRef, 'configurationArn') ?? cdk.ensureStringOrUndefined(props.arn, "arn", "msk.IConfigurationRef | string")),
+        revision: (!props.revision ? undefined : props.revision)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterPropsMixinBrokerNodeGroupInfoProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        brokerAzDistribution: (!props.brokerAzDistribution ? undefined : props.brokerAzDistribution),
+        clientSubnets: (!props.clientSubnets ? undefined : cdk.mapArrayInPlace(props.clientSubnets, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "clientSubnets", "ec2.ISubnetRef | string"))),
+        connectivityInfo: (!props.connectivityInfo ? undefined : props.connectivityInfo),
+        instanceType: (!props.instanceType ? undefined : props.instanceType),
+        securityGroups: (!props.securityGroups ? undefined : cdk.mapArrayInPlace(props.securityGroups, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroups", "ec2.ISecurityGroupRef | string"))),
+        storageInfo: (!props.storageInfo ? undefined : props.storageInfo)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterPropsMixinTlsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        certificateAuthorityArnList: (!props.certificateAuthorityArnList ? undefined : cdk.mapArrayInPlace(props.certificateAuthorityArnList, (item) => cdk.getRefProperty(item?.certificateAuthorityRef, 'certificateAuthorityArn') ?? cdk.ensureStringOrUndefined(item, "certificateAuthorityArnList", "acmpca.ICertificateAuthorityRef | string"))),
+        enabled: (!props.enabled ? undefined : props.enabled)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterPropsMixinClientAuthenticationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        sasl: (!props.sasl ? undefined : props.sasl),
+        tls: (!props.tls ? undefined : (!props.tls ? undefined : flattenCfnClusterPropsMixinTlsProperty(props.tls))),
+        unauthenticated: (!props.unauthenticated ? undefined : props.unauthenticated)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterPropsMixinCloudWatchLogsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        enabled: (!props.enabled ? undefined : props.enabled),
+        logGroup: (!props.logGroup ? undefined : cdk.getRefProperty(props.logGroup?.logGroupRef, 'logGroupName') ?? cdk.ensureStringOrUndefined(props.logGroup, "logGroup", "logs.ILogGroupRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterPropsMixinBrokerLogsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        cloudWatchLogs: (!props.cloudWatchLogs ? undefined : (!props.cloudWatchLogs ? undefined : flattenCfnClusterPropsMixinCloudWatchLogsProperty(props.cloudWatchLogs))),
+        firehose: (!props.firehose ? undefined : props.firehose),
+        s3: (!props.s3 ? undefined : props.s3)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterPropsMixinLoggingInfoProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        brokerLogs: (!props.brokerLogs ? undefined : flattenCfnClusterPropsMixinBrokerLogsProperty(props.brokerLogs))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnClusterMixinProps(props) {
+    const ret = {};
+    if ((props.brokerNodeGroupInfo !== undefined))
+        ret.brokerNodeGroupInfo = flattenCfnClusterPropsMixinBrokerNodeGroupInfoProperty(props.brokerNodeGroupInfo);
+    if ((props.clientAuthentication !== undefined))
+        ret.clientAuthentication = flattenCfnClusterPropsMixinClientAuthenticationProperty(props.clientAuthentication);
+    if ((props.configurationInfo !== undefined))
+        ret.configurationInfo = flattenCfnClusterPropsMixinConfigurationInfoProperty(props.configurationInfo);
+    if ((props.encryptionInfo !== undefined))
+        ret.encryptionInfo = flattenCfnClusterPropsMixinEncryptionInfoProperty(props.encryptionInfo);
+    if ((props.loggingInfo !== undefined))
+        ret.loggingInfo = flattenCfnClusterPropsMixinLoggingInfoProperty(props.loggingInfo);
+    return ret;
+}
 /**
  * Create or update cluster policy.
  *
@@ -127,7 +219,7 @@ exports.CfnClusterPropsMixin = CfnClusterPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-clusterpolicy.html
  */
 class CfnClusterPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnClusterPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnClusterPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clusterArn", "policy"];
     props;
     strategy;
@@ -150,7 +242,7 @@ class CfnClusterPolicyPropsMixin 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
@@ -163,12 +255,7 @@ class CfnClusterPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClusterPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClusterPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClusterPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -193,7 +280,7 @@ exports.CfnClusterPolicyPropsMixin = CfnClusterPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-configuration.html
  */
 class CfnConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "kafkaVersionsList", "latestRevision", "name", "serverProperties"];
     props;
     strategy;
@@ -216,7 +303,7 @@ class CfnConfigurationPropsMixin 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
@@ -229,12 +316,7 @@ class CfnConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -248,7 +330,7 @@ exports.CfnConfigurationPropsMixin = CfnConfigurationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-serverlesscluster.html
  */
 class CfnServerlessClusterPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnServerlessClusterPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnServerlessClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clientAuthentication", "clusterName", "tags", "vpcConfigs"];
     props;
     strategy;
@@ -270,8 +352,11 @@ class CfnServerlessClusterPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnServerlessClusterMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -284,16 +369,27 @@ class CfnServerlessClusterPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnServerlessClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnServerlessClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnServerlessClusterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnServerlessClusterPropsMixin = CfnServerlessClusterPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnServerlessClusterPropsMixinVpcConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        securityGroups: (!props.securityGroups ? undefined : cdk.mapArrayInPlace(props.securityGroups, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroups", "ec2.ISecurityGroupRef | string"))),
+        subnetIds: (!props.subnetIds ? undefined : cdk.mapArrayInPlace(props.subnetIds, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnetIds", "ec2.ISubnetRef | string")))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnServerlessClusterMixinProps(props) {
+    const ret = {};
+    if ((props.vpcConfigs !== undefined))
+        ret.vpcConfigs = (cdk.isResolvableObject(props.vpcConfigs) ? props.vpcConfigs : cdk.mapArrayInPlace(props.vpcConfigs, (item) => flattenCfnServerlessClusterPropsMixinVpcConfigProperty(item)));
+    return ret;
+}
 /**
  * Create remote VPC connection.
  *
@@ -303,7 +399,7 @@ exports.CfnServerlessClusterPropsMixin = CfnServerlessClusterPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-vpcconnection.html
  */
 class CfnVpcConnectionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnVpcConnectionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnVpcConnectionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["authentication", "clientSubnets", "securityGroups", "tags", "targetClusterArn", "vpcId"];
     props;
     strategy;
@@ -326,7 +422,7 @@ class CfnVpcConnectionPropsMixin 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
@@ -339,12 +435,7 @@ class CfnVpcConnectionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVpcConnectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVpcConnectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVpcConnectionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -358,7 +449,7 @@ exports.CfnVpcConnectionPropsMixin = CfnVpcConnectionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-replicator.html
  */
 class CfnReplicatorPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnReplicatorPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnReplicatorPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "kafkaClusters", "replicationInfoList", "replicatorName", "serviceExecutionRoleArn", "tags"];
     props;
     strategy;
@@ -381,7 +472,7 @@ class CfnReplicatorPropsMixin 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
@@ -394,12 +485,7 @@ class CfnReplicatorPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnReplicatorPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnReplicatorPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnReplicatorPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -413,7 +499,7 @@ exports.CfnReplicatorPropsMixin = CfnReplicatorPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-topic.html
  */
 class CfnTopicPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnTopicPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_msk.mixins.CfnTopicPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clusterArn", "configs", "partitionCount", "replicationFactor", "topicName"];
     props;
     strategy;
@@ -436,7 +522,7 @@ class CfnTopicPropsMixin 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
@@ -449,12 +535,7 @@ class CfnTopicPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTopicPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTopicPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTopicPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }