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

package/lib/services/aws-cognito/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-cognito");
 /**
  * The `AWS::Cognito::IdentityPool` resource creates an Amazon Cognito identity pool.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-cognito");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html
  */
-class CfnIdentityPoolPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnIdentityPoolPropsMixin", version: "2.240.0-alpha.0" };
+class CfnIdentityPoolPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnIdentityPoolPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allowClassicFlow", "allowUnauthenticatedIdentities", "cognitoEvents", "cognitoIdentityProviders", "cognitoStreams", "developerProviderName", "identityPoolName", "identityPoolTags", "openIdConnectProviderArns", "pushSync", "samlProviderArns", "supportedLoginProviders"];
     props;
     strategy;
@@ -42,8 +40,11 @@ class CfnIdentityPoolPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnIdentityPoolMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -56,16 +57,30 @@ class CfnIdentityPoolPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIdentityPoolPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIdentityPoolPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIdentityPoolPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnIdentityPoolPropsMixin = CfnIdentityPoolPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnIdentityPoolPropsMixinCognitoIdentityProviderProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        clientId: (!props.clientId ? undefined : cdk.getRefProperty(props.clientId?.userPoolClientRef, 'clientId') ?? cdk.ensureStringOrUndefined(props.clientId, "clientId", "cognito.IUserPoolClientRef | string")),
+        providerName: (!props.providerName ? undefined : props.providerName),
+        serverSideTokenCheck: (!props.serverSideTokenCheck ? undefined : props.serverSideTokenCheck)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnIdentityPoolMixinProps(props) {
+    const ret = {};
+    if ((props.cognitoIdentityProviders !== undefined))
+        ret.cognitoIdentityProviders = (cdk.isResolvableObject(props.cognitoIdentityProviders) ? props.cognitoIdentityProviders : cdk.mapArrayInPlace(props.cognitoIdentityProviders, (item) => flattenCfnIdentityPoolPropsMixinCognitoIdentityProviderProperty(item)));
+    if ((props.openIdConnectProviderArns !== undefined))
+        ret.openIdConnectProviderArns = cdk.mapArrayInPlace(props.openIdConnectProviderArns, (item) => cdk.getRefProperty(item?.oidcProviderRef, 'oidcProviderArn') ?? cdk.ensureStringOrUndefined(item, "openIdConnectProviderArns", "iam.IOIDCProviderRef | string"));
+    return ret;
+}
 /**
  * A list of the identity pool principal tag assignments for attributes for access control.
  *
@@ -74,8 +89,8 @@ exports.CfnIdentityPoolPropsMixin = CfnIdentityPoolPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolprincipaltag.html
  */
-class CfnIdentityPoolPrincipalTagPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnIdentityPoolPrincipalTagPropsMixin", version: "2.240.0-alpha.0" };
+class CfnIdentityPoolPrincipalTagPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnIdentityPoolPrincipalTagPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["identityPoolId", "identityProviderName", "principalTags", "useDefaults"];
     props;
     strategy;
@@ -98,7 +113,7 @@ class CfnIdentityPoolPrincipalTagPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -111,12 +126,7 @@ class CfnIdentityPoolPrincipalTagPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIdentityPoolPrincipalTagPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIdentityPoolPrincipalTagPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIdentityPoolPrincipalTagPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -129,8 +139,8 @@ exports.CfnIdentityPoolPrincipalTagPropsMixin = CfnIdentityPoolPrincipalTagProps
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html
  */
-class CfnIdentityPoolRoleAttachmentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnIdentityPoolRoleAttachmentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnIdentityPoolRoleAttachmentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnIdentityPoolRoleAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["identityPoolId", "roleMappings", "roles"];
     props;
     strategy;
@@ -152,8 +162,11 @@ class CfnIdentityPoolRoleAttachmentPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnIdentityPoolRoleAttachmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -166,16 +179,18 @@ class CfnIdentityPoolRoleAttachmentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIdentityPoolRoleAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIdentityPoolRoleAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIdentityPoolRoleAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnIdentityPoolRoleAttachmentPropsMixin = CfnIdentityPoolRoleAttachmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnIdentityPoolRoleAttachmentMixinProps(props) {
+    const ret = {};
+    if ((props.identityPoolId !== undefined))
+        ret.identityPoolId = cdk.getRefProperty(props.identityPoolId?.identityPoolRef, 'identityPoolId') ?? cdk.ensureStringOrUndefined(props.identityPoolId, "identityPoolId", "cognito.IIdentityPoolRef | string");
+    return ret;
+}
 /**
  * The `AWS::Cognito::UserPool` resource creates an Amazon Cognito user pool.
  *
@@ -188,8 +203,8 @@ exports.CfnIdentityPoolRoleAttachmentPropsMixin = CfnIdentityPoolRoleAttachmentP
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html
  */
-class CfnUserPoolPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPoolPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accountRecoverySetting", "adminCreateUserConfig", "aliasAttributes", "autoVerifiedAttributes", "deletionProtection", "deviceConfiguration", "emailAuthenticationMessage", "emailAuthenticationSubject", "emailConfiguration", "emailVerificationMessage", "emailVerificationSubject", "enabledMfas", "lambdaConfig", "mfaConfiguration", "policies", "schema", "smsAuthenticationMessage", "smsConfiguration", "smsVerificationMessage", "userAttributeUpdateSettings", "usernameAttributes", "usernameConfiguration", "userPoolAddOns", "userPoolName", "userPoolTags", "userPoolTier", "verificationMessageTemplate", "webAuthnRelyingPartyId", "webAuthnUserVerification"];
     props;
     strategy;
@@ -211,8 +226,11 @@ class CfnUserPoolPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUserPoolMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -225,16 +243,61 @@ class CfnUserPoolPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPoolPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPoolPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPoolPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUserPoolPropsMixin = CfnUserPoolPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUserPoolPropsMixinSmsConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        externalId: (!props.externalId ? undefined : props.externalId),
+        snsCallerArn: (!props.snsCallerArn ? undefined : cdk.getRefProperty(props.snsCallerArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.snsCallerArn, "snsCallerArn", "iam.IRoleRef | string")),
+        snsRegion: (!props.snsRegion ? undefined : props.snsRegion)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnUserPoolPropsMixinCustomSMSSenderProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        lambdaArn: (!props.lambdaArn ? undefined : cdk.getRefProperty(props.lambdaArn?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.lambdaArn, "lambdaArn", "lambda.IFunctionRef | string")),
+        lambdaVersion: (!props.lambdaVersion ? undefined : props.lambdaVersion)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnUserPoolPropsMixinLambdaConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        createAuthChallenge: (!props.createAuthChallenge ? undefined : cdk.getRefProperty(props.createAuthChallenge?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.createAuthChallenge, "createAuthChallenge", "lambda.IFunctionRef | string")),
+        customEmailSender: (!props.customEmailSender ? undefined : props.customEmailSender),
+        customMessage: (!props.customMessage ? undefined : cdk.getRefProperty(props.customMessage?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.customMessage, "customMessage", "lambda.IFunctionRef | string")),
+        customSmsSender: (!props.customSmsSender ? undefined : (!props.customSmsSender ? undefined : flattenCfnUserPoolPropsMixinCustomSMSSenderProperty(props.customSmsSender))),
+        defineAuthChallenge: (!props.defineAuthChallenge ? undefined : cdk.getRefProperty(props.defineAuthChallenge?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.defineAuthChallenge, "defineAuthChallenge", "lambda.IFunctionRef | string")),
+        inboundFederation: (!props.inboundFederation ? undefined : props.inboundFederation),
+        kmsKeyId: (!props.kmsKeyId ? undefined : cdk.getRefProperty(props.kmsKeyId?.keyRef, 'keyArn') ?? cdk.ensureStringOrUndefined(props.kmsKeyId, "kmsKeyId", "kms.IKeyRef | string")),
+        postAuthentication: (!props.postAuthentication ? undefined : cdk.getRefProperty(props.postAuthentication?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.postAuthentication, "postAuthentication", "lambda.IFunctionRef | string")),
+        postConfirmation: (!props.postConfirmation ? undefined : cdk.getRefProperty(props.postConfirmation?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.postConfirmation, "postConfirmation", "lambda.IFunctionRef | string")),
+        preAuthentication: (!props.preAuthentication ? undefined : cdk.getRefProperty(props.preAuthentication?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.preAuthentication, "preAuthentication", "lambda.IFunctionRef | string")),
+        preSignUp: (!props.preSignUp ? undefined : cdk.getRefProperty(props.preSignUp?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.preSignUp, "preSignUp", "lambda.IFunctionRef | string")),
+        preTokenGeneration: (!props.preTokenGeneration ? undefined : cdk.getRefProperty(props.preTokenGeneration?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.preTokenGeneration, "preTokenGeneration", "lambda.IFunctionRef | string")),
+        preTokenGenerationConfig: (!props.preTokenGenerationConfig ? undefined : props.preTokenGenerationConfig),
+        userMigration: (!props.userMigration ? undefined : props.userMigration),
+        verifyAuthChallengeResponse: (!props.verifyAuthChallengeResponse ? undefined : cdk.getRefProperty(props.verifyAuthChallengeResponse?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.verifyAuthChallengeResponse, "verifyAuthChallengeResponse", "lambda.IFunctionRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnUserPoolMixinProps(props) {
+    const ret = {};
+    if ((props.lambdaConfig !== undefined))
+        ret.lambdaConfig = flattenCfnUserPoolPropsMixinLambdaConfigProperty(props.lambdaConfig);
+    if ((props.smsConfiguration !== undefined))
+        ret.smsConfiguration = flattenCfnUserPoolPropsMixinSmsConfigurationProperty(props.smsConfiguration);
+    return ret;
+}
 /**
  * The `AWS::Cognito::UserPoolClient` resource specifies an Amazon Cognito user pool client.
  *
@@ -245,8 +308,8 @@ exports.CfnUserPoolPropsMixin = CfnUserPoolPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html
  */
-class CfnUserPoolClientPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolClientPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPoolClientPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolClientPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessTokenValidity", "allowedOAuthFlows", "allowedOAuthFlowsUserPoolClient", "allowedOAuthScopes", "analyticsConfiguration", "authSessionValidity", "callbackUrLs", "clientName", "defaultRedirectUri", "enablePropagateAdditionalUserContextData", "enableTokenRevocation", "explicitAuthFlows", "generateSecret", "idTokenValidity", "logoutUrLs", "preventUserExistenceErrors", "readAttributes", "refreshTokenRotation", "refreshTokenValidity", "supportedIdentityProviders", "tokenValidityUnits", "userPoolId", "writeAttributes"];
     props;
     strategy;
@@ -268,8 +331,11 @@ class CfnUserPoolClientPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUserPoolClientMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -282,16 +348,32 @@ class CfnUserPoolClientPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPoolClientPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPoolClientPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPoolClientPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUserPoolClientPropsMixin = CfnUserPoolClientPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUserPoolClientPropsMixinAnalyticsConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        applicationArn: (!props.applicationArn ? undefined : props.applicationArn),
+        applicationId: (!props.applicationId ? undefined : props.applicationId),
+        externalId: (!props.externalId ? undefined : props.externalId),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string")),
+        userDataShared: (!props.userDataShared ? undefined : props.userDataShared)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnUserPoolClientMixinProps(props) {
+    const ret = {};
+    if ((props.analyticsConfiguration !== undefined))
+        ret.analyticsConfiguration = flattenCfnUserPoolClientPropsMixinAnalyticsConfigurationProperty(props.analyticsConfiguration);
+    if ((props.userPoolId !== undefined))
+        ret.userPoolId = cdk.getRefProperty(props.userPoolId?.userPoolRef, 'userPoolId') ?? cdk.ensureStringOrUndefined(props.userPoolId, "userPoolId", "cognito.IUserPoolRef | string");
+    return ret;
+}
 /**
  * The AWS::Cognito::UserPoolDomain resource creates a new domain for a user pool.
  *
@@ -300,8 +382,8 @@ exports.CfnUserPoolClientPropsMixin = CfnUserPoolClientPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooldomain.html
  */
-class CfnUserPoolDomainPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolDomainPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPoolDomainPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolDomainPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["customDomainConfig", "domain", "managedLoginVersion", "userPoolId"];
     props;
     strategy;
@@ -324,7 +406,7 @@ class CfnUserPoolDomainPropsMixin 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
@@ -337,12 +419,7 @@ class CfnUserPoolDomainPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPoolDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPoolDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPoolDomainPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -357,8 +434,8 @@ exports.CfnUserPoolDomainPropsMixin = CfnUserPoolDomainPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html
  */
-class CfnUserPoolGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPoolGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "groupName", "precedence", "roleArn", "userPoolId"];
     props;
     strategy;
@@ -380,8 +457,11 @@ class CfnUserPoolGroupPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUserPoolGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -394,16 +474,20 @@ class CfnUserPoolGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPoolGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPoolGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPoolGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUserPoolGroupPropsMixin = CfnUserPoolGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUserPoolGroupMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    if ((props.userPoolId !== undefined))
+        ret.userPoolId = cdk.getRefProperty(props.userPoolId?.userPoolRef, 'userPoolId') ?? cdk.ensureStringOrUndefined(props.userPoolId, "userPoolId", "cognito.IUserPoolRef | string");
+    return ret;
+}
 /**
  * The `AWS::Cognito::UserPoolIdentityProvider` resource creates an identity provider for a user pool.
  *
@@ -412,8 +496,8 @@ exports.CfnUserPoolGroupPropsMixin = CfnUserPoolGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolidentityprovider.html
  */
-class CfnUserPoolIdentityProviderPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolIdentityProviderPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPoolIdentityProviderPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolIdentityProviderPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["attributeMapping", "idpIdentifiers", "providerDetails", "providerName", "providerType", "userPoolId"];
     props;
     strategy;
@@ -436,7 +520,7 @@ class CfnUserPoolIdentityProviderPropsMixin 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
@@ -449,12 +533,7 @@ class CfnUserPoolIdentityProviderPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPoolIdentityProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPoolIdentityProviderPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPoolIdentityProviderPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -469,8 +548,8 @@ exports.CfnUserPoolIdentityProviderPropsMixin = CfnUserPoolIdentityProviderProps
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolresourceserver.html
  */
-class CfnUserPoolResourceServerPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolResourceServerPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPoolResourceServerPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolResourceServerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["identifier", "name", "scopes", "userPoolId"];
     props;
     strategy;
@@ -492,8 +571,11 @@ class CfnUserPoolResourceServerPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUserPoolResourceServerMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -506,16 +588,18 @@ class CfnUserPoolResourceServerPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPoolResourceServerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPoolResourceServerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPoolResourceServerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUserPoolResourceServerPropsMixin = CfnUserPoolResourceServerPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUserPoolResourceServerMixinProps(props) {
+    const ret = {};
+    if ((props.userPoolId !== undefined))
+        ret.userPoolId = cdk.getRefProperty(props.userPoolId?.userPoolRef, 'userPoolId') ?? cdk.ensureStringOrUndefined(props.userPoolId, "userPoolId", "cognito.IUserPoolRef | string");
+    return ret;
+}
 /**
  * The `AWS::Cognito::UserPoolRiskConfigurationAttachment` resource sets the risk configuration that is used for Amazon Cognito advanced security features.
  *
@@ -526,8 +610,8 @@ exports.CfnUserPoolResourceServerPropsMixin = CfnUserPoolResourceServerPropsMixi
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolriskconfigurationattachment.html
  */
