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

package/lib/services/aws-sagemaker/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-sagemaker");
 /**
  * Creates a running app for the specified UserProfile.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/aws-sagemaker");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-app.html
  */
-class CfnAppPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnAppPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAppPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnAppPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["appName", "appType", "domainId", "recoveryMode", "resourceSpec", "tags", "userProfileName"];
     props;
     strategy;
@@ -43,7 +41,7 @@ class CfnAppPropsMixin 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
@@ -56,12 +54,7 @@ class CfnAppPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAppPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAppPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAppPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -76,8 +69,8 @@ exports.CfnAppPropsMixin = CfnAppPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-appimageconfig.html
  */
-class CfnAppImageConfigPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnAppImageConfigPropsMixin", version: "2.240.0-alpha.0" };
+class CfnAppImageConfigPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnAppImageConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["appImageConfigName", "codeEditorAppImageConfig", "jupyterLabAppImageConfig", "kernelGatewayImageConfig", "tags"];
     props;
     strategy;
@@ -100,7 +93,7 @@ class CfnAppImageConfigPropsMixin 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
@@ -113,12 +106,7 @@ class CfnAppImageConfigPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAppImageConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAppImageConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAppImageConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -135,8 +123,8 @@ exports.CfnAppImageConfigPropsMixin = CfnAppImageConfigPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-coderepository.html
  */
-class CfnCodeRepositoryPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnCodeRepositoryPropsMixin", version: "2.240.0-alpha.0" };
+class CfnCodeRepositoryPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnCodeRepositoryPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["codeRepositoryName", "gitConfig", "tags"];
     props;
     strategy;
@@ -159,7 +147,7 @@ class CfnCodeRepositoryPropsMixin 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
@@ -172,12 +160,7 @@ class CfnCodeRepositoryPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCodeRepositoryPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCodeRepositoryPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCodeRepositoryPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -192,8 +175,8 @@ exports.CfnCodeRepositoryPropsMixin = CfnCodeRepositoryPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html
  */
-class CfnDataQualityJobDefinitionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnDataQualityJobDefinitionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDataQualityJobDefinitionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnDataQualityJobDefinitionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dataQualityAppSpecification", "dataQualityBaselineConfig", "dataQualityJobInput", "dataQualityJobOutputConfig", "endpointName", "jobDefinitionName", "jobResources", "networkConfig", "roleArn", "stoppingCondition", "tags"];
     props;
     strategy;
@@ -215,8 +198,11 @@ class CfnDataQualityJobDefinitionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDataQualityJobDefinitionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -229,16 +215,18 @@ class CfnDataQualityJobDefinitionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDataQualityJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDataQualityJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDataQualityJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDataQualityJobDefinitionPropsMixin = CfnDataQualityJobDefinitionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDataQualityJobDefinitionMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * The `AWS::SageMaker::Device` resource is an Amazon SageMaker resource type that allows you to register your Devices against an existing SageMaker Edge Manager DeviceFleet.
  *
@@ -249,8 +237,8 @@ exports.CfnDataQualityJobDefinitionPropsMixin = CfnDataQualityJobDefinitionProps
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-device.html
  */
-class CfnDevicePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnDevicePropsMixin", version: "2.240.0-alpha.0" };
+class CfnDevicePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnDevicePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["device", "deviceFleetName", "tags"];
     props;
     strategy;
@@ -273,7 +261,7 @@ class CfnDevicePropsMixin 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
@@ -286,12 +274,7 @@ class CfnDevicePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDevicePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDevicePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDevicePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -306,8 +289,8 @@ exports.CfnDevicePropsMixin = CfnDevicePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-devicefleet.html
  */
-class CfnDeviceFleetPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnDeviceFleetPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDeviceFleetPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnDeviceFleetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "deviceFleetName", "outputConfig", "roleArn", "tags"];
     props;
     strategy;
@@ -329,8 +312,11 @@ class CfnDeviceFleetPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDeviceFleetMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -343,16 +329,18 @@ class CfnDeviceFleetPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDeviceFleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDeviceFleetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDeviceFleetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDeviceFleetPropsMixin = CfnDeviceFleetPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDeviceFleetMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * Creates a `Domain` .
  *
@@ -382,8 +370,8 @@ exports.CfnDeviceFleetPropsMixin = CfnDeviceFleetPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html
  */
-class CfnDomainPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnDomainPropsMixin", version: "2.240.0-alpha.0" };
+class CfnDomainPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnDomainPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["appNetworkAccessType", "appSecurityGroupManagement", "authMode", "defaultSpaceSettings", "defaultUserSettings", "domainName", "domainSettings", "kmsKeyId", "subnetIds", "tagPropagation", "tags", "vpcId"];
     props;
     strategy;
@@ -405,8 +393,11 @@ class CfnDomainPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnDomainMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -419,16 +410,45 @@ class CfnDomainPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDomainPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnDomainPropsMixin = CfnDomainPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnDomainPropsMixinUserSettingsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        autoMountHomeEfs: (!props.autoMountHomeEfs ? undefined : props.autoMountHomeEfs),
+        codeEditorAppSettings: (!props.codeEditorAppSettings ? undefined : props.codeEditorAppSettings),
+        customFileSystemConfigs: (!props.customFileSystemConfigs ? undefined : props.customFileSystemConfigs),
+        customPosixUserConfig: (!props.customPosixUserConfig ? undefined : props.customPosixUserConfig),
+        defaultLandingUri: (!props.defaultLandingUri ? undefined : props.defaultLandingUri),
+        executionRole: (!props.executionRole ? undefined : cdk.getRefProperty(props.executionRole?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.executionRole, "executionRole", "iam.IRoleRef | string")),
+        jupyterLabAppSettings: (!props.jupyterLabAppSettings ? undefined : props.jupyterLabAppSettings),
+        jupyterServerAppSettings: (!props.jupyterServerAppSettings ? undefined : props.jupyterServerAppSettings),
+        kernelGatewayAppSettings: (!props.kernelGatewayAppSettings ? undefined : props.kernelGatewayAppSettings),
+        rSessionAppSettings: (!props.rSessionAppSettings ? undefined : props.rSessionAppSettings),
+        rStudioServerProAppSettings: (!props.rStudioServerProAppSettings ? undefined : props.rStudioServerProAppSettings),
+        securityGroups: (!props.securityGroups ? undefined : cdk.mapArrayInPlace(props.securityGroups, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroups", "ec2.ISecurityGroupRef | string"))),
+        sharingSettings: (!props.sharingSettings ? undefined : props.sharingSettings),
+        spaceStorageSettings: (!props.spaceStorageSettings ? undefined : props.spaceStorageSettings),
+        studioWebPortal: (!props.studioWebPortal ? undefined : props.studioWebPortal),
+        studioWebPortalSettings: (!props.studioWebPortalSettings ? undefined : props.studioWebPortalSettings)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnDomainMixinProps(props) {
+    const ret = {};
+    if ((props.defaultUserSettings !== undefined))
+        ret.defaultUserSettings = flattenCfnDomainPropsMixinUserSettingsProperty(props.defaultUserSettings);
+    if ((props.subnetIds !== undefined))
+        ret.subnetIds = cdk.mapArrayInPlace(props.subnetIds, (item) => cdk.getRefProperty(item?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(item, "subnetIds", "ec2.ISubnetRef | string"));
+    if ((props.vpcId !== undefined))
+        ret.vpcId = cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string");
+    return ret;
+}
 /**
  * Use the `AWS::SageMaker::Endpoint` resource to create an endpoint using the specified configuration in the request.
  *
@@ -439,8 +459,8 @@ exports.CfnDomainPropsMixin = CfnDomainPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpoint.html
  */
-class CfnEndpointPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnEndpointPropsMixin", version: "2.240.0-alpha.0" };
+class CfnEndpointPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnEndpointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deploymentConfig", "endpointConfigName", "endpointName", "excludeRetainedVariantProperties", "retainAllVariantProperties", "retainDeploymentConfig", "tags"];
     props;
     strategy;
@@ -463,7 +483,7 @@ class CfnEndpointPropsMixin 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
@@ -476,12 +496,7 @@ class CfnEndpointPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEndpointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEndpointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -496,8 +511,8 @@ exports.CfnEndpointPropsMixin = CfnEndpointPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpointconfig.html
  */
-class CfnEndpointConfigPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnEndpointConfigPropsMixin", version: "2.240.0-alpha.0" };
+class CfnEndpointConfigPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnEndpointConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["asyncInferenceConfig", "dataCaptureConfig", "enableNetworkIsolation", "endpointConfigName", "executionRoleArn", "explainerConfig", "kmsKeyId", "productionVariants", "shadowProductionVariants", "tags", "vpcConfig"];
     props;
     strategy;
@@ -520,7 +535,7 @@ class CfnEndpointConfigPropsMixin 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
@@ -533,12 +548,7 @@ class CfnEndpointConfigPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnEndpointConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnEndpointConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnEndpointConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -557,8 +567,8 @@ exports.CfnEndpointConfigPropsMixin = CfnEndpointConfigPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html
  */
-class CfnFeatureGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnFeatureGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnFeatureGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnFeatureGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "eventTimeFeatureName", "featureDefinitions", "featureGroupName", "offlineStoreConfig", "onlineStoreConfig", "recordIdentifierFeatureName", "roleArn", "tags", "throughputConfig"];
     props;
     strategy;
@@ -580,8 +590,11 @@ class CfnFeatureGroupPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnFeatureGroupMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -594,16 +607,18 @@ class CfnFeatureGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFeatureGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFeatureGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFeatureGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnFeatureGroupPropsMixin = CfnFeatureGroupPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnFeatureGroupMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * Creates a custom SageMaker AI image.
  *
@@ -614,8 +629,8 @@ exports.CfnFeatureGroupPropsMixin = CfnFeatureGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-image.html
  */
-class CfnImagePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnImagePropsMixin", version: "2.240.0-alpha.0" };
+class CfnImagePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnImagePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["imageDescription", "imageDisplayName", "imageName", "imageRoleArn", "tags"];
     props;
     strategy;
@@ -638,7 +653,7 @@ class CfnImagePropsMixin 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
@@ -651,12 +666,7 @@ class CfnImagePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnImagePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnImagePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnImagePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -677,8 +687,8 @@ exports.CfnImagePropsMixin = CfnImagePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-imageversion.html
  */
-class CfnImageVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnImageVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnImageVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnImageVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["alias", "aliases", "baseImage", "horovod", "imageName", "jobType", "mlFramework", "processor", "programmingLang", "releaseNotes", "vendorGuidance"];
     props;
     strategy;
@@ -701,7 +711,7 @@ class CfnImageVersionPropsMixin 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
@@ -714,12 +724,7 @@ class CfnImageVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnImageVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnImageVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnImageVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -738,8 +743,8 @@ exports.CfnImageVersionPropsMixin = CfnImageVersionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-inferenceexperiment.html
  */
-class CfnInferenceExperimentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnInferenceExperimentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnInferenceExperimentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnInferenceExperimentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dataStorageConfig", "description", "desiredState", "endpointName", "kmsKey", "modelVariants", "name", "roleArn", "schedule", "shadowModeConfig", "statusReason", "tags", "type"];
     props;
     strategy;
@@ -762,7 +767,7 @@ class CfnInferenceExperimentPropsMixin 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
@@ -775,12 +780,7 @@ class CfnInferenceExperimentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInferenceExperimentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInferenceExperimentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInferenceExperimentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -795,8 +795,8 @@ exports.CfnInferenceExperimentPropsMixin = CfnInferenceExperimentPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-model.html
  */
-class CfnModelPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelPropsMixin", version: "2.240.0-alpha.0" };
+class CfnModelPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["containers", "enableNetworkIsolation", "executionRoleArn", "inferenceExecutionConfig", "modelName", "primaryContainer", "tags", "vpcConfig"];
     props;
     strategy;
@@ -819,7 +819,7 @@ class CfnModelPropsMixin 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
@@ -832,12 +832,7 @@ class CfnModelPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnModelPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnModelPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnModelPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -850,8 +845,8 @@ exports.CfnModelPropsMixin = CfnModelPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html
  */
-class CfnModelBiasJobDefinitionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelBiasJobDefinitionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnModelBiasJobDefinitionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelBiasJobDefinitionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["endpointName", "jobDefinitionName", "jobResources", "modelBiasAppSpecification", "modelBiasBaselineConfig", "modelBiasJobInput", "modelBiasJobOutputConfig", "networkConfig", "roleArn", "stoppingCondition", "tags"];
     props;
     strategy;
@@ -873,8 +868,11 @@ class CfnModelBiasJobDefinitionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnModelBiasJobDefinitionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -887,16 +885,18 @@ class CfnModelBiasJobDefinitionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnModelBiasJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnModelBiasJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnModelBiasJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnModelBiasJobDefinitionPropsMixin = CfnModelBiasJobDefinitionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnModelBiasJobDefinitionMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * Creates an Amazon SageMaker Model Card.
  *
@@ -907,8 +907,8 @@ exports.CfnModelBiasJobDefinitionPropsMixin = CfnModelBiasJobDefinitionPropsMixi
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelcard.html
  */
-class CfnModelCardPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelCardPropsMixin", version: "2.240.0-alpha.0" };
+class CfnModelCardPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelCardPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["content", "createdBy", "lastModifiedBy", "modelCardName", "modelCardStatus", "securityConfig", "tags"];
     props;
     strategy;
@@ -931,7 +931,7 @@ class CfnModelCardPropsMixin 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
@@ -944,12 +944,7 @@ class CfnModelCardPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnModelCardPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnModelCardPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnModelCardPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -962,8 +957,8 @@ exports.CfnModelCardPropsMixin = CfnModelCardPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html
  */
-class CfnModelExplainabilityJobDefinitionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelExplainabilityJobDefinitionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnModelExplainabilityJobDefinitionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelExplainabilityJobDefinitionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["endpointName", "jobDefinitionName", "jobResources", "modelExplainabilityAppSpecification", "modelExplainabilityBaselineConfig", "modelExplainabilityJobInput", "modelExplainabilityJobOutputConfig", "networkConfig", "roleArn", "stoppingCondition", "tags"];
     props;
     strategy;
@@ -985,8 +980,11 @@ class CfnModelExplainabilityJobDefinitionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnModelExplainabilityJobDefinitionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -999,16 +997,18 @@ class CfnModelExplainabilityJobDefinitionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnModelExplainabilityJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnModelExplainabilityJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnModelExplainabilityJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnModelExplainabilityJobDefinitionPropsMixin = CfnModelExplainabilityJobDefinitionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnModelExplainabilityJobDefinitionMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * A container for your trained model that can be deployed for SageMaker inference.
  *
@@ -1024,8 +1024,8 @@ exports.CfnModelExplainabilityJobDefinitionPropsMixin = CfnModelExplainabilityJo
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html
  */
-class CfnModelPackagePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelPackagePropsMixin", version: "2.240.0-alpha.0" };
+class CfnModelPackagePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelPackagePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["additionalInferenceSpecifications", "additionalInferenceSpecificationsToAdd", "approvalDescription", "certifyForMarketplace", "clientToken", "customerMetadataProperties", "domain", "driftCheckBaselines", "inferenceSpecification", "lastModifiedTime", "metadataProperties", "modelApprovalStatus", "modelCard", "modelMetrics", "modelPackageDescription", "modelPackageGroupName", "modelPackageName", "modelPackageStatusDetails", "modelPackageVersion", "samplePayloadUrl", "securityConfig", "skipModelValidation", "sourceAlgorithmSpecification", "sourceUri", "tags", "task", "validationSpecification"];
     props;
     strategy;
@@ -1048,7 +1048,7 @@ class CfnModelPackagePropsMixin 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
@@ -1061,12 +1061,7 @@ class CfnModelPackagePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnModelPackagePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnModelPackagePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnModelPackagePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1079,8 +1074,8 @@ exports.CfnModelPackagePropsMixin = CfnModelPackagePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackagegroup.html
  */
-class CfnModelPackageGroupPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelPackageGroupPropsMixin", version: "2.240.0-alpha.0" };
+class CfnModelPackageGroupPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelPackageGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["modelPackageGroupDescription", "modelPackageGroupName", "modelPackageGroupPolicy", "tags"];
     props;
     strategy;
@@ -1103,7 +1098,7 @@ class CfnModelPackageGroupPropsMixin 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
@@ -1116,12 +1111,7 @@ class CfnModelPackageGroupPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnModelPackageGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnModelPackageGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnModelPackageGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1136,8 +1126,8 @@ exports.CfnModelPackageGroupPropsMixin = CfnModelPackageGroupPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html
  */
-class CfnModelQualityJobDefinitionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelQualityJobDefinitionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnModelQualityJobDefinitionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnModelQualityJobDefinitionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["endpointName", "jobDefinitionName", "jobResources", "modelQualityAppSpecification", "modelQualityBaselineConfig", "modelQualityJobInput", "modelQualityJobOutputConfig", "networkConfig", "roleArn", "stoppingCondition", "tags"];
     props;
     strategy;
@@ -1159,8 +1149,11 @@ class CfnModelQualityJobDefinitionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnModelQualityJobDefinitionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1173,16 +1166,18 @@ class CfnModelQualityJobDefinitionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnModelQualityJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnModelQualityJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnModelQualityJobDefinitionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnModelQualityJobDefinitionPropsMixin = CfnModelQualityJobDefinitionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnModelQualityJobDefinitionMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * The `AWS::SageMaker::MonitoringSchedule` resource is an Amazon SageMaker resource type that regularly starts SageMaker processing Jobs to monitor the data captured for a SageMaker endpoint.
  *
@@ -1191,8 +1186,8 @@ exports.CfnModelQualityJobDefinitionPropsMixin = CfnModelQualityJobDefinitionPro
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-monitoringschedule.html
  */
-class CfnMonitoringSchedulePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnMonitoringSchedulePropsMixin", version: "2.240.0-alpha.0" };
+class CfnMonitoringSchedulePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnMonitoringSchedulePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["endpointName", "failureReason", "lastMonitoringExecutionSummary", "monitoringScheduleConfig", "monitoringScheduleName", "monitoringScheduleStatus", "tags"];
     props;
     strategy;
@@ -1214,8 +1209,11 @@ class CfnMonitoringSchedulePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnMonitoringScheduleMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1228,16 +1226,45 @@ class CfnMonitoringSchedulePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMonitoringSchedulePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMonitoringSchedulePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMonitoringSchedulePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnMonitoringSchedulePropsMixin = CfnMonitoringSchedulePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnMonitoringSchedulePropsMixinMonitoringJobDefinitionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        baselineConfig: (!props.baselineConfig ? undefined : props.baselineConfig),
+        environment: (!props.environment ? undefined : props.environment),
+        monitoringAppSpecification: (!props.monitoringAppSpecification ? undefined : props.monitoringAppSpecification),
+        monitoringInputs: (!props.monitoringInputs ? undefined : props.monitoringInputs),
+        monitoringOutputConfig: (!props.monitoringOutputConfig ? undefined : props.monitoringOutputConfig),
+        monitoringResources: (!props.monitoringResources ? undefined : props.monitoringResources),
+        networkConfig: (!props.networkConfig ? undefined : props.networkConfig),
+        roleArn: (!props.roleArn ? undefined : cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string")),
+        stoppingCondition: (!props.stoppingCondition ? undefined : props.stoppingCondition)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnMonitoringSchedulePropsMixinMonitoringScheduleConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        monitoringJobDefinition: (!props.monitoringJobDefinition ? undefined : (!props.monitoringJobDefinition ? undefined : flattenCfnMonitoringSchedulePropsMixinMonitoringJobDefinitionProperty(props.monitoringJobDefinition))),
+        monitoringJobDefinitionName: (!props.monitoringJobDefinitionName ? undefined : props.monitoringJobDefinitionName),
+        monitoringType: (!props.monitoringType ? undefined : props.monitoringType),
+        scheduleConfig: (!props.scheduleConfig ? undefined : props.scheduleConfig)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnMonitoringScheduleMixinProps(props) {
+    const ret = {};
+    if ((props.monitoringScheduleConfig !== undefined))
+        ret.monitoringScheduleConfig = flattenCfnMonitoringSchedulePropsMixinMonitoringScheduleConfigProperty(props.monitoringScheduleConfig);
+    return ret;
+}
 /**
  * The `AWS::SageMaker::NotebookInstance` resource creates an Amazon SageMaker notebook instance.
  *
@@ -1248,8 +1275,8 @@ exports.CfnMonitoringSchedulePropsMixin = CfnMonitoringSchedulePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html
  */
-class CfnNotebookInstancePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnNotebookInstancePropsMixin", version: "2.240.0-alpha.0" };
+class CfnNotebookInstancePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnNotebookInstancePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["acceleratorTypes", "additionalCodeRepositories", "defaultCodeRepository", "directInternetAccess", "instanceMetadataServiceConfiguration", "instanceType", "kmsKeyId", "lifecycleConfigName", "notebookInstanceName", "platformIdentifier", "roleArn", "rootAccess", "securityGroupIds", "subnetId", "tags", "volumeSizeInGb"];
     props;
     strategy;
@@ -1272,7 +1299,7 @@ class CfnNotebookInstancePropsMixin 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
@@ -1285,12 +1312,7 @@ class CfnNotebookInstancePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNotebookInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNotebookInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNotebookInstancePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1305,8 +1327,8 @@ exports.CfnNotebookInstancePropsMixin = CfnNotebookInstancePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstancelifecycleconfig.html
  */
-class CfnNotebookInstanceLifecycleConfigPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnNotebookInstanceLifecycleConfigPropsMixin", version: "2.240.0-alpha.0" };
+class CfnNotebookInstanceLifecycleConfigPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnNotebookInstanceLifecycleConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["notebookInstanceLifecycleConfigName", "onCreate", "onStart"];
     props;
     strategy;
@@ -1329,7 +1351,7 @@ class CfnNotebookInstanceLifecycleConfigPropsMixin 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
@@ -1342,12 +1364,7 @@ class CfnNotebookInstanceLifecycleConfigPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnNotebookInstanceLifecycleConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnNotebookInstanceLifecycleConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnNotebookInstanceLifecycleConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1362,8 +1379,8 @@ exports.CfnNotebookInstanceLifecycleConfigPropsMixin = CfnNotebookInstanceLifecy
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-pipeline.html
  */
-class CfnPipelinePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnPipelinePropsMixin", version: "2.240.0-alpha.0" };
+class CfnPipelinePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnPipelinePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["parallelismConfiguration", "pipelineDefinition", "pipelineDescription", "pipelineDisplayName", "pipelineName", "roleArn", "tags"];
     props;
     strategy;
@@ -1385,8 +1402,11 @@ class CfnPipelinePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnPipelineMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1399,16 +1419,18 @@ class CfnPipelinePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPipelinePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPipelinePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPipelinePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnPipelinePropsMixin = CfnPipelinePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnPipelineMixinProps(props) {
+    const ret = {};
+    if ((props.roleArn !== undefined))
+        ret.roleArn = cdk.getRefProperty(props.roleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.roleArn, "roleArn", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * Creates a machine learning (ML) project that can contain one or more templates that set up an ML pipeline from training to deploying an approved model.
  *
@@ -1417,8 +1439,8 @@ exports.CfnPipelinePropsMixin = CfnPipelinePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-project.html
  */
-class CfnProjectPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnProjectPropsMixin", version: "2.240.0-alpha.0" };
+class CfnProjectPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnProjectPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["projectDescription", "projectName", "serviceCatalogProvisionedProductDetails", "serviceCatalogProvisioningDetails", "tags", "templateProviderDetails"];
     props;
     strategy;
@@ -1441,7 +1463,7 @@ class CfnProjectPropsMixin 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
@@ -1454,12 +1476,7 @@ class CfnProjectPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnProjectPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnProjectPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnProjectPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1472,8 +1489,8 @@ exports.CfnProjectPropsMixin = CfnProjectPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-space.html
  */
-class CfnSpacePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnSpacePropsMixin", version: "2.240.0-alpha.0" };
+class CfnSpacePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnSpacePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["domainId", "ownershipSettings", "spaceDisplayName", "spaceName", "spaceSettings", "spaceSharingSettings", "tags"];
     props;
     strategy;
@@ -1496,7 +1513,7 @@ class CfnSpacePropsMixin 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
@@ -1509,12 +1526,7 @@ class CfnSpacePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSpacePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSpacePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSpacePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1531,8 +1543,8 @@ exports.CfnSpacePropsMixin = CfnSpacePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-userprofile.html
  */
-class CfnUserProfilePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnUserProfilePropsMixin", version: "2.240.0-alpha.0" };
+class CfnUserProfilePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnUserProfilePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["domainId", "singleSignOnUserIdentifier", "singleSignOnUserValue", "tags", "userProfileName", "userSettings"];
     props;
     strategy;
@@ -1554,8 +1566,11 @@ class CfnUserProfilePropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnUserProfileMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1568,16 +1583,42 @@ class CfnUserProfilePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnUserProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnUserProfilePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnUserProfilePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnUserProfilePropsMixin = CfnUserProfilePropsMixin;
+// @ts-ignore TS6133
+function flattenCfnUserProfilePropsMixinUserSettingsProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        autoMountHomeEfs: (!props.autoMountHomeEfs ? undefined : props.autoMountHomeEfs),
+        codeEditorAppSettings: (!props.codeEditorAppSettings ? undefined : props.codeEditorAppSettings),
+        customFileSystemConfigs: (!props.customFileSystemConfigs ? undefined : props.customFileSystemConfigs),
+        customPosixUserConfig: (!props.customPosixUserConfig ? undefined : props.customPosixUserConfig),
+        defaultLandingUri: (!props.defaultLandingUri ? undefined : props.defaultLandingUri),
+        executionRole: (!props.executionRole ? undefined : cdk.getRefProperty(props.executionRole?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.executionRole, "executionRole", "iam.IRoleRef | string")),
+        jupyterLabAppSettings: (!props.jupyterLabAppSettings ? undefined : props.jupyterLabAppSettings),
+        jupyterServerAppSettings: (!props.jupyterServerAppSettings ? undefined : props.jupyterServerAppSettings),
+        kernelGatewayAppSettings: (!props.kernelGatewayAppSettings ? undefined : props.kernelGatewayAppSettings),
+        rStudioServerProAppSettings: (!props.rStudioServerProAppSettings ? undefined : props.rStudioServerProAppSettings),
+        securityGroups: (!props.securityGroups ? undefined : cdk.mapArrayInPlace(props.securityGroups, (item) => cdk.getRefProperty(item?.securityGroupRef, 'securityGroupId') ?? cdk.ensureStringOrUndefined(item, "securityGroups", "ec2.ISecurityGroupRef | string"))),
+        sharingSettings: (!props.sharingSettings ? undefined : props.sharingSettings),
+        spaceStorageSettings: (!props.spaceStorageSettings ? undefined : props.spaceStorageSettings),
+        studioWebPortal: (!props.studioWebPortal ? undefined : props.studioWebPortal),
+        studioWebPortalSettings: (!props.studioWebPortalSettings ? undefined : props.studioWebPortalSettings)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnUserProfileMixinProps(props) {
+    const ret = {};
+    if ((props.domainId !== undefined))
+        ret.domainId = cdk.getRefProperty(props.domainId?.domainRef, 'domainId') ?? cdk.ensureStringOrUndefined(props.domainId, "domainId", "sagemaker.IDomainRef | string");
+    if ((props.userSettings !== undefined))
+        ret.userSettings = flattenCfnUserProfilePropsMixinUserSettingsProperty(props.userSettings);
+    return ret;
+}
 /**
  * Creates a new work team for labeling your data.
  *
@@ -1590,8 +1631,8 @@ exports.CfnUserProfilePropsMixin = CfnUserProfilePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-workteam.html
  */
-class CfnWorkteamPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnWorkteamPropsMixin", version: "2.240.0-alpha.0" };
+class CfnWorkteamPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnWorkteamPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "memberDefinitions", "notificationConfiguration", "tags", "workforceName", "workteamName"];
     props;
     strategy;
@@ -1614,7 +1655,7 @@ class CfnWorkteamPropsMixin 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
@@ -1627,12 +1668,7 @@ class CfnWorkteamPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnWorkteamPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnWorkteamPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnWorkteamPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1647,8 +1683,8 @@ exports.CfnWorkteamPropsMixin = CfnWorkteamPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-cluster.html
  */
-class CfnClusterPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnClusterPropsMixin", version: "2.240.0-alpha.0" };
+class CfnClusterPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnClusterPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["autoScaling", "clusterName", "clusterRole", "instanceGroups", "nodeProvisioningMode", "nodeRecovery", "orchestrator", "restrictedInstanceGroups", "tags", "tieredStorageConfig", "vpcConfig"];
     props;
     strategy;
@@ -1671,7 +1707,7 @@ class CfnClusterPropsMixin 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
@@ -1684,12 +1720,7 @@ class CfnClusterPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnClusterPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnClusterPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1704,8 +1735,8 @@ exports.CfnClusterPropsMixin = CfnClusterPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-inferencecomponent.html
  */
-class CfnInferenceComponentPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnInferenceComponentPropsMixin", version: "2.240.0-alpha.0" };
+class CfnInferenceComponentPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnInferenceComponentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["deploymentConfig", "endpointArn", "endpointName", "inferenceComponentName", "runtimeConfig", "specification", "tags", "variantName"];
     props;
     strategy;
@@ -1728,7 +1759,7 @@ class CfnInferenceComponentPropsMixin 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
@@ -1741,12 +1772,7 @@ class CfnInferenceComponentPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnInferenceComponentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnInferenceComponentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnInferenceComponentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1761,8 +1787,8 @@ exports.CfnInferenceComponentPropsMixin = CfnInferenceComponentPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html
  */
-class CfnMlflowTrackingServerPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnMlflowTrackingServerPropsMixin", version: "2.240.0-alpha.0" };
+class CfnMlflowTrackingServerPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnMlflowTrackingServerPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["artifactStoreUri", "automaticModelRegistration", "mlflowVersion", "roleArn", "tags", "trackingServerName", "trackingServerSize", "weeklyMaintenanceWindowStart"];
     props;
     strategy;
@@ -1785,7 +1811,7 @@ class CfnMlflowTrackingServerPropsMixin 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
@@ -1798,12 +1824,7 @@ class CfnMlflowTrackingServerPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMlflowTrackingServerPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMlflowTrackingServerPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMlflowTrackingServerPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1818,8 +1839,8 @@ exports.CfnMlflowTrackingServerPropsMixin = CfnMlflowTrackingServerPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-partnerapp.html
  */
-class CfnPartnerAppPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnPartnerAppPropsMixin", version: "2.240.0-alpha.0" };
+class CfnPartnerAppPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnPartnerAppPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["applicationConfig", "appVersion", "authType", "clientToken", "enableAutoMinorVersionUpgrade", "enableIamSessionBasedIdentity", "executionRoleArn", "kmsKeyId", "maintenanceConfig", "name", "tags", "tier", "type"];
     props;
     strategy;
@@ -1842,7 +1863,7 @@ class CfnPartnerAppPropsMixin 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
@@ -1855,12 +1876,7 @@ class CfnPartnerAppPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPartnerAppPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPartnerAppPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPartnerAppPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1880,8 +1896,8 @@ exports.CfnPartnerAppPropsMixin = CfnPartnerAppPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-processingjob.html
  */
-class CfnProcessingJobPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnProcessingJobPropsMixin", version: "2.240.0-alpha.0" };
+class CfnProcessingJobPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnProcessingJobPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["appSpecification", "environment", "experimentConfig", "networkConfig", "processingInputs", "processingJobName", "processingOutputConfig", "processingResources", "roleArn", "stoppingCondition", "tags"];
     props;
     strategy;
@@ -1904,7 +1920,7 @@ class CfnProcessingJobPropsMixin 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
@@ -1917,12 +1933,7 @@ class CfnProcessingJobPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnProcessingJobPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnProcessingJobPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnProcessingJobPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1935,8 +1946,8 @@ exports.CfnProcessingJobPropsMixin = CfnProcessingJobPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-studiolifecycleconfig.html
  */
-class CfnStudioLifecycleConfigPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnStudioLifecycleConfigPropsMixin", version: "2.240.0-alpha.0" };
+class CfnStudioLifecycleConfigPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_sagemaker.mixins.CfnStudioLifecycleConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["studioLifecycleConfigAppType", "studioLifecycleConfigContent", "studioLifecycleConfigName", "tags"];
     props;
     strategy;
@@ -1959,7 +1970,7 @@ class CfnStudioLifecycleConfigPropsMixin 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
@@ -1972,12 +1983,7 @@ class CfnStudioLifecycleConfigPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnStudioLifecycleConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnStudioLifecycleConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnStudioLifecycleConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }