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

package/lib/services/aws-memorydb/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-memorydb");
 /**
  * Specifies an Access Control List.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-memorydb");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-acl.html
  */
-class CfnACLPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnACLPropsMixin", version: "2.240.0-alpha.0" };
+class CfnACLPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnACLPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["aclName", "tags", "userNames"];
     props;
     strategy;
@@ -43,7 +41,7 @@ class CfnACLPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -56,12 +54,7 @@ class CfnACLPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnACLPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnACLPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnACLPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -76,8 +69,8 @@ exports.CfnACLPropsMixin = CfnACLPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html
  */
-class CfnClusterPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnClusterPropsMixin", version: "2.240.0-alpha.0" };
+class CfnClusterPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["aclName", "autoMinorVersionUpgrade", "clusterEndpoint", "clusterName", "dataTiering", "description", "engine", "engineVersion", "finalSnapshotName", "ipDiscovery", "kmsKeyId", "maintenanceWindow", "multiRegionClusterName", "networkType", "nodeType", "numReplicasPerShard", "numShards", "parameterGroupName", "port", "securityGroupIds", "snapshotArns", "snapshotName", "snapshotRetentionLimit", "snapshotWindow", "snsTopicArn", "snsTopicStatus", "subnetGroupName", "tags", "tlsEnabled"];
     props;
     strategy;
@@ -99,8 +92,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
@@ -113,16 +109,18 @@ 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 flattenCfnClusterMixinProps(props) {
+    const ret = {};
+    if ((props.securityGroupIds !== undefined))
+        ret.securityGroupIds = cdk.mapArrayInPlace(props.securityGroupIds, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroupIds", "ec2.ISecurityGroupRef | string"));
+    return ret;
+}
 /**
  * Specifies a new MemoryDB parameter group.
  *
@@ -133,8 +131,8 @@ exports.CfnClusterPropsMixin = CfnClusterPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-parametergroup.html
  */
-class CfnParameterGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnParameterGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnParameterGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnParameterGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "family", "parameterGroupName", "parameters", "tags"];
     props;
     strategy;
@@ -157,7 +155,7 @@ class CfnParameterGroupPropsMixin 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
@@ -170,12 +168,7 @@ class CfnParameterGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnParameterGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -190,8 +183,8 @@ exports.CfnParameterGroupPropsMixin = CfnParameterGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-subnetgroup.html
  */
-class CfnSubnetGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnSubnetGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnSubnetGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnSubnetGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "subnetGroupName", "subnetIds", "tags"];
     props;
     strategy;
@@ -213,8 +206,11 @@ class CfnSubnetGroupPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSubnetGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -227,16 +223,18 @@ class CfnSubnetGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSubnetGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSubnetGroupPropsMixin = CfnSubnetGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSubnetGroupMixinProps(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;
+}
 /**
  * Specifies a MemoryDB user.
  *
@@ -247,8 +245,8 @@ exports.CfnSubnetGroupPropsMixin = CfnSubnetGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-user.html
  */
-class CfnUserPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnUserPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnUserPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessString", "authenticationMode", "tags", "userName"];
     props;
     strategy;
@@ -271,7 +269,7 @@ class CfnUserPropsMixin 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
@@ -284,12 +282,7 @@ class CfnUserPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -302,8 +295,8 @@ exports.CfnUserPropsMixin = CfnUserPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-multiregioncluster.html
  */
-class CfnMultiRegionClusterPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnMultiRegionClusterPropsMixin", version: "2.240.0-alpha.0" };
+class CfnMultiRegionClusterPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_memorydb.mixins.CfnMultiRegionClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "engine", "engineVersion", "multiRegionClusterNameSuffix", "multiRegionParameterGroupName", "nodeType", "numShards", "tags", "tlsEnabled", "updateStrategy"];
     props;
     strategy;
@@ -326,7 +319,7 @@ class CfnMultiRegionClusterPropsMixin 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
@@ -339,12 +332,7 @@ class CfnMultiRegionClusterPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMultiRegionClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMultiRegionClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMultiRegionClusterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -1,6 +1,5 @@
 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-mpa";
 /**
@@ -13,10 +12,10 @@ import * as service from "aws-cdk-lib/aws-mpa";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mpa-approvalteam.html
  */
-export declare class CfnApprovalTeamPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnApprovalTeamPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnApprovalTeamMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::MPA::ApprovalTeam`.
      *
@@ -180,10 +179,10 @@ export interface CfnApprovalTeamMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mpa-identitysource.html
  */
-export declare class CfnIdentitySourcePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnIdentitySourcePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIdentitySourceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::MPA::IdentitySource`.
      *

package/lib/services/aws-mpa/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-mpa");
 /**
  * Creates a new approval team.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-mpa");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mpa-approvalteam.html
  */
-class CfnApprovalTeamPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_mpa.mixins.CfnApprovalTeamPropsMixin", version: "2.240.0-alpha.0" };
+class CfnApprovalTeamPropsMixin extends cdk.Mixin {
+    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;
@@ -43,7 +41,7 @@ class CfnApprovalTeamPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -56,12 +54,7 @@ class CfnApprovalTeamPropsMixin extends core.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,8 +69,8 @@ exports.CfnApprovalTeamPropsMixin = CfnApprovalTeamPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mpa-identitysource.html
  */
-class CfnIdentitySourcePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_mpa.mixins.CfnIdentitySourcePropsMixin", version: "2.240.0-alpha.0" };
+class CfnIdentitySourcePropsMixin extends cdk.Mixin {
+    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;
@@ -100,7 +93,7 @@ class CfnIdentitySourcePropsMixin 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
@@ -113,12 +106,7 @@ class CfnIdentitySourcePropsMixin extends core.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

@@ -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-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.
  *
@@ -11,10 +11,10 @@ import * as service from "aws-cdk-lib/aws-msk";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-batchscramsecret.html
  */
-export declare class CfnBatchScramSecretPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -60,10 +60,10 @@ export interface CfnBatchScramSecretMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html
  */
-export declare class CfnClusterPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -119,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.
@@ -233,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.
          *
@@ -266,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.
          *
@@ -302,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.
          *
@@ -621,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.
          *
@@ -740,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
@@ -853,10 +853,10 @@ export interface CfnClusterMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-clusterpolicy.html
  */
-export declare class CfnClusterPolicyPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -915,10 +915,10 @@ export interface CfnClusterPolicyMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-configuration.html
  */
-export declare class CfnConfigurationPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -1019,10 +1019,10 @@ export interface CfnConfigurationMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-serverlesscluster.html
  */
-export declare class CfnServerlessClusterPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -1049,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.
@@ -1146,10 +1146,10 @@ export interface CfnServerlessClusterMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-vpcconnection.html
  */
-export declare class CfnVpcConnectionPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -1219,10 +1219,10 @@ export interface CfnVpcConnectionMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-replicator.html
  */
-export declare class CfnReplicatorPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *
@@ -1508,10 +1508,10 @@ export interface CfnReplicatorMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-topic.html
  */
-export declare class CfnTopicPropsMixin extends core.Mixin implements core.IMixin {
+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`.
      *