-class CfnUserPoolRiskConfigurationAttachmentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolRiskConfigurationAttachmentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPoolRiskConfigurationAttachmentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolRiskConfigurationAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accountTakeoverRiskConfiguration", "clientId", "compromisedCredentialsRiskConfiguration", "riskExceptionConfiguration", "userPoolId"];
     props;
     strategy;
@@ -549,8 +633,11 @@ class CfnUserPoolRiskConfigurationAttachmentPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUserPoolRiskConfigurationAttachmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -563,16 +650,18 @@ class CfnUserPoolRiskConfigurationAttachmentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPoolRiskConfigurationAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPoolRiskConfigurationAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPoolRiskConfigurationAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUserPoolRiskConfigurationAttachmentPropsMixin = CfnUserPoolRiskConfigurationAttachmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUserPoolRiskConfigurationAttachmentMixinProps(props) {
+    const ret = {};
+    if ((props.userPoolId !== undefined))
+        ret.userPoolId = cdk.getRefProperty(props.userPoolId?.userPoolRef, 'userPoolId') ?? cdk.ensureStringOrUndefined(props.userPoolId, "userPoolId", "cognito.IUserPoolRef | string");
+    return ret;
+}
 /**
  * A container for the UI customization information for the hosted UI in a user pool.
  *
@@ -581,8 +670,8 @@ exports.CfnUserPoolRiskConfigurationAttachmentPropsMixin = CfnUserPoolRiskConfig
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluicustomizationattachment.html
  */
-class CfnUserPoolUICustomizationAttachmentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolUICustomizationAttachmentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPoolUICustomizationAttachmentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolUICustomizationAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clientId", "css", "userPoolId"];
     props;
     strategy;
@@ -604,8 +693,11 @@ class CfnUserPoolUICustomizationAttachmentPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUserPoolUICustomizationAttachmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -618,16 +710,18 @@ class CfnUserPoolUICustomizationAttachmentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPoolUICustomizationAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPoolUICustomizationAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPoolUICustomizationAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUserPoolUICustomizationAttachmentPropsMixin = CfnUserPoolUICustomizationAttachmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUserPoolUICustomizationAttachmentMixinProps(props) {
+    const ret = {};
+    if ((props.userPoolId !== undefined))
+        ret.userPoolId = cdk.getRefProperty(props.userPoolId?.userPoolRef, 'userPoolId') ?? cdk.ensureStringOrUndefined(props.userPoolId, "userPoolId", "cognito.IUserPoolRef | string");
+    return ret;
+}
 /**
  * The `AWS::Cognito::UserPoolUser` resource creates an Amazon Cognito user pool user.
  *
@@ -636,8 +730,8 @@ exports.CfnUserPoolUICustomizationAttachmentPropsMixin = CfnUserPoolUICustomizat
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html
  */
-class CfnUserPoolUserPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolUserPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPoolUserPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolUserPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clientMetadata", "desiredDeliveryMediums", "forceAliasCreation", "messageAction", "userAttributes", "username", "userPoolId", "validationData"];
     props;
     strategy;
@@ -659,8 +753,11 @@ class CfnUserPoolUserPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUserPoolUserMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -673,16 +770,18 @@ class CfnUserPoolUserPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPoolUserPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPoolUserPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPoolUserPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUserPoolUserPropsMixin = CfnUserPoolUserPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUserPoolUserMixinProps(props) {
+    const ret = {};
+    if ((props.userPoolId !== undefined))
+        ret.userPoolId = cdk.getRefProperty(props.userPoolId?.userPoolRef, 'userPoolId') ?? cdk.ensureStringOrUndefined(props.userPoolId, "userPoolId", "cognito.IUserPoolRef | string");
+    return ret;
+}
 /**
  * Adds a user to a group.
  *
@@ -698,8 +797,8 @@ exports.CfnUserPoolUserPropsMixin = CfnUserPoolUserPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html
  */
-class CfnUserPoolUserToGroupAttachmentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolUserToGroupAttachmentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserPoolUserToGroupAttachmentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnUserPoolUserToGroupAttachmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["groupName", "username", "userPoolId"];
     props;
     strategy;
@@ -721,8 +820,11 @@ class CfnUserPoolUserToGroupAttachmentPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUserPoolUserToGroupAttachmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -735,16 +837,22 @@ class CfnUserPoolUserToGroupAttachmentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserPoolUserToGroupAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserPoolUserToGroupAttachmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserPoolUserToGroupAttachmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUserPoolUserToGroupAttachmentPropsMixin = CfnUserPoolUserToGroupAttachmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUserPoolUserToGroupAttachmentMixinProps(props) {
+    const ret = {};
+    if ((props.groupName !== undefined))
+        ret.groupName = cdk.getRefProperty(props.groupName?.userPoolGroupRef, 'groupName') ?? cdk.ensureStringOrUndefined(props.groupName, "groupName", "cognito.IUserPoolGroupRef | string");
+    if ((props.username !== undefined))
+        ret.username = cdk.getRefProperty(props.username?.userPoolUserRef, 'username') ?? cdk.ensureStringOrUndefined(props.username, "username", "cognito.IUserPoolUserRef | string");
+    if ((props.userPoolId !== undefined))
+        ret.userPoolId = cdk.getRefProperty(props.userPoolId?.userPoolRef, 'userPoolId') ?? cdk.ensureStringOrUndefined(props.userPoolId, "userPoolId", "cognito.IUserPoolRef | string");
+    return ret;
+}
 /**
  * Sets up or modifies the logging configuration of a user pool.
  *
@@ -755,8 +863,8 @@ exports.CfnUserPoolUserToGroupAttachmentPropsMixin = CfnUserPoolUserToGroupAttac
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-logdeliveryconfiguration.html
  */
-class CfnLogDeliveryConfigurationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnLogDeliveryConfigurationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnLogDeliveryConfigurationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnLogDeliveryConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["logConfigurations", "userPoolId"];
     props;
     strategy;
@@ -779,7 +887,7 @@ class CfnLogDeliveryConfigurationPropsMixin 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
@@ -792,12 +900,7 @@ class CfnLogDeliveryConfigurationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLogDeliveryConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLogDeliveryConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLogDeliveryConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -818,8 +921,8 @@ exports.CfnLogDeliveryConfigurationPropsMixin = CfnLogDeliveryConfigurationProps
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-managedloginbranding.html
  */
-class CfnManagedLoginBrandingPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnManagedLoginBrandingPropsMixin", version: "2.240.0-alpha.0" };
+class CfnManagedLoginBrandingPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnManagedLoginBrandingPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["assets", "clientId", "returnMergedResources", "settings", "useCognitoProvidedValues", "userPoolId"];
     props;
     strategy;
@@ -842,7 +945,7 @@ class CfnManagedLoginBrandingPropsMixin 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
@@ -855,12 +958,7 @@ class CfnManagedLoginBrandingPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnManagedLoginBrandingPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnManagedLoginBrandingPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnManagedLoginBrandingPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -886,8 +984,8 @@ exports.CfnManagedLoginBrandingPropsMixin = CfnManagedLoginBrandingPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-terms.html
  */
-class CfnTermsPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnTermsPropsMixin", version: "2.240.0-alpha.0" };
+class CfnTermsPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cognito.mixins.CfnTermsPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clientId", "enforcement", "links", "termsName", "termsSource", "userPoolId"];
     props;
     strategy;
@@ -910,7 +1008,7 @@ class CfnTermsPropsMixin 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
@@ -923,12 +1021,7 @@ class CfnTermsPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTermsPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTermsPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTermsPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }