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

package/lib/services/aws-s3/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-s3");
 /**
  * The AWS::S3::AccessPoint resource is an Amazon S3 resource type that you can use to access buckets.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-s3");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accesspoint.html
  */
 class CfnAccessPointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnAccessPointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnAccessPointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["bucket", "bucketAccountId", "name", "policy", "publicAccessBlockConfiguration", "tags", "vpcConfiguration"];
     props;
     strategy;
@@ -39,8 +38,11 @@ class CfnAccessPointPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnAccessPointMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -53,16 +55,28 @@ class CfnAccessPointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccessPointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccessPointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccessPointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnAccessPointPropsMixin = CfnAccessPointPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnAccessPointPropsMixinVpcConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        vpcId: (!props.vpcId ? undefined : cdk.getRefProperty(props.vpcId?.vpcRef, 'vpcId') ?? cdk.ensureStringOrUndefined(props.vpcId, "vpcId", "ec2.IVPCRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnAccessPointMixinProps(props) {
+    const ret = {};
+    if ((props.bucket !== undefined))
+        ret.bucket = cdk.getRefProperty(props.bucket?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.bucket, "bucket", "s3.IBucketRef | string");
+    if ((props.vpcConfiguration !== undefined))
+        ret.vpcConfiguration = flattenCfnAccessPointPropsMixinVpcConfigurationProperty(props.vpcConfiguration);
+    return ret;
+}
 /**
  * The `AWS::S3::Bucket` resource creates an Amazon S3 bucket in the same AWS Region where you create the AWS CloudFormation stack.
  *
@@ -76,7 +90,7 @@ exports.CfnAccessPointPropsMixin = CfnAccessPointPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-bucket.html
  */
 class CfnBucketPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnBucketPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnBucketPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["abacStatus", "accelerateConfiguration", "accessControl", "analyticsConfigurations", "bucketEncryption", "bucketName", "corsConfiguration", "intelligentTieringConfigurations", "inventoryConfigurations", "lifecycleConfiguration", "loggingConfiguration", "metadataConfiguration", "metadataTableConfiguration", "metricsConfigurations", "notificationConfiguration", "objectLockConfiguration", "objectLockEnabled", "ownershipControls", "publicAccessBlockConfiguration", "replicationConfiguration", "tags", "versioningConfiguration", "websiteConfiguration"];
     props;
     strategy;
@@ -98,8 +112,11 @@ class CfnBucketPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnBucketMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -112,16 +129,205 @@ class CfnBucketPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnBucketPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnBucketPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnBucketPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnBucketPropsMixin = CfnBucketPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinDestinationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketAccountId: (!props.bucketAccountId ? undefined : props.bucketAccountId),
+        bucketArn: (!props.bucketArn ? undefined : cdk.getRefProperty(props.bucketArn?.bucketRef, 'bucketArn') ?? cdk.ensureStringOrUndefined(props.bucketArn, "bucketArn", "s3.IBucketRef | string")),
+        format: (!props.format ? undefined : props.format),
+        prefix: (!props.prefix ? undefined : props.prefix)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinDataExportProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        destination: (!props.destination ? undefined : flattenCfnBucketPropsMixinDestinationProperty(props.destination)),
+        outputSchemaVersion: (!props.outputSchemaVersion ? undefined : props.outputSchemaVersion)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinStorageClassAnalysisProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        dataExport: (!props.dataExport ? undefined : (!props.dataExport ? undefined : flattenCfnBucketPropsMixinDataExportProperty(props.dataExport)))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinAnalyticsConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        id: (!props.id ? undefined : props.id),
+        prefix: (!props.prefix ? undefined : props.prefix),
+        storageClassAnalysis: (!props.storageClassAnalysis ? undefined : flattenCfnBucketPropsMixinStorageClassAnalysisProperty(props.storageClassAnalysis)),
+        tagFilters: (!props.tagFilters ? undefined : props.tagFilters)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinServerSideEncryptionByDefaultProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        kmsMasterKeyId: (!props.kmsMasterKeyId ? undefined : cdk.getRefProperty(props.kmsMasterKeyId?.keyRef, 'keyArn') ?? cdk.getRefProperty(props.kmsMasterKeyId?.keyRef, 'keyId') ?? cdk.getRefProperty(props.kmsMasterKeyId?.aliasRef, 'aliasName') ?? cdk.ensureStringOrUndefined(props.kmsMasterKeyId, "kmsMasterKeyId", "kms.IKeyRef | kms.IAliasRef | string")),
+        sseAlgorithm: (!props.sseAlgorithm ? undefined : props.sseAlgorithm)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinServerSideEncryptionRuleProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        blockedEncryptionTypes: (!props.blockedEncryptionTypes ? undefined : props.blockedEncryptionTypes),
+        bucketKeyEnabled: (!props.bucketKeyEnabled ? undefined : props.bucketKeyEnabled),
+        serverSideEncryptionByDefault: (!props.serverSideEncryptionByDefault ? undefined : (!props.serverSideEncryptionByDefault ? undefined : flattenCfnBucketPropsMixinServerSideEncryptionByDefaultProperty(props.serverSideEncryptionByDefault)))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinBucketEncryptionProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        serverSideEncryptionConfiguration: (!props.serverSideEncryptionConfiguration ? undefined : (cdk.isResolvableObject(props.serverSideEncryptionConfiguration) ? props.serverSideEncryptionConfiguration : cdk.mapArrayInPlace(props.serverSideEncryptionConfiguration, (item) => flattenCfnBucketPropsMixinServerSideEncryptionRuleProperty(item))))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinInventoryConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        destination: (!props.destination ? undefined : flattenCfnBucketPropsMixinDestinationProperty(props.destination)),
+        enabled: (!props.enabled ? undefined : props.enabled),
+        id: (!props.id ? undefined : props.id),
+        includedObjectVersions: (!props.includedObjectVersions ? undefined : props.includedObjectVersions),
+        optionalFields: (!props.optionalFields ? undefined : props.optionalFields),
+        prefix: (!props.prefix ? undefined : props.prefix),
+        scheduleFrequency: (!props.scheduleFrequency ? undefined : props.scheduleFrequency)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinLoggingConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        destinationBucketName: (!props.destinationBucketName ? undefined : cdk.getRefProperty(props.destinationBucketName?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.destinationBucketName, "destinationBucketName", "s3.IBucketRef | string")),
+        logFilePrefix: (!props.logFilePrefix ? undefined : props.logFilePrefix),
+        targetObjectKeyFormat: (!props.targetObjectKeyFormat ? undefined : props.targetObjectKeyFormat)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinLambdaConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        event: (!props.event ? undefined : props.event),
+        filter: (!props.filter ? undefined : props.filter),
+        function: (!props.function ? undefined : cdk.getRefProperty(props.function?.functionRef, 'functionArn') ?? cdk.ensureStringOrUndefined(props.function, "function", "lambda.IFunctionRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinQueueConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        event: (!props.event ? undefined : props.event),
+        filter: (!props.filter ? undefined : props.filter),
+        queue: (!props.queue ? undefined : cdk.getRefProperty(props.queue?.queueRef, 'queueArn') ?? cdk.ensureStringOrUndefined(props.queue, "queue", "sqs.IQueueRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinTopicConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        event: (!props.event ? undefined : props.event),
+        filter: (!props.filter ? undefined : props.filter),
+        topic: (!props.topic ? undefined : cdk.getRefProperty(props.topic?.topicRef, 'topicArn') ?? cdk.ensureStringOrUndefined(props.topic, "topic", "sns.ITopicRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinNotificationConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        eventBridgeConfiguration: (!props.eventBridgeConfiguration ? undefined : props.eventBridgeConfiguration),
+        lambdaConfigurations: (!props.lambdaConfigurations ? undefined : (cdk.isResolvableObject(props.lambdaConfigurations) ? props.lambdaConfigurations : (!props.lambdaConfigurations ? undefined : cdk.mapArrayInPlace(props.lambdaConfigurations, (item) => flattenCfnBucketPropsMixinLambdaConfigurationProperty(item))))),
+        queueConfigurations: (!props.queueConfigurations ? undefined : (cdk.isResolvableObject(props.queueConfigurations) ? props.queueConfigurations : (!props.queueConfigurations ? undefined : cdk.mapArrayInPlace(props.queueConfigurations, (item) => flattenCfnBucketPropsMixinQueueConfigurationProperty(item))))),
+        topicConfigurations: (!props.topicConfigurations ? undefined : (cdk.isResolvableObject(props.topicConfigurations) ? props.topicConfigurations : (!props.topicConfigurations ? undefined : cdk.mapArrayInPlace(props.topicConfigurations, (item) => flattenCfnBucketPropsMixinTopicConfigurationProperty(item)))))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinEncryptionConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        replicaKmsKeyId: (!props.replicaKmsKeyId ? undefined : cdk.getRefProperty(props.replicaKmsKeyId?.keyRef, 'keyArn') ?? cdk.ensureStringOrUndefined(props.replicaKmsKeyId, "replicaKmsKeyId", "kms.IKeyRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinReplicationDestinationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        accessControlTranslation: (!props.accessControlTranslation ? undefined : props.accessControlTranslation),
+        account: (!props.account ? undefined : props.account),
+        bucket: (!props.bucket ? undefined : cdk.getRefProperty(props.bucket?.bucketRef, 'bucketArn') ?? cdk.ensureStringOrUndefined(props.bucket, "bucket", "s3.IBucketRef | string")),
+        encryptionConfiguration: (!props.encryptionConfiguration ? undefined : (!props.encryptionConfiguration ? undefined : flattenCfnBucketPropsMixinEncryptionConfigurationProperty(props.encryptionConfiguration))),
+        metrics: (!props.metrics ? undefined : props.metrics),
+        replicationTime: (!props.replicationTime ? undefined : props.replicationTime),
+        storageClass: (!props.storageClass ? undefined : props.storageClass)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinReplicationRuleProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        deleteMarkerReplication: (!props.deleteMarkerReplication ? undefined : props.deleteMarkerReplication),
+        destination: (!props.destination ? undefined : flattenCfnBucketPropsMixinReplicationDestinationProperty(props.destination)),
+        filter: (!props.filter ? undefined : props.filter),
+        id: (!props.id ? undefined : props.id),
+        prefix: (!props.prefix ? undefined : props.prefix),
+        priority: (!props.priority ? undefined : props.priority),
+        sourceSelectionCriteria: (!props.sourceSelectionCriteria ? undefined : props.sourceSelectionCriteria),
+        status: (!props.status ? undefined : props.status)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketPropsMixinReplicationConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        role: (!props.role ? undefined : cdk.getRefProperty(props.role?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.role, "role", "iam.IRoleRef | string")),
+        rules: (!props.rules ? undefined : (cdk.isResolvableObject(props.rules) ? props.rules : cdk.mapArrayInPlace(props.rules, (item) => flattenCfnBucketPropsMixinReplicationRuleProperty(item))))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnBucketMixinProps(props) {
+    const ret = {};
+    if ((props.analyticsConfigurations !== undefined))
+        ret.analyticsConfigurations = (cdk.isResolvableObject(props.analyticsConfigurations) ? props.analyticsConfigurations : cdk.mapArrayInPlace(props.analyticsConfigurations, (item) => flattenCfnBucketPropsMixinAnalyticsConfigurationProperty(item)));
+    if ((props.bucketEncryption !== undefined))
+        ret.bucketEncryption = flattenCfnBucketPropsMixinBucketEncryptionProperty(props.bucketEncryption);
+    if ((props.inventoryConfigurations !== undefined))
+        ret.inventoryConfigurations = (cdk.isResolvableObject(props.inventoryConfigurations) ? props.inventoryConfigurations : cdk.mapArrayInPlace(props.inventoryConfigurations, (item) => flattenCfnBucketPropsMixinInventoryConfigurationProperty(item)));
+    if ((props.loggingConfiguration !== undefined))
+        ret.loggingConfiguration = flattenCfnBucketPropsMixinLoggingConfigurationProperty(props.loggingConfiguration);
+    if ((props.notificationConfiguration !== undefined))
+        ret.notificationConfiguration = flattenCfnBucketPropsMixinNotificationConfigurationProperty(props.notificationConfiguration);
+    if ((props.replicationConfiguration !== undefined))
+        ret.replicationConfiguration = flattenCfnBucketPropsMixinReplicationConfigurationProperty(props.replicationConfiguration);
+    return ret;
+}
 /**
  * Applies an Amazon S3 bucket policy to an Amazon S3 bucket.
  *
@@ -150,7 +356,7 @@ exports.CfnBucketPropsMixin = CfnBucketPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-bucketpolicy.html
  */
 class CfnBucketPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnBucketPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnBucketPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["bucket", "policyDocument"];
     props;
     strategy;
@@ -172,8 +378,11 @@ class CfnBucketPolicyPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnBucketPolicyMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -186,16 +395,18 @@ class CfnBucketPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnBucketPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnBucketPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnBucketPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnBucketPolicyPropsMixin = CfnBucketPolicyPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnBucketPolicyMixinProps(props) {
+    const ret = {};
+    if ((props.bucket !== undefined))
+        ret.bucket = cdk.getRefProperty(props.bucket?.bucketRef, 'bucketName') ?? cdk.ensureStringOrUndefined(props.bucket, "bucket", "s3.IBucketRef | string");
+    return ret;
+}
 /**
  * The `AWS::S3::MultiRegionAccessPoint` resource creates an Amazon S3 Multi-Region Access Point.
  *
@@ -207,7 +418,7 @@ exports.CfnBucketPolicyPropsMixin = CfnBucketPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-multiregionaccesspoint.html
  */
 class CfnMultiRegionAccessPointPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnMultiRegionAccessPointPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnMultiRegionAccessPointPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["name", "publicAccessBlockConfiguration", "regions"];
     props;
     strategy;
@@ -230,7 +441,7 @@ class CfnMultiRegionAccessPointPropsMixin 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
@@ -243,12 +454,7 @@ class CfnMultiRegionAccessPointPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMultiRegionAccessPointPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMultiRegionAccessPointPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMultiRegionAccessPointPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -264,7 +470,7 @@ exports.CfnMultiRegionAccessPointPropsMixin = CfnMultiRegionAccessPointPropsMixi
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-multiregionaccesspointpolicy.html
  */
 class CfnMultiRegionAccessPointPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnMultiRegionAccessPointPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnMultiRegionAccessPointPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["mrapName", "policy"];
     props;
     strategy;
@@ -287,7 +493,7 @@ class CfnMultiRegionAccessPointPolicyPropsMixin 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
@@ -300,12 +506,7 @@ class CfnMultiRegionAccessPointPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMultiRegionAccessPointPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMultiRegionAccessPointPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMultiRegionAccessPointPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -319,7 +520,7 @@ exports.CfnMultiRegionAccessPointPolicyPropsMixin = CfnMultiRegionAccessPointPol
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-storagelens.html
  */
 class CfnStorageLensPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnStorageLensPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnStorageLensPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["storageLensConfiguration", "tags"];
     props;
     strategy;
@@ -341,8 +542,11 @@ class CfnStorageLensPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnStorageLensMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -355,16 +559,67 @@ class CfnStorageLensPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnStorageLensPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnStorageLensPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnStorageLensPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnStorageLensPropsMixin = CfnStorageLensPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnStorageLensPropsMixinS3BucketDestinationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        accountId: (!props.accountId ? undefined : props.accountId),
+        arn: (!props.arn ? undefined : cdk.getRefProperty(props.arn?.bucketRef, 'bucketArn') ?? cdk.ensureStringOrUndefined(props.arn, "arn", "s3.IBucketRef | string")),
+        encryption: (!props.encryption ? undefined : props.encryption),
+        format: (!props.format ? undefined : props.format),
+        outputSchemaVersion: (!props.outputSchemaVersion ? undefined : props.outputSchemaVersion),
+        prefix: (!props.prefix ? undefined : props.prefix)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnStorageLensPropsMixinDataExportProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        cloudWatchMetrics: (!props.cloudWatchMetrics ? undefined : props.cloudWatchMetrics),
+        s3BucketDestination: (!props.s3BucketDestination ? undefined : (!props.s3BucketDestination ? undefined : flattenCfnStorageLensPropsMixinS3BucketDestinationProperty(props.s3BucketDestination))),
+        storageLensTableDestination: (!props.storageLensTableDestination ? undefined : props.storageLensTableDestination)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnStorageLensPropsMixinStorageLensExpandedPrefixesDataExportProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        s3BucketDestination: (!props.s3BucketDestination ? undefined : (!props.s3BucketDestination ? undefined : flattenCfnStorageLensPropsMixinS3BucketDestinationProperty(props.s3BucketDestination))),
+        storageLensTableDestination: (!props.storageLensTableDestination ? undefined : props.storageLensTableDestination)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnStorageLensPropsMixinStorageLensConfigurationProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        accountLevel: (!props.accountLevel ? undefined : props.accountLevel),
+        awsOrg: (!props.awsOrg ? undefined : props.awsOrg),
+        dataExport: (!props.dataExport ? undefined : (!props.dataExport ? undefined : flattenCfnStorageLensPropsMixinDataExportProperty(props.dataExport))),
+        exclude: (!props.exclude ? undefined : props.exclude),
+        expandedPrefixesDataExport: (!props.expandedPrefixesDataExport ? undefined : (!props.expandedPrefixesDataExport ? undefined : flattenCfnStorageLensPropsMixinStorageLensExpandedPrefixesDataExportProperty(props.expandedPrefixesDataExport))),
+        id: (!props.id ? undefined : props.id),
+        include: (!props.include ? undefined : props.include),
+        isEnabled: (!props.isEnabled ? undefined : props.isEnabled),
+        prefixDelimiter: (!props.prefixDelimiter ? undefined : props.prefixDelimiter),
+        storageLensArn: (!props.storageLensArn ? undefined : props.storageLensArn)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnStorageLensMixinProps(props) {
+    const ret = {};
+    if ((props.storageLensConfiguration !== undefined))
+        ret.storageLensConfiguration = flattenCfnStorageLensPropsMixinStorageLensConfigurationProperty(props.storageLensConfiguration);
+    return ret;
+}
 /**
  * The `AWS::S3::AccessGrant` resource creates an access grant that gives a grantee access to your S3 data.
  *
@@ -383,7 +638,7 @@ exports.CfnStorageLensPropsMixin = CfnStorageLensPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accessgrant.html
  */
 class CfnAccessGrantPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnAccessGrantPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnAccessGrantPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessGrantsLocationConfiguration", "accessGrantsLocationId", "applicationArn", "grantee", "permission", "s3PrefixType", "tags"];
     props;
     strategy;
@@ -406,7 +661,7 @@ class CfnAccessGrantPropsMixin 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
@@ -419,12 +674,7 @@ class CfnAccessGrantPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccessGrantPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccessGrantPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccessGrantPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -443,7 +693,7 @@ exports.CfnAccessGrantPropsMixin = CfnAccessGrantPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accessgrantsinstance.html
  */
 class CfnAccessGrantsInstancePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnAccessGrantsInstancePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnAccessGrantsInstancePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["identityCenterArn", "tags"];
     props;
     strategy;
@@ -466,7 +716,7 @@ class CfnAccessGrantsInstancePropsMixin 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
@@ -479,12 +729,7 @@ class CfnAccessGrantsInstancePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccessGrantsInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccessGrantsInstancePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccessGrantsInstancePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -509,7 +754,7 @@ exports.CfnAccessGrantsInstancePropsMixin = CfnAccessGrantsInstancePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accessgrantslocation.html
  */
 class CfnAccessGrantsLocationPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnAccessGrantsLocationPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnAccessGrantsLocationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["iamRoleArn", "locationScope", "tags"];
     props;
     strategy;
@@ -532,7 +777,7 @@ class CfnAccessGrantsLocationPropsMixin 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
@@ -545,12 +790,7 @@ class CfnAccessGrantsLocationPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccessGrantsLocationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccessGrantsLocationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccessGrantsLocationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -566,7 +806,7 @@ exports.CfnAccessGrantsLocationPropsMixin = CfnAccessGrantsLocationPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-storagelensgroup.html
  */
 class CfnStorageLensGroupPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnStorageLensGroupPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_s3.mixins.CfnStorageLensGroupPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["filter", "name", "tags"];
     props;
     strategy;
@@ -589,7 +829,7 @@ class CfnStorageLensGroupPropsMixin 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
@@ -602,12 +842,7 @@ class CfnStorageLensGroupPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnStorageLensGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnStorageLensGroupPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnStorageLensGroupPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }