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

package/lib/services/aws-glue/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-glue");
 /**
  * The `AWS::Glue::Classifier` resource creates an AWS Glue classifier that categorizes data sources and specifies schemas.
@@ -19,7 +18,7 @@ const service = require("aws-cdk-lib/aws-glue");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html
  */
 class CfnClassifierPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnClassifierPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnClassifierPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["csvClassifier", "grokClassifier", "jsonClassifier", "xmlClassifier"];
     props;
     strategy;
@@ -42,7 +41,7 @@ class CfnClassifierPropsMixin 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 CfnClassifierPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClassifierPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClassifierPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClassifierPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -76,7 +70,7 @@ exports.CfnClassifierPropsMixin = CfnClassifierPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html
  */
 class CfnConnectionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnConnectionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnConnectionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["catalogId", "connectionInput"];
     props;
     strategy;
@@ -99,7 +93,7 @@ class CfnConnectionPropsMixin 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
@@ -112,12 +106,7 @@ class CfnConnectionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnConnectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnConnectionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnConnectionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -133,7 +122,7 @@ exports.CfnConnectionPropsMixin = CfnConnectionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html
  */
 class CfnCrawlerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnCrawlerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnCrawlerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["classifiers", "configuration", "crawlerSecurityConfiguration", "databaseName", "description", "lakeFormationConfiguration", "name", "recrawlPolicy", "role", "schedule", "schemaChangePolicy", "tablePrefix", "tags", "targets"];
     props;
     strategy;
@@ -155,8 +144,11 @@ class CfnCrawlerPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnCrawlerMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -169,16 +161,60 @@ class CfnCrawlerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCrawlerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCrawlerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCrawlerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnCrawlerPropsMixin = CfnCrawlerPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnCrawlerPropsMixinS3TargetProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        connectionName: (!props.connectionName ? undefined : props.connectionName),
+        dlqEventQueueArn: (!props.dlqEventQueueArn ? undefined : cdk.getRefProperty(props.dlqEventQueueArn?.queueRef, 'queueArn') ?? cdk.ensureStringOrUndefined(props.dlqEventQueueArn, "dlqEventQueueArn", "sqs.IQueueRef | string")),
+        eventQueueArn: (!props.eventQueueArn ? undefined : cdk.getRefProperty(props.eventQueueArn?.queueRef, 'queueArn') ?? cdk.ensureStringOrUndefined(props.eventQueueArn, "eventQueueArn", "sqs.IQueueRef | string")),
+        exclusions: (!props.exclusions ? undefined : props.exclusions),
+        path: (!props.path ? undefined : cdk.getRefProperty(props.path?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.path, "path", "s3.IBucketRef | string")),
+        sampleSize: (!props.sampleSize ? undefined : props.sampleSize)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnCrawlerPropsMixinDynamoDBTargetProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        path: (!props.path ? undefined : cdk.getRefProperty(props.path?.tableRef, 'tableName') ?? cdk.ensureStringOrUndefined(props.path, "path", "dynamodb.ITableRef | string")),
+        scanAll: (!props.scanAll ? undefined : props.scanAll),
+        scanRate: (!props.scanRate ? undefined : props.scanRate)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnCrawlerPropsMixinTargetsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        catalogTargets: (!props.catalogTargets ? undefined : props.catalogTargets),
+        deltaTargets: (!props.deltaTargets ? undefined : props.deltaTargets),
+        dynamoDbTargets: (!props.dynamoDbTargets ? undefined : (cdk.isResolvableObject(props.dynamoDbTargets) ? props.dynamoDbTargets : (!props.dynamoDbTargets ? undefined : cdk.mapArrayInPlace(props.dynamoDbTargets, (item) => flattenCfnCrawlerPropsMixinDynamoDBTargetProperty(item))))),
+        hudiTargets: (!props.hudiTargets ? undefined : props.hudiTargets),
+        icebergTargets: (!props.icebergTargets ? undefined : props.icebergTargets),
+        jdbcTargets: (!props.jdbcTargets ? undefined : props.jdbcTargets),
+        mongoDbTargets: (!props.mongoDbTargets ? undefined : props.mongoDbTargets),
+        s3Targets: (!props.s3Targets ? undefined : (cdk.isResolvableObject(props.s3Targets) ? props.s3Targets : (!props.s3Targets ? undefined : cdk.mapArrayInPlace(props.s3Targets, (item) => flattenCfnCrawlerPropsMixinS3TargetProperty(item)))))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnCrawlerMixinProps(props) {
+    const ret = {};
+    if ((props.databaseName !== undefined))
+        ret.databaseName = cdk.getRefProperty(props.databaseName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.databaseName, "databaseName", "s3.IBucketRef | string");
+    if ((props.role !== undefined))
+        ret.role = cdk.getRefProperty(props.role?.roleRef, 'roleArn') ?? cdk.getRefProperty(props.role?.roleRef, 'roleName') ?? cdk.ensureStringOrUndefined(props.role, "role", "iam.IRoleRef | string");
+    if ((props.targets !== undefined))
+        ret.targets = flattenCfnCrawlerPropsMixinTargetsProperty(props.targets);
+    return ret;
+}
 /**
  * Sets the security configuration for a specified catalog.
  *
@@ -190,7 +226,7 @@ exports.CfnCrawlerPropsMixin = CfnCrawlerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html
  */
 class CfnDataCatalogEncryptionSettingsPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnDataCatalogEncryptionSettingsPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnDataCatalogEncryptionSettingsPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["catalogId", "dataCatalogEncryptionSettings"];
     props;
     strategy;
