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

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

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

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

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

package/lib/services/aws-cognito/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-cognito";
+import { aws_cognito as cognitoRefs, aws_iam as iamRefs, aws_kms as kmsRefs, aws_lambda as lambdaRefs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::Cognito::IdentityPool` resource creates an Amazon Cognito identity pool.
  *
@@ -13,10 +13,10 @@ import * as service from "aws-cdk-lib/aws-cognito";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html
  */
-export declare class CfnIdentityPoolPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnIdentityPoolPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIdentityPoolMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::IdentityPool`.
      *
@@ -68,7 +68,7 @@ export declare namespace CfnIdentityPoolPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html#cfn-cognito-identitypool-cognitoidentityprovider-clientid
          */
-        readonly clientId?: string;
+        readonly clientId?: cognitoRefs.IUserPoolClientRef | string;
         /**
          * The provider name for an Amazon Cognito user pool.
          *
@@ -197,7 +197,7 @@ export interface CfnIdentityPoolMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-openidconnectproviderarns
      */
-    readonly openIdConnectProviderArns?: Array<string>;
+    readonly openIdConnectProviderArns?: Array<iamRefs.IOIDCProviderRef | string>;
     /**
      * The configuration options to be applied to the identity pool.
      *
@@ -225,10 +225,10 @@ export interface CfnIdentityPoolMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolprincipaltag.html
  */
-export declare class CfnIdentityPoolPrincipalTagPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnIdentityPoolPrincipalTagPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIdentityPoolPrincipalTagMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::IdentityPoolPrincipalTag`.
      *
@@ -288,10 +288,10 @@ export interface CfnIdentityPoolPrincipalTagMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html
  */
-export declare class CfnIdentityPoolRoleAttachmentPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnIdentityPoolRoleAttachmentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnIdentityPoolRoleAttachmentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::IdentityPoolRoleAttachment`.
      *
@@ -422,7 +422,7 @@ export interface CfnIdentityPoolRoleAttachmentMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html#cfn-cognito-identitypoolroleattachment-identitypoolid
      */
-    readonly identityPoolId?: string;
+    readonly identityPoolId?: cognitoRefs.IIdentityPoolRef | string;
     /**
      * How users for a specific identity provider are mapped to roles.
      *
@@ -456,10 +456,10 @@ export interface CfnIdentityPoolRoleAttachmentMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html
  */
-export declare class CfnUserPoolPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnUserPoolPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserPoolMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::UserPool`.
      *
@@ -1004,7 +1004,7 @@ export declare namespace CfnUserPoolPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-smsconfiguration.html#cfn-cognito-userpool-smsconfiguration-snscallerarn
          */
-        readonly snsCallerArn?: string;
+        readonly snsCallerArn?: iamRefs.IRoleRef | string;
         /**
          * The AWS Region to use with Amazon SNS integration.
          *
@@ -1031,7 +1031,7 @@ export declare namespace CfnUserPoolPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-createauthchallenge
          */
-        readonly createAuthChallenge?: string;
+        readonly createAuthChallenge?: lambdaRefs.IFunctionRef | string;
         /**
          * The configuration of a custom email sender Lambda trigger.
          *
@@ -1047,7 +1047,7 @@ export declare namespace CfnUserPoolPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-custommessage
          */
-        readonly customMessage?: string;
+        readonly customMessage?: lambdaRefs.IFunctionRef | string;
         /**
          * The configuration of a custom SMS sender Lambda trigger.
          *
@@ -1061,7 +1061,7 @@ export declare namespace CfnUserPoolPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-defineauthchallenge
          */
-        readonly defineAuthChallenge?: string;
+        readonly defineAuthChallenge?: lambdaRefs.IFunctionRef | string;
         /**
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-inboundfederation
          */
@@ -1071,31 +1071,31 @@ export declare namespace CfnUserPoolPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-kmskeyid
          */
-        readonly kmsKeyId?: string;
+        readonly kmsKeyId?: kmsRefs.IKeyRef | string;
         /**
          * The configuration of a [post authentication Lambda trigger](https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-lambda-post-authentication.html) in a user pool. This trigger can take custom actions after a user signs in.
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-postauthentication
          */
-        readonly postAuthentication?: string;
+        readonly postAuthentication?: lambdaRefs.IFunctionRef | string;
         /**
          * The configuration of a [post confirmation Lambda trigger](https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-lambda-post-confirmation.html) in a user pool. This trigger can take custom actions after a user confirms their user account and their email address or phone number.
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-postconfirmation
          */
-        readonly postConfirmation?: string;
+        readonly postConfirmation?: lambdaRefs.IFunctionRef | string;
         /**
          * The configuration of a [pre authentication trigger](https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-lambda-pre-authentication.html) in a user pool. This trigger can evaluate and modify user sign-in events.
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-preauthentication
          */
-        readonly preAuthentication?: string;
+        readonly preAuthentication?: lambdaRefs.IFunctionRef | string;
         /**
          * The configuration of a [pre sign-up Lambda trigger](https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-lambda-pre-sign-up.html) in a user pool. This trigger evaluates new users and can bypass confirmation, [link a federated user profile](https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-pools-identity-federation-consolidate-users.html) , or block sign-up requests.
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-presignup
          */
-        readonly preSignUp?: string;
+        readonly preSignUp?: lambdaRefs.IFunctionRef | string;
         /**
          * The legacy configuration of a [pre token generation Lambda trigger](https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-lambda-pre-token-generation.html) in a user pool.
          *
@@ -1103,7 +1103,7 @@ export declare namespace CfnUserPoolPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-pretokengeneration
          */
-        readonly preTokenGeneration?: string;
+        readonly preTokenGeneration?: lambdaRefs.IFunctionRef | string;
         /**
          * The detailed configuration of a [pre token generation Lambda trigger](https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-lambda-pre-token-generation.html) in a user pool. If you also set an ARN in `PreTokenGeneration` , its value must be identical to `PreTokenGenerationConfig` .
          *
@@ -1121,7 +1121,7 @@ export declare namespace CfnUserPoolPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-verifyauthchallengeresponse
          */
-        readonly verifyAuthChallengeResponse?: string;
+        readonly verifyAuthChallengeResponse?: lambdaRefs.IFunctionRef | string;
     }
     /**
      * The configuration of a custom SMS sender Lambda trigger.
@@ -1138,7 +1138,7 @@ export declare namespace CfnUserPoolPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-customsmssender.html#cfn-cognito-userpool-customsmssender-lambdaarn
          */
-        readonly lambdaArn?: string;
+        readonly lambdaArn?: lambdaRefs.IFunctionRef | string;
         /**
          * The user pool trigger version of the request that Amazon Cognito sends to your Lambda function.
          *
@@ -1549,10 +1549,10 @@ export interface CfnUserPoolMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html
  */
-export declare class CfnUserPoolClientPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnUserPoolClientPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserPoolClientMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::UserPoolClient`.
      *
@@ -1607,7 +1607,7 @@ export declare namespace CfnUserPoolClientPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-analyticsconfiguration.html#cfn-cognito-userpoolclient-analyticsconfiguration-rolearn
          */
-        readonly roleArn?: string;
+        readonly roleArn?: iamRefs.IRoleRef | string;
         /**
          * If `UserDataShared` is `true` , Amazon Cognito includes user data in the events that it publishes to Amazon Pinpoint analytics.
          *
@@ -1926,7 +1926,7 @@ export interface CfnUserPoolClientMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-userpoolid
      */
-    readonly userPoolId?: string;
+    readonly userPoolId?: cognitoRefs.IUserPoolRef | string;
     /**
      * The list of user attributes that you want your app client to have write access to.
      *
@@ -1948,10 +1948,10 @@ export interface CfnUserPoolClientMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooldomain.html
  */
-export declare class CfnUserPoolDomainPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnUserPoolDomainPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserPoolDomainMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::UserPoolDomain`.
      *
@@ -2038,10 +2038,10 @@ export interface CfnUserPoolDomainMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html
  */
-export declare class CfnUserPoolGroupPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnUserPoolGroupPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserPoolGroupMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::UserPoolGroup`.
      *
@@ -2099,13 +2099,13 @@ export interface CfnUserPoolGroupMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-rolearn
      */
-    readonly roleArn?: string;
+    readonly roleArn?: iamRefs.IRoleRef | string;
     /**
      * The ID of the user pool where you want to create a user group.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-userpoolid
      */
-    readonly userPoolId?: string;
+    readonly userPoolId?: cognitoRefs.IUserPoolRef | string;
 }
 /**
  * The `AWS::Cognito::UserPoolIdentityProvider` resource creates an identity provider for a user pool.
@@ -2115,10 +2115,10 @@ export interface CfnUserPoolGroupMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolidentityprovider.html
  */
-export declare class CfnUserPoolIdentityProviderPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnUserPoolIdentityProviderPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserPoolIdentityProviderMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::UserPoolIdentityProvider`.
      *
@@ -2228,10 +2228,10 @@ export interface CfnUserPoolIdentityProviderMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolresourceserver.html
  */
-export declare class CfnUserPoolResourceServerPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnUserPoolResourceServerPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserPoolResourceServerMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::UserPoolResourceServer`.
      *
@@ -2312,7 +2312,7 @@ export interface CfnUserPoolResourceServerMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolresourceserver.html#cfn-cognito-userpoolresourceserver-userpoolid
      */
-    readonly userPoolId?: string;
+    readonly userPoolId?: cognitoRefs.IUserPoolRef | string;
 }
 /**
  * The `AWS::Cognito::UserPoolRiskConfigurationAttachment` resource sets the risk configuration that is used for Amazon Cognito advanced security features.
@@ -2324,10 +2324,10 @@ export interface CfnUserPoolResourceServerMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolriskconfigurationattachment.html
  */
-export declare class CfnUserPoolRiskConfigurationAttachmentPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnUserPoolRiskConfigurationAttachmentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserPoolRiskConfigurationAttachmentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::UserPoolRiskConfigurationAttachment`.
      *
@@ -2610,7 +2610,7 @@ export interface CfnUserPoolRiskConfigurationAttachmentMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolriskconfigurationattachment.html#cfn-cognito-userpoolriskconfigurationattachment-userpoolid
      */
-    readonly userPoolId?: string;
+    readonly userPoolId?: cognitoRefs.IUserPoolRef | string;
 }
 /**
  * A container for the UI customization information for the hosted UI in a user pool.
@@ -2620,10 +2620,10 @@ export interface CfnUserPoolRiskConfigurationAttachmentMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluicustomizationattachment.html
  */
-export declare class CfnUserPoolUICustomizationAttachmentPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnUserPoolUICustomizationAttachmentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserPoolUICustomizationAttachmentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::UserPoolUICustomizationAttachment`.
      *
