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

package/lib/services/aws-appconfig/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-appconfig");
 /**
  * The `AWS::AppConfig::Application` resource creates an application.
@@ -29,8 +27,8 @@ const service = require("aws-cdk-lib/aws-appconfig");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-application.html
  */
-class CfnApplicationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnApplicationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnApplicationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnApplicationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "name", "tags"];
     props;
     strategy;
@@ -53,7 +51,7 @@ class CfnApplicationPropsMixin 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
@@ -66,12 +64,7 @@ class CfnApplicationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnApplicationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnApplicationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnApplicationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -100,8 +93,8 @@ exports.CfnApplicationPropsMixin = CfnApplicationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html
  */
-class CfnConfigurationProfilePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnConfigurationProfilePropsMixin", version: "2.240.0-alpha.0" };
+class CfnConfigurationProfilePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnConfigurationProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["applicationId", "deletionProtectionCheck", "description", "kmsKeyIdentifier", "locationUri", "name", "retrievalRoleArn", "tags", "type", "validators"];
     props;
     strategy;
@@ -123,8 +116,11 @@ class CfnConfigurationProfilePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnConfigurationProfileMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -137,16 +133,31 @@ class CfnConfigurationProfilePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnConfigurationProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnConfigurationProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnConfigurationProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnConfigurationProfilePropsMixin = CfnConfigurationProfilePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnConfigurationProfilePropsMixinValidatorsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        content: (!props.content ? undefined : cdk.getRefProperty(props.content?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.content, "content", "lambda.IFunctionRef | string")),
+        type: (!props.type ? undefined : props.type)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnConfigurationProfileMixinProps(props) {
+    const ret = {};
+    if ((props.applicationId !== undefined))
+        ret.applicationId = cdk.getRefProperty(props.applicationId?.applicationRef, 'applicationId') ?? cdk.ensureStringOrUndefined(props.applicationId, "applicationId", "appconfig.IApplicationRef | string");
+    if ((props.retrievalRoleArn !== undefined))
+        ret.retrievalRoleArn = cdk.getRefProperty(props.retrievalRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.retrievalRoleArn, "retrievalRoleArn", "iam.IRoleRef | string");
+    if ((props.validators !== undefined))
+        ret.validators = (cdk.isResolvableObject(props.validators) ? props.validators : cdk.mapArrayInPlace(props.validators, (item) => flattenCfnConfigurationProfilePropsMixinValidatorsProperty(item)));
+    return ret;
+}
 /**
  * The `AWS::AppConfig::Deployment` resource starts a deployment.
  *
@@ -169,8 +180,8 @@ exports.CfnConfigurationProfilePropsMixin = CfnConfigurationProfilePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deployment.html
  */
-class CfnDeploymentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnDeploymentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDeploymentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnDeploymentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["applicationId", "configurationProfileId", "configurationVersion", "deploymentStrategyId", "description", "dynamicExtensionParameters", "environmentId", "kmsKeyIdentifier", "tags"];
     props;
     strategy;
@@ -193,7 +204,7 @@ class CfnDeploymentPropsMixin 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
@@ -206,12 +217,7 @@ class CfnDeploymentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDeploymentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDeploymentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDeploymentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -236,8 +242,8 @@ exports.CfnDeploymentPropsMixin = CfnDeploymentPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html
  */
-class CfnDeploymentStrategyPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnDeploymentStrategyPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDeploymentStrategyPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnDeploymentStrategyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deploymentDurationInMinutes", "description", "finalBakeTimeInMinutes", "growthFactor", "growthType", "name", "replicateTo", "tags"];
     props;
     strategy;
@@ -260,7 +266,7 @@ class CfnDeploymentStrategyPropsMixin 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
@@ -273,12 +279,7 @@ class CfnDeploymentStrategyPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDeploymentStrategyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDeploymentStrategyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDeploymentStrategyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -303,8 +304,8 @@ exports.CfnDeploymentStrategyPropsMixin = CfnDeploymentStrategyPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-environment.html
  */
-class CfnEnvironmentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnEnvironmentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnEnvironmentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnEnvironmentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["applicationId", "deletionProtectionCheck", "description", "monitors", "name", "tags"];
     props;
     strategy;
@@ -326,8 +327,11 @@ class CfnEnvironmentPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnEnvironmentMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -340,16 +344,38 @@ class CfnEnvironmentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEnvironmentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnEnvironmentPropsMixin = CfnEnvironmentPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnEnvironmentPropsMixinMonitorProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        alarmArn: (!props.alarmArn ? undefined : cdk.getRefProperty(props.alarmArn?.alarmRef, 'alarmArn') ?? cdk.getRefProperty(props.alarmArn?.compositeAlarmRef, 'compositeAlarmArn') ?? cdk.ensureStringOrUndefined(props.alarmArn, "alarmArn", "cloudwatch.IAlarmRef | cloudwatch.ICompositeAlarmRef | string")),
+        alarmRoleArn: (!props.alarmRoleArn ? undefined : cdk.getRefProperty(props.alarmRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.alarmRoleArn, "alarmRoleArn", "iam.IRoleRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnEnvironmentPropsMixinMonitorsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        alarmArn: (!props.alarmArn ? undefined : cdk.getRefProperty(props.alarmArn?.alarmRef, 'alarmArn') ?? cdk.getRefProperty(props.alarmArn?.compositeAlarmRef, 'compositeAlarmArn') ?? cdk.ensureStringOrUndefined(props.alarmArn, "alarmArn", "cloudwatch.IAlarmRef | cloudwatch.ICompositeAlarmRef | string")),
+        alarmRoleArn: (!props.alarmRoleArn ? undefined : cdk.getRefProperty(props.alarmRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.alarmRoleArn, "alarmRoleArn", "iam.IRoleRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnEnvironmentMixinProps(props) {
+    const ret = {};
+    if ((props.applicationId !== undefined))
+        ret.applicationId = cdk.getRefProperty(props.applicationId?.applicationRef, 'applicationId') ?? cdk.ensureStringOrUndefined(props.applicationId, "applicationId", "appconfig.IApplicationRef | string");
+    if ((props.monitors !== undefined))
+        ret.monitors = (cdk.isResolvableObject(props.monitors) ? props.monitors : cdk.mapArrayInPlace(props.monitors, (item) => flattenCfnEnvironmentPropsMixinMonitorsProperty(item)));
+    return ret;
+}
 /**
  * Creates an AWS AppConfig extension.
  *
@@ -368,8 +394,8 @@ exports.CfnEnvironmentPropsMixin = CfnEnvironmentPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-extension.html
  */
-class CfnExtensionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnExtensionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnExtensionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnExtensionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["actions", "description", "latestVersionNumber", "name", "parameters", "tags"];
     props;
     strategy;
@@ -392,7 +418,7 @@ class CfnExtensionPropsMixin 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
@@ -405,12 +431,7 @@ class CfnExtensionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnExtensionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnExtensionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnExtensionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -425,8 +446,8 @@ exports.CfnExtensionPropsMixin = CfnExtensionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-extensionassociation.html
  */
-class CfnExtensionAssociationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnExtensionAssociationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnExtensionAssociationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnExtensionAssociationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["extensionIdentifier", "extensionVersionNumber", "parameters", "resourceIdentifier", "tags"];
     props;
     strategy;
@@ -449,7 +470,7 @@ class CfnExtensionAssociationPropsMixin 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
@@ -462,12 +483,7 @@ class CfnExtensionAssociationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnExtensionAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnExtensionAssociationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnExtensionAssociationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -488,8 +504,8 @@ exports.CfnExtensionAssociationPropsMixin = CfnExtensionAssociationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-hostedconfigurationversion.html
  */
-class CfnHostedConfigurationVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnHostedConfigurationVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnHostedConfigurationVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appconfig.mixins.CfnHostedConfigurationVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["applicationId", "configurationProfileId", "content", "contentType", "description", "latestVersionNumber", "versionLabel"];
     props;
     strategy;
@@ -511,8 +527,11 @@ class CfnHostedConfigurationVersionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnHostedConfigurationVersionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -525,13 +544,17 @@ class CfnHostedConfigurationVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnHostedConfigurationVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnHostedConfigurationVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnHostedConfigurationVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnHostedConfigurationVersionPropsMixin = CfnHostedConfigurationVersionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnHostedConfigurationVersionMixinProps(props) {
+    const ret = {};
+    if ((props.applicationId !== undefined))
+        ret.applicationId = cdk.getRefProperty(props.applicationId?.applicationRef, 'applicationId') ?? cdk.ensureStringOrUndefined(props.applicationId, "applicationId", "appconfig.IApplicationRef | string");
+    if ((props.configurationProfileId !== undefined))
+        ret.configurationProfileId = cdk.getRefProperty(props.configurationProfileId?.configurationProfileRef, 'configurationProfileId') ?? cdk.ensureStringOrUndefined(props.configurationProfileId, "configurationProfileId", "appconfig.IConfigurationProfileRef | string");
+    return ret;
+}

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

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

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

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

package/lib/services/aws-appflow/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-appflow";
+import { aws_kms as kmsRefs, aws_s3 as s3Refs } from "aws-cdk-lib/interfaces";
 /**
  * Creates a new connector profile associated with your AWS account .
  *
@@ -13,10 +13,10 @@ import * as service from "aws-cdk-lib/aws-appflow";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connector.html
  */
-export declare class CfnConnectorPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnConnectorPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConnectorMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AppFlow::Connector`.
      *
@@ -110,10 +110,10 @@ export interface CfnConnectorMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connectorprofile.html
  */
-export declare class CfnConnectorProfilePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnConnectorProfilePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnConnectorProfileMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AppFlow::ConnectorProfile`.
      *
@@ -1527,10 +1527,10 @@ export interface CfnConnectorProfileMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html
  */
-export declare class CfnFlowPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnFlowPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFlowMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AppFlow::Flow`.
      *
@@ -1942,7 +1942,7 @@ export declare namespace CfnFlowPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3destinationproperties.html#cfn-appflow-flow-s3destinationproperties-bucketname
          */
-        readonly bucketName?: string;
+        readonly bucketName?: s3Refs.IBucketRef | string;
         /**
          * The object key for the destination bucket in which Amazon AppFlow places the files.
          *
@@ -2105,7 +2105,7 @@ export declare namespace CfnFlowPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-errorhandlingconfig.html#cfn-appflow-flow-errorhandlingconfig-bucketname
          */
-        readonly bucketName?: string;
+        readonly bucketName?: s3Refs.IBucketRef | string;
         /**
          * Specifies the Amazon S3 bucket prefix.
          *
@@ -2233,7 +2233,7 @@ export declare namespace CfnFlowPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-successresponsehandlingconfig.html#cfn-appflow-flow-successresponsehandlingconfig-bucketname
          */
-        readonly bucketName?: string;
+        readonly bucketName?: s3Refs.IBucketRef | string;
         /**
          * The Amazon S3 bucket prefix.
          *
@@ -2268,7 +2268,7 @@ export declare namespace CfnFlowPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-snowflakedestinationproperties.html#cfn-appflow-flow-snowflakedestinationproperties-intermediatebucketname
          */
-        readonly intermediateBucketName?: string;
+        readonly intermediateBucketName?: s3Refs.IBucketRef | string;
         /**
          * The object specified in the Snowflake flow destination.
          *
@@ -2399,7 +2399,7 @@ export declare namespace CfnFlowPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-redshiftdestinationproperties.html#cfn-appflow-flow-redshiftdestinationproperties-intermediatebucketname
          */
-        readonly intermediateBucketName?: string;
+        readonly intermediateBucketName?: s3Refs.IBucketRef | string;
         /**
          * The object specified in the Amazon Redshift flow destination.
          *
@@ -2642,7 +2642,7 @@ export declare namespace CfnFlowPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3sourceproperties.html#cfn-appflow-flow-s3sourceproperties-bucketname
          */
-        readonly bucketName?: string;
+        readonly bucketName?: s3Refs.IBucketRef | string;
         /**
          * The object key for the Amazon S3 bucket in which the source files are stored.
          *
@@ -3139,7 +3139,7 @@ export interface CfnFlowMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html#cfn-appflow-flow-kmsarn
      */
-    readonly kmsArn?: string;
+    readonly kmsArn?: kmsRefs.IKeyRef | string;
     /**
      * Specifies the configuration that Amazon AppFlow uses when it catalogs your data.
      *