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

package/lib/services/aws-iam/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-iam");
 /**
  * Creates a new AWS secret access key and corresponding AWS access key ID for the specified user.
@@ -23,7 +22,7 @@ const service = require("aws-cdk-lib/aws-iam");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-accesskey.html
  */
 class CfnAccessKeyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnAccessKeyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnAccessKeyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["serial", "status", "userName"];
     props;
     strategy;
@@ -46,7 +45,7 @@ class CfnAccessKeyPropsMixin 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
@@ -59,12 +58,7 @@ class CfnAccessKeyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccessKeyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccessKeyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccessKeyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -80,7 +74,7 @@ exports.CfnAccessKeyPropsMixin = CfnAccessKeyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-group.html
  */
 class CfnGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["groupName", "managedPolicyArns", "path", "policies"];
     props;
     strategy;
@@ -102,8 +96,11 @@ class CfnGroupPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -116,16 +113,18 @@ class CfnGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnGroupPropsMixin = CfnGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnGroupMixinProps(props) {
+    const ret = {};
+    if ((props.managedPolicyArns !== undefined))
+        ret.managedPolicyArns = cdk.mapArrayInPlace(props.managedPolicyArns, (item) => cdk.getRefProperty(item?.managedPolicyRef, 'policyArn') ?? cdk.ensureStringOrUndefined(item, "managedPolicyArns", "iam.IManagedPolicyRef | string"));
+    return ret;
+}
 /**
  * Adds or updates an inline policy document that is embedded in the specified IAM group.
  *
@@ -139,7 +138,7 @@ exports.CfnGroupPropsMixin = CfnGroupPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-grouppolicy.html
  */
 class CfnGroupPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnGroupPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnGroupPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["groupName", "policyDocument", "policyName"];
     props;
     strategy;
@@ -162,7 +161,7 @@ class CfnGroupPolicyPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -175,12 +174,7 @@ class CfnGroupPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGroupPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGroupPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGroupPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -196,7 +190,7 @@ exports.CfnGroupPolicyPropsMixin = CfnGroupPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html
  */
 class CfnInstanceProfilePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnInstanceProfilePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnInstanceProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["instanceProfileName", "path", "roles"];
     props;
     strategy;
@@ -218,8 +212,11 @@ class CfnInstanceProfilePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnInstanceProfileMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -232,16 +229,18 @@ class CfnInstanceProfilePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInstanceProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInstanceProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInstanceProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnInstanceProfilePropsMixin = CfnInstanceProfilePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnInstanceProfileMixinProps(props) {
+    const ret = {};
+    if ((props.roles !== undefined))
+        ret.roles = cdk.mapArrayInPlace(props.roles, (item) => cdk.getRefProperty(item?.roleRef, 'roleName') ?? cdk.ensureStringOrUndefined(item, "roles", "iam.IRoleRef | string"));
+    return ret;
+}
 /**
  * Creates a new managed policy for your AWS account .
  *
@@ -257,7 +256,7 @@ exports.CfnInstanceProfilePropsMixin = CfnInstanceProfilePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html
  */
 class CfnManagedPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnManagedPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnManagedPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "groups", "managedPolicyName", "path", "policyDocument", "roles", "users"];
     props;
     strategy;
@@ -279,8 +278,11 @@ class CfnManagedPolicyPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnManagedPolicyMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -293,16 +295,22 @@ class CfnManagedPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnManagedPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnManagedPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnManagedPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnManagedPolicyPropsMixin = CfnManagedPolicyPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnManagedPolicyMixinProps(props) {
+    const ret = {};
+    if ((props.groups !== undefined))
+        ret.groups = cdk.mapArrayInPlace(props.groups, (item) => cdk.getRefProperty(item?.groupRef, 'groupName') ?? cdk.ensureStringOrUndefined(item, "groups", "iam.IGroupRef | string"));
+    if ((props.roles !== undefined))
+        ret.roles = cdk.mapArrayInPlace(props.roles, (item) => cdk.getRefProperty(item?.roleRef, 'roleName') ?? cdk.ensureStringOrUndefined(item, "roles", "iam.IRoleRef | string"));
+    if ((props.users !== undefined))
+        ret.users = cdk.mapArrayInPlace(props.users, (item) => cdk.getRefProperty(item?.userRef, 'userName') ?? cdk.ensureStringOrUndefined(item, "users", "iam.IUserRef | string"));
+    return ret;
+}
 /**
  * Creates or updates an IAM entity to describe an identity provider (IdP) that supports [OpenID Connect (OIDC)](https://docs.aws.amazon.com/http://openid.net/connect/) .
  *
@@ -332,7 +340,7 @@ exports.CfnManagedPolicyPropsMixin = CfnManagedPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-oidcprovider.html
  */
 class CfnOIDCProviderPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnOIDCProviderPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnOIDCProviderPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clientIdList", "tags", "thumbprintList", "url"];
     props;
     strategy;
@@ -355,7 +363,7 @@ class CfnOIDCProviderPropsMixin 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
@@ -368,12 +376,7 @@ class CfnOIDCProviderPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnOIDCProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnOIDCProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnOIDCProviderPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -401,7 +404,7 @@ exports.CfnOIDCProviderPropsMixin = CfnOIDCProviderPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html
  */
 class CfnPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["groups", "policyDocument", "policyName", "roles", "users"];
     props;
     strategy;
@@ -424,7 +427,7 @@ class CfnPolicyPropsMixin 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
@@ -437,12 +440,7 @@ class CfnPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -458,7 +456,7 @@ exports.CfnPolicyPropsMixin = CfnPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html
  */
 class CfnRolePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnRolePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnRolePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["assumeRolePolicyDocument", "description", "managedPolicyArns", "maxSessionDuration", "path", "permissionsBoundary", "policies", "roleName", "tags"];
     props;
     strategy;
@@ -480,8 +478,11 @@ class CfnRolePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnRoleMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -494,16 +495,20 @@ class CfnRolePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRolePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRolePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRolePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnRolePropsMixin = CfnRolePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnRoleMixinProps(props) {
+    const ret = {};
+    if ((props.managedPolicyArns !== undefined))
+        ret.managedPolicyArns = cdk.mapArrayInPlace(props.managedPolicyArns, (item) => cdk.getRefProperty(item?.managedPolicyRef, 'policyArn') ?? cdk.ensureStringOrUndefined(item, "managedPolicyArns", "iam.IManagedPolicyRef | string"));
+    if ((props.permissionsBoundary !== undefined))
+        ret.permissionsBoundary = cdk.getRefProperty(props.permissionsBoundary?.managedPolicyRef, 'policyArn') ?? cdk.ensureStringOrUndefined(props.permissionsBoundary, "permissionsBoundary", "iam.IManagedPolicyRef | string");
+    return ret;
+}
 /**
  * Adds or updates an inline policy document that is embedded in the specified IAM role.
  *
@@ -519,7 +524,7 @@ exports.CfnRolePropsMixin = CfnRolePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-rolepolicy.html
  */
 class CfnRolePolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnRolePolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnRolePolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["policyDocument", "policyName", "roleName"];
     props;
     strategy;
@@ -542,7 +547,7 @@ class CfnRolePolicyPropsMixin 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
@@ -555,12 +560,7 @@ class CfnRolePolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRolePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRolePolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRolePolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -582,7 +582,7 @@ exports.CfnRolePolicyPropsMixin = CfnRolePolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-samlprovider.html
  */
 class CfnSAMLProviderPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnSAMLProviderPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnSAMLProviderPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["addPrivateKey", "assertionEncryptionMode", "name", "privateKeyList", "removePrivateKey", "samlMetadataDocument", "tags"];
     props;
     strategy;
@@ -605,7 +605,7 @@ class CfnSAMLProviderPropsMixin 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
@@ -618,12 +618,7 @@ class CfnSAMLProviderPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSAMLProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSAMLProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSAMLProviderPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -647,7 +642,7 @@ exports.CfnSAMLProviderPropsMixin = CfnSAMLProviderPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servercertificate.html
  */
 class CfnServerCertificatePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnServerCertificatePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnServerCertificatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["certificateBody", "certificateChain", "path", "privateKey", "serverCertificateName", "tags"];
     props;
     strategy;
@@ -670,7 +665,7 @@ class CfnServerCertificatePropsMixin 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
@@ -683,12 +678,7 @@ class CfnServerCertificatePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnServerCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnServerCertificatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnServerCertificatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -706,7 +696,7 @@ exports.CfnServerCertificatePropsMixin = CfnServerCertificatePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servicelinkedrole.html
  */
 class CfnServiceLinkedRolePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnServiceLinkedRolePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnServiceLinkedRolePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["awsServiceName", "customSuffix", "description"];
     props;
     strategy;
@@ -729,7 +719,7 @@ class CfnServiceLinkedRolePropsMixin 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
@@ -742,12 +732,7 @@ class CfnServiceLinkedRolePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnServiceLinkedRolePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnServiceLinkedRolePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnServiceLinkedRolePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -763,7 +748,7 @@ exports.CfnServiceLinkedRolePropsMixin = CfnServiceLinkedRolePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-user.html
  */
 class CfnUserPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnUserPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnUserPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["groups", "loginProfile", "managedPolicyArns", "path", "permissionsBoundary", "policies", "tags", "userName"];
     props;
     strategy;
@@ -785,8 +770,11 @@ class CfnUserPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUserMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -799,16 +787,22 @@ class CfnUserPropsMixin extends cdk.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);
         }
     }
 }
 exports.CfnUserPropsMixin = CfnUserPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUserMixinProps(props) {
+    const ret = {};
+    if ((props.groups !== undefined))
+        ret.groups = cdk.mapArrayInPlace(props.groups, (item) => cdk.getRefProperty(item?.groupRef, 'groupName') ?? cdk.ensureStringOrUndefined(item, "groups", "iam.IGroupRef | string"));
+    if ((props.managedPolicyArns !== undefined))
+        ret.managedPolicyArns = cdk.mapArrayInPlace(props.managedPolicyArns, (item) => cdk.getRefProperty(item?.managedPolicyRef, 'policyArn') ?? cdk.ensureStringOrUndefined(item, "managedPolicyArns", "iam.IManagedPolicyRef | string"));
+    if ((props.permissionsBoundary !== undefined))
+        ret.permissionsBoundary = cdk.getRefProperty(props.permissionsBoundary?.managedPolicyRef, 'policyArn') ?? cdk.ensureStringOrUndefined(props.permissionsBoundary, "permissionsBoundary", "iam.IManagedPolicyRef | string");
+    return ret;
+}
 /**
  * Adds or updates an inline policy document that is embedded in the specified IAM user.
  *
@@ -822,7 +816,7 @@ exports.CfnUserPropsMixin = CfnUserPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-userpolicy.html
  */
 class CfnUserPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnUserPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnUserPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["policyDocument", "policyName", "userName"];
     props;
     strategy;
@@ -845,7 +839,7 @@ class CfnUserPolicyPropsMixin 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
@@ -858,12 +852,7 @@ class CfnUserPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -877,7 +866,7 @@ exports.CfnUserPolicyPropsMixin = CfnUserPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-usertogroupaddition.html
  */
 class CfnUserToGroupAdditionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnUserToGroupAdditionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnUserToGroupAdditionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["groupName", "users"];
     props;
     strategy;
@@ -900,7 +889,7 @@ class CfnUserToGroupAdditionPropsMixin 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
@@ -913,12 +902,7 @@ class CfnUserToGroupAdditionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserToGroupAdditionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserToGroupAdditionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserToGroupAdditionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -938,7 +922,7 @@ exports.CfnUserToGroupAdditionPropsMixin = CfnUserToGroupAdditionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-virtualmfadevice.html
  */
 class CfnVirtualMFADevicePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnVirtualMFADevicePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iam.mixins.CfnVirtualMFADevicePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["path", "tags", "users", "virtualMfaDeviceName"];
     props;
     strategy;
@@ -961,7 +945,7 @@ class CfnVirtualMFADevicePropsMixin 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
@@ -974,12 +958,7 @@ class CfnVirtualMFADevicePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnVirtualMFADevicePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnVirtualMFADevicePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnVirtualMFADevicePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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

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

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

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

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-identitystore";
 export declare class CfnGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IdentityStore::Group`.
      *
@@ -74,7 +74,7 @@ export interface CfnGroupMixinProps {
 export declare class CfnGroupMembershipPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGroupMembershipMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IdentityStore::GroupMembership`.
      *