@@ -2669,7 +2669,7 @@ export interface CfnUserPoolUICustomizationAttachmentMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluicustomizationattachment.html#cfn-cognito-userpooluicustomizationattachment-userpoolid
      */
-    readonly userPoolId?: string;
+    readonly userPoolId?: cognitoRefs.IUserPoolRef | string;
 }
 /**
  * The `AWS::Cognito::UserPoolUser` resource creates an Amazon Cognito user pool user.
@@ -2679,10 +2679,10 @@ export interface CfnUserPoolUICustomizationAttachmentMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html
  */
-export declare class CfnUserPoolUserPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnUserPoolUserPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserPoolUserMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::UserPoolUser`.
      *
@@ -2812,7 +2812,7 @@ export interface CfnUserPoolUserMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-userpoolid
      */
-    readonly userPoolId?: string;
+    readonly userPoolId?: cognitoRefs.IUserPoolRef | string;
     /**
      * Temporary user attributes that contribute to the outcomes of your pre sign-up Lambda trigger.
      *
@@ -2841,10 +2841,10 @@ export interface CfnUserPoolUserMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html
  */
-export declare class CfnUserPoolUserToGroupAttachmentPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnUserPoolUserToGroupAttachmentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnUserPoolUserToGroupAttachmentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::UserPoolUserToGroupAttachment`.
      *
@@ -2874,19 +2874,19 @@ export interface CfnUserPoolUserToGroupAttachmentMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html#cfn-cognito-userpoolusertogroupattachment-groupname
      */
-    readonly groupName?: string;
+    readonly groupName?: cognitoRefs.IUserPoolGroupRef | string;
     /**
      * The user's username.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html#cfn-cognito-userpoolusertogroupattachment-username
      */
-    readonly username?: string;
+    readonly username?: cognitoRefs.IUserPoolUserRef | string;
     /**
      * The ID of the user pool that contains the group that you want to add the user to.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html#cfn-cognito-userpoolusertogroupattachment-userpoolid
      */
-    readonly userPoolId?: string;
+    readonly userPoolId?: cognitoRefs.IUserPoolRef | string;
 }
 /**
  * Sets up or modifies the logging configuration of a user pool.
@@ -2898,10 +2898,10 @@ export interface CfnUserPoolUserToGroupAttachmentMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-logdeliveryconfiguration.html
  */
-export declare class CfnLogDeliveryConfigurationPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLogDeliveryConfigurationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLogDeliveryConfigurationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::LogDeliveryConfiguration`.
      *
@@ -3051,10 +3051,10 @@ export interface CfnLogDeliveryConfigurationMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-managedloginbranding.html
  */
-export declare class CfnManagedLoginBrandingPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnManagedLoginBrandingPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnManagedLoginBrandingMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::ManagedLoginBranding`.
      *
@@ -3199,10 +3199,10 @@ export interface CfnManagedLoginBrandingMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-terms.html
  */
-export declare class CfnTermsPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnTermsPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTermsMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::Cognito::Terms`.
      *