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

package/lib/services/aws-datasync/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-datasync");
 /**
  * The `AWS::DataSync::Agent` resource activates an AWS DataSync agent that you've deployed for storage discovery or data transfers.
@@ -25,7 +24,7 @@ const service = require("aws-cdk-lib/aws-datasync");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-agent.html
  */
 class CfnAgentPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnAgentPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnAgentPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["activationKey", "agentName", "securityGroupArns", "subnetArns", "tags", "vpcEndpointId"];
     props;
     strategy;
@@ -48,7 +47,7 @@ class CfnAgentPropsMixin 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
@@ -61,12 +60,7 @@ class CfnAgentPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAgentPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAgentPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAgentPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -84,7 +78,7 @@ exports.CfnAgentPropsMixin = CfnAgentPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationazureblob.html
  */
 class CfnLocationAzureBlobPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationAzureBlobPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationAzureBlobPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["agentArns", "azureAccessTier", "azureBlobAuthenticationType", "azureBlobContainerUrl", "azureBlobSasConfiguration", "azureBlobType", "cmkSecretConfig", "customSecretConfig", "subdirectory", "tags"];
     props;
     strategy;
@@ -107,7 +101,7 @@ class CfnLocationAzureBlobPropsMixin 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
@@ -120,12 +114,7 @@ class CfnLocationAzureBlobPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationAzureBlobPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationAzureBlobPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationAzureBlobPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -141,7 +130,7 @@ exports.CfnLocationAzureBlobPropsMixin = CfnLocationAzureBlobPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationefs.html
  */
 class CfnLocationEFSPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationEFSPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationEFSPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessPointArn", "ec2Config", "efsFilesystemArn", "fileSystemAccessRoleArn", "inTransitEncryption", "subdirectory", "tags"];
     props;
     strategy;
@@ -163,8 +152,11 @@ class CfnLocationEFSPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnLocationEFSMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -177,16 +169,18 @@ class CfnLocationEFSPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationEFSPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationEFSPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationEFSPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnLocationEFSPropsMixin = CfnLocationEFSPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnLocationEFSMixinProps(props) {
+    const ret = {};
+    if ((props.efsFilesystemArn !== undefined))
+        ret.efsFilesystemArn = cdk.getRefProperty(props.efsFilesystemArn?.fileSystemRef, 'fileSystemArn') ?? cdk.ensureStringOrUndefined(props.efsFilesystemArn, "efsFilesystemArn", "efs.IFileSystemRef | string");
+    return ret;
+}
 /**
  * The `AWS::DataSync::LocationFSxLustre` resource specifies an endpoint for an Amazon FSx for Lustre file system.
  *
@@ -196,7 +190,7 @@ exports.CfnLocationEFSPropsMixin = CfnLocationEFSPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxlustre.html
  */
 class CfnLocationFSxLustrePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationFSxLustrePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationFSxLustrePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["fsxFilesystemArn", "securityGroupArns", "subdirectory", "tags"];
     props;
     strategy;
@@ -219,7 +213,7 @@ class CfnLocationFSxLustrePropsMixin 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
@@ -232,12 +226,7 @@ class CfnLocationFSxLustrePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationFSxLustrePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationFSxLustrePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationFSxLustrePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -253,7 +242,7 @@ exports.CfnLocationFSxLustrePropsMixin = CfnLocationFSxLustrePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxontap.html
  */
 class CfnLocationFSxONTAPPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationFSxONTAPPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationFSxONTAPPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["protocol", "securityGroupArns", "storageVirtualMachineArn", "subdirectory", "tags"];
     props;
     strategy;
@@ -276,7 +265,7 @@ class CfnLocationFSxONTAPPropsMixin 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
@@ -289,12 +278,7 @@ class CfnLocationFSxONTAPPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationFSxONTAPPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationFSxONTAPPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationFSxONTAPPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -308,7 +292,7 @@ exports.CfnLocationFSxONTAPPropsMixin = CfnLocationFSxONTAPPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxopenzfs.html
  */
 class CfnLocationFSxOpenZFSPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationFSxOpenZFSPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationFSxOpenZFSPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["fsxFilesystemArn", "protocol", "securityGroupArns", "subdirectory", "tags"];
     props;
     strategy;
@@ -331,7 +315,7 @@ class CfnLocationFSxOpenZFSPropsMixin 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
@@ -344,12 +328,7 @@ class CfnLocationFSxOpenZFSPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationFSxOpenZFSPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationFSxOpenZFSPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationFSxOpenZFSPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -363,8 +342,8 @@ exports.CfnLocationFSxOpenZFSPropsMixin = CfnLocationFSxOpenZFSPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html
  */
 class CfnLocationFSxWindowsPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationFSxWindowsPropsMixin", version: "2.241.0-alpha.0" };
-    static CFN_PROPERTY_KEYS = ["domain", "fsxFilesystemArn", "password", "securityGroupArns", "subdirectory", "tags", "user"];
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationFSxWindowsPropsMixin", version: "2.242.0-alpha.0" };
+    static CFN_PROPERTY_KEYS = ["cmkSecretConfig", "customSecretConfig", "domain", "fsxFilesystemArn", "password", "securityGroupArns", "subdirectory", "tags", "user"];
     props;
     strategy;
     /**
@@ -386,7 +365,7 @@ class CfnLocationFSxWindowsPropsMixin 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
@@ -399,12 +378,7 @@ class CfnLocationFSxWindowsPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationFSxWindowsPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationFSxWindowsPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationFSxWindowsPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -418,8 +392,8 @@ exports.CfnLocationFSxWindowsPropsMixin = CfnLocationFSxWindowsPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html
  */
 class CfnLocationHDFSPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationHDFSPropsMixin", version: "2.241.0-alpha.0" };
-    static CFN_PROPERTY_KEYS = ["agentArns", "authenticationType", "blockSize", "kerberosKeytab", "kerberosKrb5Conf", "kerberosPrincipal", "kmsKeyProviderUri", "nameNodes", "qopConfiguration", "replicationFactor", "simpleUser", "subdirectory", "tags"];
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationHDFSPropsMixin", version: "2.242.0-alpha.0" };
+    static CFN_PROPERTY_KEYS = ["agentArns", "authenticationType", "blockSize", "cmkSecretConfig", "customSecretConfig", "kerberosKeytab", "kerberosKrb5Conf", "kerberosPrincipal", "kmsKeyProviderUri", "nameNodes", "qopConfiguration", "replicationFactor", "simpleUser", "subdirectory", "tags"];
     props;
     strategy;
     /**
@@ -441,7 +415,7 @@ class CfnLocationHDFSPropsMixin 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
@@ -454,12 +428,7 @@ class CfnLocationHDFSPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationHDFSPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationHDFSPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationHDFSPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -473,7 +442,7 @@ exports.CfnLocationHDFSPropsMixin = CfnLocationHDFSPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationnfs.html
  */
 class CfnLocationNFSPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationNFSPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationNFSPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["mountOptions", "onPremConfig", "serverHostname", "subdirectory", "tags"];
     props;
     strategy;
@@ -495,8 +464,11 @@ class CfnLocationNFSPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnLocationNFSMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -509,16 +481,28 @@ class CfnLocationNFSPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationNFSPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationNFSPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationNFSPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnLocationNFSPropsMixin = CfnLocationNFSPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnLocationNFSPropsMixinOnPremConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        agentArns: (!props.agentArns ? undefined : cdk.mapArrayInPlace(props.agentArns, (item) => cdk.getRefProperty(item?.agentRef, 'agentArn') ?? cdk.ensureStringOrUndefined(item, "agentArns", "datasync.IAgentRef | string")))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnLocationNFSMixinProps(props) {
+    const ret = {};
+    if ((props.onPremConfig !== undefined))
+        ret.onPremConfig = flattenCfnLocationNFSPropsMixinOnPremConfigProperty(props.onPremConfig);
+    if ((props.serverHostname !== undefined))
+        ret.serverHostname = props.serverHostname;
+    return ret;
+}
 /**
  * The `AWS::DataSync::LocationObjectStorage` resource specifies an endpoint for a self-managed object storage bucket.
  *
@@ -530,7 +514,7 @@ exports.CfnLocationNFSPropsMixin = CfnLocationNFSPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html
  */
 class CfnLocationObjectStoragePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationObjectStoragePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationObjectStoragePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessKey", "agentArns", "bucketName", "cmkSecretConfig", "customSecretConfig", "secretKey", "serverCertificate", "serverHostname", "serverPort", "serverProtocol", "subdirectory", "tags"];
     props;
     strategy;
@@ -553,7 +537,7 @@ class CfnLocationObjectStoragePropsMixin extends cdk.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -566,12 +550,7 @@ class CfnLocationObjectStoragePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationObjectStoragePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationObjectStoragePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationObjectStoragePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -587,7 +566,7 @@ exports.CfnLocationObjectStoragePropsMixin = CfnLocationObjectStoragePropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locations3.html
  */
 class CfnLocationS3PropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationS3PropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationS3PropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["s3BucketArn", "s3Config", "s3StorageClass", "subdirectory", "tags"];
     props;
     strategy;
@@ -609,8 +588,11 @@ class CfnLocationS3PropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnLocationS3MixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -623,16 +605,28 @@ class CfnLocationS3PropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationS3PropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationS3PropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationS3PropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnLocationS3PropsMixin = CfnLocationS3PropsMixin;
+// @ts-ignore TS6133
+function flattenCfnLocationS3PropsMixinS3ConfigProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        bucketAccessRoleArn: (!props.bucketAccessRoleArn ? undefined : cdk.getRefProperty(props.bucketAccessRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.bucketAccessRoleArn, "bucketAccessRoleArn", "iam.IRoleRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnLocationS3MixinProps(props) {
+    const ret = {};
+    if ((props.s3BucketArn !== undefined))
+        ret.s3BucketArn = cdk.getRefProperty(props.s3BucketArn?.bucketRef, 'bucketArn') ?? cdk.ensureStringOrUndefined(props.s3BucketArn, "s3BucketArn", "s3.IBucketRef | string");
+    if ((props.s3Config !== undefined))
+        ret.s3Config = flattenCfnLocationS3PropsMixinS3ConfigProperty(props.s3Config);
+    return ret;
+}
 /**
  * The `AWS::DataSync::LocationSMB` resource specifies a Server Message Block (SMB) location that AWS DataSync can use as a transfer source or destination.
  *
@@ -642,7 +636,7 @@ exports.CfnLocationS3PropsMixin = CfnLocationS3PropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html
  */
 class CfnLocationSMBPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationSMBPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnLocationSMBPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["agentArns", "authenticationType", "cmkSecretConfig", "customSecretConfig", "dnsIpAddresses", "domain", "kerberosKeytab", "kerberosKrb5Conf", "kerberosPrincipal", "mountOptions", "password", "serverHostname", "subdirectory", "tags", "user"];
     props;
     strategy;
@@ -665,7 +659,7 @@ class CfnLocationSMBPropsMixin 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
@@ -678,12 +672,7 @@ class CfnLocationSMBPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLocationSMBPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLocationSMBPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLocationSMBPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -699,7 +688,7 @@ exports.CfnLocationSMBPropsMixin = CfnLocationSMBPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html
  */
 class CfnTaskPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnTaskPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datasync.mixins.CfnTaskPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["cloudWatchLogGroupArn", "destinationLocationArn", "excludes", "includes", "manifestConfig", "name", "options", "schedule", "sourceLocationArn", "tags", "taskMode", "taskReportConfig"];
     props;
     strategy;
@@ -721,8 +710,11 @@ class CfnTaskPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnTaskMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -735,13 +727,19 @@ class CfnTaskPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTaskPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTaskPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTaskPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnTaskPropsMixin = CfnTaskPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnTaskMixinProps(props) {
+    const ret = {};
+    if ((props.cloudWatchLogGroupArn !== undefined))
+        ret.cloudWatchLogGroupArn = cdk.getRefProperty(props.cloudWatchLogGroupArn?.logGroupRef, 'logGroupArn') ?? cdk.ensureStringOrUndefined(props.cloudWatchLogGroupArn, "cloudWatchLogGroupArn", "logs.ILogGroupRef | string");
+    if ((props.destinationLocationArn !== undefined))
+        ret.destinationLocationArn = cdk.getRefProperty(props.destinationLocationArn?.locationEfsRef, 'locationArn') ?? cdk.getRefProperty(props.destinationLocationArn?.locationS3Ref, 'locationArn') ?? cdk.ensureStringOrUndefined(props.destinationLocationArn, "destinationLocationArn", "datasync.ILocationEFSRef | datasync.ILocationS3Ref | string");
+    if ((props.sourceLocationArn !== undefined))
+        ret.sourceLocationArn = cdk.getRefProperty(props.sourceLocationArn?.locationS3Ref, 'locationArn') ?? cdk.getRefProperty(props.sourceLocationArn?.locationNfsRef, 'locationArn') ?? cdk.ensureStringOrUndefined(props.sourceLocationArn, "sourceLocationArn", "datasync.ILocationS3Ref | datasync.ILocationNFSRef | string");
+    return ret;
+}

package/lib/services/aws-datasync/events.d.ts

@@ -0,0 +1 @@
+export * from './events.generated';

package/lib/services/aws-datasync/events.generated.d.ts

@@ -0,0 +1,122 @@
+import * as cdk from "aws-cdk-lib/core";
+import * as events from "aws-cdk-lib/aws-events";
+/**
+ * EventBridge event pattern for aws.datasync@DataSyncAgentStateChange
+ */
+export declare class DataSyncAgentStateChange {
+    /**
+     * EventBridge event pattern for DataSync Agent State Change
+     */
+    static dataSyncAgentStateChangePattern(options?: DataSyncAgentStateChange.DataSyncAgentStateChangeProps): events.EventPattern;
+}
+export declare namespace DataSyncAgentStateChange {
+    /**
+     * Props type for aws.datasync@DataSyncAgentStateChange event
+     */
+    interface DataSyncAgentStateChangeProps {
+        /**
+         * State property
+         *
+         * Specify an array of string values to match this event if the actual value of State is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly state?: Array<string>;
+        /**
+         * EventBridge event metadata
+         *
+         * @default - -
+         */
+        readonly eventMetadata?: cdk.AWSEventMetadataProps;
+    }
+}
+/**
+ * EventBridge event pattern for aws.datasync@DataSyncLocationStateChange
+ */
+export declare class DataSyncLocationStateChange {
+    /**
+     * EventBridge event pattern for DataSync Location State Change
+     */
+    static dataSyncLocationStateChangePattern(options?: DataSyncLocationStateChange.DataSyncLocationStateChangeProps): events.EventPattern;
+}
+export declare namespace DataSyncLocationStateChange {
+    /**
+     * Props type for aws.datasync@DataSyncLocationStateChange event
+     */
+    interface DataSyncLocationStateChangeProps {
+        /**
+         * State property
+         *
+         * Specify an array of string values to match this event if the actual value of State is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly state?: Array<string>;
+        /**
+         * EventBridge event metadata
+         *
+         * @default - -
+         */
+        readonly eventMetadata?: cdk.AWSEventMetadataProps;
+    }
+}
+/**
+ * EventBridge event pattern for aws.datasync@DataSyncTaskExecutionStateChange
+ */
+export declare class DataSyncTaskExecutionStateChange {
+    /**
+     * EventBridge event pattern for DataSync Task Execution State Change
+     */
+    static dataSyncTaskExecutionStateChangePattern(options?: DataSyncTaskExecutionStateChange.DataSyncTaskExecutionStateChangeProps): events.EventPattern;
+}
+export declare namespace DataSyncTaskExecutionStateChange {
+    /**
+     * Props type for aws.datasync@DataSyncTaskExecutionStateChange event
+     */
+    interface DataSyncTaskExecutionStateChangeProps {
+        /**
+         * State property
+         *
+         * Specify an array of string values to match this event if the actual value of State is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly state?: Array<string>;
+        /**
+         * EventBridge event metadata
+         *
+         * @default - -
+         */
+        readonly eventMetadata?: cdk.AWSEventMetadataProps;
+    }
+}
+/**
+ * EventBridge event pattern for aws.datasync@DataSyncTaskStateChange
+ */
+export declare class DataSyncTaskStateChange {
+    /**
+     * EventBridge event pattern for DataSync Task State Change
+     */
+    static dataSyncTaskStateChangePattern(options?: DataSyncTaskStateChange.DataSyncTaskStateChangeProps): events.EventPattern;
+}
+export declare namespace DataSyncTaskStateChange {
+    /**
+     * Props type for aws.datasync@DataSyncTaskStateChange event
+     */
+    interface DataSyncTaskStateChangeProps {
+        /**
+         * State property
+         *
+         * Specify an array of string values to match this event if the actual value of State is one of the values in the array. Use one of the constructors on the `aws_events.Match`  for more advanced matching options.
+         *
+         * @default - Do not filter on this field
+         */
+        readonly state?: Array<string>;
+        /**
+         * EventBridge event metadata
+         *
+         * @default - -
+         */
+        readonly eventMetadata?: cdk.AWSEventMetadataProps;
+    }
+}