@@ -213,7 +249,7 @@ class CfnDataCatalogEncryptionSettingsPropsMixin 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
@@ -226,12 +262,7 @@ class CfnDataCatalogEncryptionSettingsPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataCatalogEncryptionSettingsPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataCatalogEncryptionSettingsPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataCatalogEncryptionSettingsPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -247,7 +278,7 @@ exports.CfnDataCatalogEncryptionSettingsPropsMixin = CfnDataCatalogEncryptionSet
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-dataqualityruleset.html
  */
 class CfnDataQualityRulesetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnDataQualityRulesetPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnDataQualityRulesetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["clientToken", "description", "name", "ruleset", "tags", "targetTable"];
     props;
     strategy;
@@ -270,7 +301,7 @@ class CfnDataQualityRulesetPropsMixin 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
@@ -283,12 +314,7 @@ class CfnDataQualityRulesetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataQualityRulesetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataQualityRulesetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataQualityRulesetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -304,7 +330,7 @@ exports.CfnDataQualityRulesetPropsMixin = CfnDataQualityRulesetPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html
  */
 class CfnDatabasePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnDatabasePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnDatabasePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["catalogId", "databaseInput", "databaseName"];
     props;
     strategy;
@@ -326,8 +352,11 @@ class CfnDatabasePropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDatabaseMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -340,16 +369,32 @@ class CfnDatabasePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDatabasePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDatabasePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDatabasePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDatabasePropsMixin = CfnDatabasePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDatabasePropsMixinDatabaseInputProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        createTableDefaultPermissions: (!props.createTableDefaultPermissions ? undefined : props.createTableDefaultPermissions),
+        description: (!props.description ? undefined : props.description),
+        federatedDatabase: (!props.federatedDatabase ? undefined : props.federatedDatabase),
+        locationUri: (!props.locationUri ? undefined : props.locationUri),
+        name: (!props.name ? undefined : cdk.getRefProperty(props.name?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.name, "name", "s3.IBucketRef | string")),
+        parameters: (!props.parameters ? undefined : props.parameters),
+        targetDatabase: (!props.targetDatabase ? undefined : props.targetDatabase)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDatabaseMixinProps(props) {
+    const ret = {};
+    if ((props.databaseInput !== undefined))
+        ret.databaseInput = flattenCfnDatabasePropsMixinDatabaseInputProperty(props.databaseInput);
+    return ret;
+}
 /**
  * The `AWS::Glue::DevEndpoint` resource specifies a development endpoint where a developer can remotely debug ETL scripts for AWS Glue .
  *
@@ -361,7 +406,7 @@ exports.CfnDatabasePropsMixin = CfnDatabasePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html
  */
 class CfnDevEndpointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnDevEndpointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnDevEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["arguments", "endpointName", "extraJarsS3Path", "extraPythonLibsS3Path", "glueVersion", "numberOfNodes", "numberOfWorkers", "publicKey", "publicKeys", "roleArn", "securityConfiguration", "securityGroupIds", "subnetId", "tags", "workerType"];
     props;
     strategy;
@@ -384,7 +429,7 @@ class CfnDevEndpointPropsMixin 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
@@ -397,12 +442,7 @@ class CfnDevEndpointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDevEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDevEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDevEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -418,7 +458,7 @@ exports.CfnDevEndpointPropsMixin = CfnDevEndpointPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html
  */
 class CfnJobPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnJobPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnJobPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["allocatedCapacity", "command", "connections", "defaultArguments", "description", "executionClass", "executionProperty", "glueVersion", "jobMode", "jobRunQueuingEnabled", "logUri", "maintenanceWindow", "maxCapacity", "maxRetries", "name", "nonOverridableArguments", "notificationProperty", "numberOfWorkers", "role", "securityConfiguration", "tags", "timeout", "workerType"];
     props;
     strategy;
@@ -440,8 +480,11 @@ class CfnJobPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnJobMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -454,16 +497,18 @@ class CfnJobPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnJobPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnJobPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnJobPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnJobPropsMixin = CfnJobPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnJobMixinProps(props) {
+    const ret = {};
+    if ((props.role !== undefined))
+        ret.role = cdk.getRefProperty(props.role?.roleRef, 'roleArn') ?? cdk.getRefProperty(props.role?.roleRef, 'roleName') ?? cdk.ensureStringOrUndefined(props.role, "role", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * The AWS::Glue::MLTransform is an AWS Glue resource type that manages machine learning transforms.
  *
@@ -473,7 +518,7 @@ exports.CfnJobPropsMixin = CfnJobPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html
  */
 class CfnMLTransformPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnMLTransformPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnMLTransformPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "glueVersion", "inputRecordTables", "maxCapacity", "maxRetries", "name", "numberOfWorkers", "role", "tags", "timeout", "transformEncryption", "transformParameters", "workerType"];
     props;
     strategy;
@@ -496,7 +541,7 @@ class CfnMLTransformPropsMixin 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
@@ -509,12 +554,7 @@ class CfnMLTransformPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMLTransformPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMLTransformPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMLTransformPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -530,7 +570,7 @@ exports.CfnMLTransformPropsMixin = CfnMLTransformPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html
  */
 class CfnPartitionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnPartitionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnPartitionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["catalogId", "databaseName", "partitionInput", "tableName"];
     props;
     strategy;
@@ -553,7 +593,7 @@ class CfnPartitionPropsMixin 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
@@ -566,12 +606,7 @@ class CfnPartitionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPartitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPartitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPartitionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -585,7 +620,7 @@ exports.CfnPartitionPropsMixin = CfnPartitionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-registry.html
  */
 class CfnRegistryPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnRegistryPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnRegistryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "name", "tags"];
     props;
     strategy;
@@ -608,7 +643,7 @@ class CfnRegistryPropsMixin 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
@@ -621,12 +656,7 @@ class CfnRegistryPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnRegistryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnRegistryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnRegistryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -640,7 +670,7 @@ exports.CfnRegistryPropsMixin = CfnRegistryPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html
  */
 class CfnSchemaPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnSchemaPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnSchemaPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["checkpointVersion", "compatibility", "dataFormat", "description", "name", "registry", "schemaDefinition", "tags"];
     props;
     strategy;
@@ -662,8 +692,11 @@ class CfnSchemaPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSchemaMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -676,16 +709,27 @@ class CfnSchemaPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSchemaPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSchemaPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSchemaPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSchemaPropsMixin = CfnSchemaPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSchemaPropsMixinRegistryProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        arn: (!props.arn ? undefined : cdk.getRefProperty(props.arn?.registryRef, 'registryArn') ?? cdk.ensureStringOrUndefined(props.arn, "arn", "glue.IRegistryRef | string")),
+        name: (!props.name ? undefined : props.name)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnSchemaMixinProps(props) {
+    const ret = {};
+    if ((props.registry !== undefined))
+        ret.registry = flattenCfnSchemaPropsMixinRegistryProperty(props.registry);
+    return ret;
+}
 /**
  * The `AWS::Glue::SchemaVersion` is an AWS Glue resource type that manages schema versions of schemas in the AWS Glue Schema Registry.
  *
@@ -695,7 +739,7 @@ exports.CfnSchemaPropsMixin = CfnSchemaPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversion.html
  */
 class CfnSchemaVersionPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnSchemaVersionPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnSchemaVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["schema", "schemaDefinition"];
     props;
     strategy;
@@ -717,8 +761,11 @@ class CfnSchemaVersionPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSchemaVersionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -731,16 +778,28 @@ class CfnSchemaVersionPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSchemaVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSchemaVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSchemaVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSchemaVersionPropsMixin = CfnSchemaVersionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSchemaVersionPropsMixinSchemaProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        registryName: (!props.registryName ? undefined : props.registryName),
+        schemaArn: (!props.schemaArn ? undefined : cdk.getRefProperty(props.schemaArn?.schemaRef, 'schemaArn') ?? cdk.ensureStringOrUndefined(props.schemaArn, "schemaArn", "glue.ISchemaRef | string")),
+        schemaName: (!props.schemaName ? undefined : props.schemaName)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnSchemaVersionMixinProps(props) {
+    const ret = {};
+    if ((props.schema !== undefined))
+        ret.schema = flattenCfnSchemaVersionPropsMixinSchemaProperty(props.schema);
+    return ret;
+}
 /**
  * The `AWS::Glue::SchemaVersionMetadata` is an AWS Glue resource type that defines the metadata key-value pairs for a schema version in AWS Glue Schema Registry.
  *
@@ -750,7 +809,7 @@ exports.CfnSchemaVersionPropsMixin = CfnSchemaVersionPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversionmetadata.html
  */
 class CfnSchemaVersionMetadataPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnSchemaVersionMetadataPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnSchemaVersionMetadataPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["key", "schemaVersionId", "value"];
     props;
     strategy;
@@ -772,8 +831,11 @@ class CfnSchemaVersionMetadataPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnSchemaVersionMetadataMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -786,16 +848,18 @@ class CfnSchemaVersionMetadataPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSchemaVersionMetadataPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSchemaVersionMetadataPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSchemaVersionMetadataPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnSchemaVersionMetadataPropsMixin = CfnSchemaVersionMetadataPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnSchemaVersionMetadataMixinProps(props) {
+    const ret = {};
+    if ((props.schemaVersionId !== undefined))
+        ret.schemaVersionId = cdk.getRefProperty(props.schemaVersionId?.schemaVersionRef, 'versionId') ?? cdk.ensureStringOrUndefined(props.schemaVersionId, "schemaVersionId", "glue.ISchemaVersionRef | string");
+    return ret;
+}
 /**
  * Creates a new security configuration.
  *
@@ -807,7 +871,7 @@ exports.CfnSchemaVersionMetadataPropsMixin = CfnSchemaVersionMetadataPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html
  */
 class CfnSecurityConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnSecurityConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnSecurityConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["encryptionConfiguration", "name"];
     props;
     strategy;
@@ -830,7 +894,7 @@ class CfnSecurityConfigurationPropsMixin 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
@@ -843,12 +907,7 @@ class CfnSecurityConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSecurityConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSecurityConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSecurityConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -864,7 +923,7 @@ exports.CfnSecurityConfigurationPropsMixin = CfnSecurityConfigurationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html
  */
 class CfnTablePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnTablePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnTablePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["catalogId", "databaseName", "openTableFormatInput", "tableInput"];
     props;
     strategy;
@@ -887,7 +946,7 @@ class CfnTablePropsMixin 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
@@ -900,12 +959,7 @@ class CfnTablePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTablePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTablePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTablePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -921,7 +975,7 @@ exports.CfnTablePropsMixin = CfnTablePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html
  */
 class CfnTriggerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnTriggerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnTriggerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["actions", "description", "eventBatchingCondition", "name", "predicate", "schedule", "startOnCreation", "tags", "type", "workflowName"];
     props;
     strategy;
@@ -944,7 +998,7 @@ class CfnTriggerPropsMixin 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
@@ -957,12 +1011,7 @@ class CfnTriggerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTriggerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTriggerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTriggerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -978,7 +1027,7 @@ exports.CfnTriggerPropsMixin = CfnTriggerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-workflow.html
  */
 class CfnWorkflowPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnWorkflowPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnWorkflowPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["defaultRunProperties", "description", "maxConcurrentRuns", "name", "tags"];
     props;
     strategy;
@@ -1001,7 +1050,7 @@ class CfnWorkflowPropsMixin 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
@@ -1014,12 +1063,7 @@ class CfnWorkflowPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnWorkflowPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnWorkflowPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnWorkflowPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1035,7 +1079,7 @@ exports.CfnWorkflowPropsMixin = CfnWorkflowPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-customentitytype.html
  */
 class CfnCustomEntityTypePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnCustomEntityTypePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnCustomEntityTypePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["contextWords", "name", "regexString", "tags"];
     props;
     strategy;
@@ -1058,7 +1102,7 @@ class CfnCustomEntityTypePropsMixin 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
@@ -1071,12 +1115,7 @@ class CfnCustomEntityTypePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCustomEntityTypePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCustomEntityTypePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCustomEntityTypePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1090,7 +1129,7 @@ exports.CfnCustomEntityTypePropsMixin = CfnCustomEntityTypePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-identitycenterconfiguration.html
  */
 class CfnIdentityCenterConfigurationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnIdentityCenterConfigurationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnIdentityCenterConfigurationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["instanceArn", "scopes", "userBackgroundSessionsEnabled"];
     props;
     strategy;
@@ -1113,7 +1152,7 @@ class CfnIdentityCenterConfigurationPropsMixin 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
@@ -1126,12 +1165,7 @@ class CfnIdentityCenterConfigurationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIdentityCenterConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIdentityCenterConfigurationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIdentityCenterConfigurationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1147,7 +1181,7 @@ exports.CfnIdentityCenterConfigurationPropsMixin = CfnIdentityCenterConfiguratio
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-integration.html
  */
 class CfnIntegrationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnIntegrationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnIntegrationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["additionalEncryptionContext", "dataFilter", "description", "integrationConfig", "integrationName", "kmsKeyId", "sourceArn", "tags", "targetArn"];
     props;
     strategy;
@@ -1170,7 +1204,7 @@ class CfnIntegrationPropsMixin 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
@@ -1183,12 +1217,7 @@ class CfnIntegrationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIntegrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIntegrationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIntegrationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1204,7 +1233,7 @@ exports.CfnIntegrationPropsMixin = CfnIntegrationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-integrationresourceproperty.html
  */
 class CfnIntegrationResourcePropertyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnIntegrationResourcePropertyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnIntegrationResourcePropertyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["resourceArn", "sourceProcessingProperties", "tags", "targetProcessingProperties"];
     props;
     strategy;
@@ -1227,7 +1256,7 @@ class CfnIntegrationResourcePropertyPropsMixin 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
@@ -1240,12 +1269,7 @@ class CfnIntegrationResourcePropertyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnIntegrationResourcePropertyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnIntegrationResourcePropertyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnIntegrationResourcePropertyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1259,7 +1283,7 @@ exports.CfnIntegrationResourcePropertyPropsMixin = CfnIntegrationResourcePropert
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-tableoptimizer.html
  */
 class CfnTableOptimizerPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnTableOptimizerPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnTableOptimizerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["catalogId", "databaseName", "tableName", "tableOptimizerConfiguration", "type"];
     props;
     strategy;
@@ -1282,7 +1306,7 @@ class CfnTableOptimizerPropsMixin 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
@@ -1295,12 +1319,7 @@ class CfnTableOptimizerPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTableOptimizerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTableOptimizerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTableOptimizerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1314,7 +1333,7 @@ exports.CfnTableOptimizerPropsMixin = CfnTableOptimizerPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-usageprofile.html
  */
 class CfnUsageProfilePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnUsageProfilePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_glue.mixins.CfnUsageProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["configuration", "description", "name", "tags"];
     props;
     strategy;
@@ -1337,7 +1356,7 @@ class CfnUsageProfilePropsMixin 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
@@ -1350,12 +1369,7 @@ class CfnUsageProfilePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUsageProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUsageProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUsageProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }