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

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

@@ -2,6 +2,7 @@ import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
 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 .
  *
@@ -15,7 +16,7 @@ import * as service from "aws-cdk-lib/aws-appflow";
 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`.
      *
@@ -112,7 +113,7 @@ export interface CfnConnectorMixinProps {
 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`.
      *
@@ -1529,7 +1530,7 @@ export interface CfnConnectorProfileMixinProps {
 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`.
      *
@@ -1941,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.
          *
@@ -2104,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.
          *
@@ -2232,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.
          *
@@ -2267,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.
          *
@@ -2398,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.
          *
@@ -2641,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.
          *
@@ -3138,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.
      *

package/lib/services/aws-appflow/cfn-props-mixins.generated.js

@@ -6,7 +6,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-appflow");
 /**
  * Creates a new connector profile associated with your AWS account .
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-appflow");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connector.html
  */
 class CfnConnectorPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appflow.mixins.CfnConnectorPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appflow.mixins.CfnConnectorPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["connectorLabel", "connectorProvisioningConfig", "connectorProvisioningType", "description"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnConnectorPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -55,12 +54,7 @@ class CfnConnectorPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnConnectorPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnConnectorPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnConnectorPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -78,7 +72,7 @@ exports.CfnConnectorPropsMixin = CfnConnectorPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connectorprofile.html
  */
 class CfnConnectorProfilePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appflow.mixins.CfnConnectorProfilePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appflow.mixins.CfnConnectorProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["connectionMode", "connectorLabel", "connectorProfileConfig", "connectorProfileName", "connectorType", "kmsArn"];
     props;
     strategy;
@@ -101,7 +95,7 @@ class CfnConnectorProfilePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -114,12 +108,7 @@ class CfnConnectorProfilePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnConnectorProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnConnectorProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnConnectorProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -135,7 +124,7 @@ exports.CfnConnectorProfilePropsMixin = CfnConnectorProfilePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html
  */
 class CfnFlowPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appflow.mixins.CfnFlowPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appflow.mixins.CfnFlowPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "destinationFlowConfigList", "flowName", "flowStatus", "kmsArn", "metadataCatalogConfig", "sourceFlowConfig", "tags", "tasks", "triggerConfig"];
     props;
     strategy;
@@ -157,8 +146,11 @@ class CfnFlowPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnFlowMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -171,13 +163,210 @@ class CfnFlowPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFlowPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFlowPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFlowPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnFlowPropsMixin = CfnFlowPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinS3DestinationPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketName: (!props.bucketName ? undefined : cdk.getRefProperty(props.bucketName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.bucketName, "bucketName", "s3.IBucketRef | string")),
+        bucketPrefix: (!props.bucketPrefix ? undefined : props.bucketPrefix),
+        s3OutputFormatConfig: (!props.s3OutputFormatConfig ? undefined : props.s3OutputFormatConfig)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinErrorHandlingConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketName: (!props.bucketName ? undefined : cdk.getRefProperty(props.bucketName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.bucketName, "bucketName", "s3.IBucketRef | string")),
+        bucketPrefix: (!props.bucketPrefix ? undefined : props.bucketPrefix),
+        failOnFirstError: (!props.failOnFirstError ? undefined : props.failOnFirstError)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinCustomConnectorDestinationPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        customProperties: (!props.customProperties ? undefined : props.customProperties),
+        entityName: (!props.entityName ? undefined : props.entityName),
+        errorHandlingConfig: (!props.errorHandlingConfig ? undefined : (!props.errorHandlingConfig ? undefined : flattenCfnFlowPropsMixinErrorHandlingConfigProperty(props.errorHandlingConfig))),
+        idFieldNames: (!props.idFieldNames ? undefined : props.idFieldNames),
+        writeOperationType: (!props.writeOperationType ? undefined : props.writeOperationType)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinSuccessResponseHandlingConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketName: (!props.bucketName ? undefined : cdk.getRefProperty(props.bucketName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.bucketName, "bucketName", "s3.IBucketRef | string")),
+        bucketPrefix: (!props.bucketPrefix ? undefined : props.bucketPrefix)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinSAPODataDestinationPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        errorHandlingConfig: (!props.errorHandlingConfig ? undefined : (!props.errorHandlingConfig ? undefined : flattenCfnFlowPropsMixinErrorHandlingConfigProperty(props.errorHandlingConfig))),
+        idFieldNames: (!props.idFieldNames ? undefined : props.idFieldNames),
+        objectPath: (!props.objectPath ? undefined : props.objectPath),
+        successResponseHandlingConfig: (!props.successResponseHandlingConfig ? undefined : (!props.successResponseHandlingConfig ? undefined : flattenCfnFlowPropsMixinSuccessResponseHandlingConfigProperty(props.successResponseHandlingConfig))),
+        writeOperationType: (!props.writeOperationType ? undefined : props.writeOperationType)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinSnowflakeDestinationPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketPrefix: (!props.bucketPrefix ? undefined : props.bucketPrefix),
+        errorHandlingConfig: (!props.errorHandlingConfig ? undefined : (!props.errorHandlingConfig ? undefined : flattenCfnFlowPropsMixinErrorHandlingConfigProperty(props.errorHandlingConfig))),
+        intermediateBucketName: (!props.intermediateBucketName ? undefined : cdk.getRefProperty(props.intermediateBucketName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.intermediateBucketName, "intermediateBucketName", "s3.IBucketRef | string")),
+        object: (!props.object ? undefined : props.object)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinEventBridgeDestinationPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        errorHandlingConfig: (!props.errorHandlingConfig ? undefined : (!props.errorHandlingConfig ? undefined : flattenCfnFlowPropsMixinErrorHandlingConfigProperty(props.errorHandlingConfig))),
+        object: (!props.object ? undefined : props.object)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinZendeskDestinationPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        errorHandlingConfig: (!props.errorHandlingConfig ? undefined : (!props.errorHandlingConfig ? undefined : flattenCfnFlowPropsMixinErrorHandlingConfigProperty(props.errorHandlingConfig))),
+        idFieldNames: (!props.idFieldNames ? undefined : props.idFieldNames),
+        object: (!props.object ? undefined : props.object),
+        writeOperationType: (!props.writeOperationType ? undefined : props.writeOperationType)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinMarketoDestinationPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        errorHandlingConfig: (!props.errorHandlingConfig ? undefined : (!props.errorHandlingConfig ? undefined : flattenCfnFlowPropsMixinErrorHandlingConfigProperty(props.errorHandlingConfig))),
+        object: (!props.object ? undefined : props.object)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinRedshiftDestinationPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketPrefix: (!props.bucketPrefix ? undefined : props.bucketPrefix),
+        errorHandlingConfig: (!props.errorHandlingConfig ? undefined : (!props.errorHandlingConfig ? undefined : flattenCfnFlowPropsMixinErrorHandlingConfigProperty(props.errorHandlingConfig))),
+        intermediateBucketName: (!props.intermediateBucketName ? undefined : cdk.getRefProperty(props.intermediateBucketName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.intermediateBucketName, "intermediateBucketName", "s3.IBucketRef | string")),
+        object: (!props.object ? undefined : props.object)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinSalesforceDestinationPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        dataTransferApi: (!props.dataTransferApi ? undefined : props.dataTransferApi),
+        errorHandlingConfig: (!props.errorHandlingConfig ? undefined : (!props.errorHandlingConfig ? undefined : flattenCfnFlowPropsMixinErrorHandlingConfigProperty(props.errorHandlingConfig))),
+        idFieldNames: (!props.idFieldNames ? undefined : props.idFieldNames),
+        object: (!props.object ? undefined : props.object),
+        writeOperationType: (!props.writeOperationType ? undefined : props.writeOperationType)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinDestinationConnectorPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        customConnector: (!props.customConnector ? undefined : (!props.customConnector ? undefined : flattenCfnFlowPropsMixinCustomConnectorDestinationPropertiesProperty(props.customConnector))),
+        eventBridge: (!props.eventBridge ? undefined : (!props.eventBridge ? undefined : flattenCfnFlowPropsMixinEventBridgeDestinationPropertiesProperty(props.eventBridge))),
+        lookoutMetrics: (!props.lookoutMetrics ? undefined : props.lookoutMetrics),
+        marketo: (!props.marketo ? undefined : (!props.marketo ? undefined : flattenCfnFlowPropsMixinMarketoDestinationPropertiesProperty(props.marketo))),
+        redshift: (!props.redshift ? undefined : (!props.redshift ? undefined : flattenCfnFlowPropsMixinRedshiftDestinationPropertiesProperty(props.redshift))),
+        s3: (!props.s3 ? undefined : (!props.s3 ? undefined : flattenCfnFlowPropsMixinS3DestinationPropertiesProperty(props.s3))),
+        salesforce: (!props.salesforce ? undefined : (!props.salesforce ? undefined : flattenCfnFlowPropsMixinSalesforceDestinationPropertiesProperty(props.salesforce))),
+        sapoData: (!props.sapoData ? undefined : (!props.sapoData ? undefined : flattenCfnFlowPropsMixinSAPODataDestinationPropertiesProperty(props.sapoData))),
+        snowflake: (!props.snowflake ? undefined : (!props.snowflake ? undefined : flattenCfnFlowPropsMixinSnowflakeDestinationPropertiesProperty(props.snowflake))),
+        upsolver: (!props.upsolver ? undefined : props.upsolver),
+        zendesk: (!props.zendesk ? undefined : (!props.zendesk ? undefined : flattenCfnFlowPropsMixinZendeskDestinationPropertiesProperty(props.zendesk)))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinDestinationFlowConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        apiVersion: (!props.apiVersion ? undefined : props.apiVersion),
+        connectorProfileName: (!props.connectorProfileName ? undefined : props.connectorProfileName),
+        connectorType: (!props.connectorType ? undefined : props.connectorType),
+        destinationConnectorProperties: (!props.destinationConnectorProperties ? undefined : flattenCfnFlowPropsMixinDestinationConnectorPropertiesProperty(props.destinationConnectorProperties))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinS3SourcePropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketName: (!props.bucketName ? undefined : cdk.getRefProperty(props.bucketName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.bucketName, "bucketName", "s3.IBucketRef | string")),
+        bucketPrefix: (!props.bucketPrefix ? undefined : props.bucketPrefix),
+        s3InputFormatConfig: (!props.s3InputFormatConfig ? undefined : props.s3InputFormatConfig)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinSourceConnectorPropertiesProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        amplitude: (!props.amplitude ? undefined : props.amplitude),
+        customConnector: (!props.customConnector ? undefined : props.customConnector),
+        datadog: (!props.datadog ? undefined : props.datadog),
+        dynatrace: (!props.dynatrace ? undefined : props.dynatrace),
+        googleAnalytics: (!props.googleAnalytics ? undefined : props.googleAnalytics),
+        inforNexus: (!props.inforNexus ? undefined : props.inforNexus),
+        marketo: (!props.marketo ? undefined : props.marketo),
+        pardot: (!props.pardot ? undefined : props.pardot),
+        s3: (!props.s3 ? undefined : (!props.s3 ? undefined : flattenCfnFlowPropsMixinS3SourcePropertiesProperty(props.s3))),
+        salesforce: (!props.salesforce ? undefined : props.salesforce),
+        sapoData: (!props.sapoData ? undefined : props.sapoData),
+        serviceNow: (!props.serviceNow ? undefined : props.serviceNow),
+        singular: (!props.singular ? undefined : props.singular),
+        slack: (!props.slack ? undefined : props.slack),
+        trendmicro: (!props.trendmicro ? undefined : props.trendmicro),
+        veeva: (!props.veeva ? undefined : props.veeva),
+        zendesk: (!props.zendesk ? undefined : props.zendesk)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowPropsMixinSourceFlowConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        apiVersion: (!props.apiVersion ? undefined : props.apiVersion),
+        connectorProfileName: (!props.connectorProfileName ? undefined : props.connectorProfileName),
+        connectorType: (!props.connectorType ? undefined : props.connectorType),
+        incrementalPullConfig: (!props.incrementalPullConfig ? undefined : props.incrementalPullConfig),
+        sourceConnectorProperties: (!props.sourceConnectorProperties ? undefined : flattenCfnFlowPropsMixinSourceConnectorPropertiesProperty(props.sourceConnectorProperties))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnFlowMixinProps(props) {
+    const ret = {};
+    if ((props.destinationFlowConfigList !== undefined))
+        ret.destinationFlowConfigList = (cdk.isResolvableObject(props.destinationFlowConfigList) ? props.destinationFlowConfigList : cdk.mapArrayInPlace(props.destinationFlowConfigList, (item) => flattenCfnFlowPropsMixinDestinationFlowConfigProperty(item)));
+    if ((props.kmsArn !== undefined))
+        ret.kmsArn = cdk.getRefProperty(props.kmsArn?.keyRef, 'keyArn') ?? cdk.ensureStringOrUndefined(props.kmsArn, "kmsArn", "kms.IKeyRef | string");
+    if ((props.sourceFlowConfig !== undefined))
+        ret.sourceFlowConfig = flattenCfnFlowPropsMixinSourceFlowConfigProperty(props.sourceFlowConfig);
+    return ret;
+}

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

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

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

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

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

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-appintegrations";
 export declare class CfnDataIntegrationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDataIntegrationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AppIntegrations::DataIntegration`.
      *
@@ -152,7 +152,7 @@ export interface CfnDataIntegrationMixinProps {
 export declare class CfnEventIntegrationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnEventIntegrationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AppIntegrations::EventIntegration`.
      *
@@ -238,7 +238,7 @@ export interface CfnEventIntegrationMixinProps {
 export declare class CfnApplicationPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnApplicationMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::AppIntegrations::Application`.
      *

package/lib/services/aws-appintegrations/cfn-props-mixins.generated.js

@@ -6,7 +6,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-appintegrations");
 /**
  * Creates and persists a DataIntegration resource.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-appintegrations");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-dataintegration.html
  */
 class CfnDataIntegrationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appintegrations.mixins.CfnDataIntegrationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appintegrations.mixins.CfnDataIntegrationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "fileConfiguration", "kmsKey", "name", "objectConfiguration", "scheduleConfig", "sourceUri", "tags"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnDataIntegrationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -53,12 +52,7 @@ class CfnDataIntegrationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataIntegrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataIntegrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataIntegrationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -74,7 +68,7 @@ exports.CfnDataIntegrationPropsMixin = CfnDataIntegrationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-eventintegration.html
  */
 class CfnEventIntegrationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appintegrations.mixins.CfnEventIntegrationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appintegrations.mixins.CfnEventIntegrationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "eventBridgeBus", "eventFilter", "name", "tags"];
     props;
     strategy;
@@ -97,7 +91,7 @@ class CfnEventIntegrationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -110,12 +104,7 @@ class CfnEventIntegrationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEventIntegrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEventIntegrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEventIntegrationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -129,7 +118,7 @@ exports.CfnEventIntegrationPropsMixin = CfnEventIntegrationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-application.html
  */
 class CfnApplicationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appintegrations.mixins.CfnApplicationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_appintegrations.mixins.CfnApplicationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["applicationConfig", "applicationSourceConfig", "description", "iframeConfig", "initializationTimeout", "isService", "name", "namespace", "permissions", "tags"];
     props;
     strategy;
@@ -152,7 +141,7 @@ class CfnApplicationPropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -165,12 +154,7 @@ class CfnApplicationPropsMixin extends cdk.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);
         }
     }
 }

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

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

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

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

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

@@ -2,6 +2,7 @@ import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-applicationautoscaling";
+import { aws_applicationautoscaling as applicationAutoScalingRefs, aws_iam as iamRefs, aws_msk as mskRefs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::ApplicationAutoScaling::ScalableTarget` resource specifies a resource that Application Auto Scaling can scale, such as an AWS::DynamoDB::Table or AWS::ECS::Service resource.
  *
@@ -17,7 +18,7 @@ import * as service from "aws-cdk-lib/aws-applicationautoscaling";
 export declare class CfnScalableTargetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnScalableTargetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ApplicationAutoScaling::ScalableTarget`.
      *
@@ -207,7 +208,7 @@ export interface CfnScalableTargetMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-resourceid
      */
-    readonly resourceId?: string;
+    readonly resourceId?: mskRefs.IClusterRef | string;
     /**
      * Specify the Amazon Resource Name (ARN) of an Identity and Access Management (IAM) role that allows Application Auto Scaling to modify the scalable target on your behalf.
      *
@@ -217,7 +218,7 @@ export interface CfnScalableTargetMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-rolearn
      */
-    readonly roleArn?: string;
+    readonly roleArn?: iamRefs.IRoleRef | string;
     /**
      * The scalable dimension associated with the scalable target.
      *
@@ -293,7 +294,7 @@ export interface CfnScalableTargetMixinProps {
 export declare class CfnScalingPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnScalingPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::ApplicationAutoScaling::ScalingPolicy`.
      *
@@ -1244,7 +1245,7 @@ export interface CfnScalingPolicyMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-scalingtargetid
      */
-    readonly scalingTargetId?: string;
+    readonly scalingTargetId?: applicationAutoScalingRefs.IScalableTargetRef | string;
     /**
      * The namespace of the AWS service that provides the resource, or a `custom-resource` .
      *