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

package/lib/services/aws-datapipeline/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-datapipeline");
 /**
  * The AWS::DataPipeline::Pipeline resource specifies a data pipeline that you can use to automate the movement and transformation of data.
@@ -32,8 +30,8 @@ const service = require("aws-cdk-lib/aws-datapipeline");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html
  */
-class CfnPipelinePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datapipeline.mixins.CfnPipelinePropsMixin", version: "2.240.0-alpha.0" };
+class CfnPipelinePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_datapipeline.mixins.CfnPipelinePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["activate", "description", "name", "parameterObjects", "parameterValues", "pipelineObjects", "pipelineTags"];
     props;
     strategy;
@@ -55,8 +53,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
@@ -69,13 +70,46 @@ 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 flattenCfnPipelinePropsMixinFieldProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        key: (!props.key ? undefined : props.key),
+        refValue: (!props.refValue ? undefined : props.refValue),
+        stringValue: (!props.stringValue ? undefined : cdk.getRefProperty(props.stringValue?.topicRef, 'topicArn') ?? cdk.getRefProperty(props.stringValue?.roleRef, 'roleName') ?? cdk.getRefProperty(props.stringValue?.instanceProfileRef, 'instanceProfileName') ?? cdk.ensureStringOrUndefined(props.stringValue, "stringValue", "sns.ITopicRef | iam.IRoleRef | iam.IInstanceProfileRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnPipelinePropsMixinPipelineObjectProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        fields: (!props.fields ? undefined : (cdk.isResolvableObject(props.fields) ? props.fields : cdk.mapArrayInPlace(props.fields, (item) => flattenCfnPipelinePropsMixinFieldProperty(item)))),
+        id: (!props.id ? undefined : props.id),
+        name: (!props.name ? undefined : props.name)
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnPipelinePropsMixinParameterValueProperty(props) {
+    if (cdk.isResolvableObject(props))
+        return props;
+    return {
+        id: (!props.id ? undefined : props.id),
+        stringValue: (!props.stringValue ? undefined : cdk.getRefProperty(props.stringValue?.subnetRef, 'subnetId') ?? cdk.ensureStringOrUndefined(props.stringValue, "stringValue", "ec2.ISubnetRef | string"))
+    };
+}
+// @ts-ignore TS6133
+function flattenCfnPipelineMixinProps(props) {
+    const ret = {};
+    if ((props.parameterValues !== undefined))
+        ret.parameterValues = (cdk.isResolvableObject(props.parameterValues) ? props.parameterValues : cdk.mapArrayInPlace(props.parameterValues, (item) => flattenCfnPipelinePropsMixinParameterValueProperty(item)));
+    if ((props.pipelineObjects !== undefined))
+        ret.pipelineObjects = (cdk.isResolvableObject(props.pipelineObjects) ? props.pipelineObjects : cdk.mapArrayInPlace(props.pipelineObjects, (item) => flattenCfnPipelinePropsMixinPipelineObjectProperty(item)));
+    return ret;
+}

package/lib/services/aws-datasync/.events.jsiirc.json

@@ -0,0 +1,16 @@
+{
+  "targets": {
+    "java": {
+      "package": "software.amazon.awscdk.mixins.preview.services.datasync.events"
+    },
+    "dotnet": {
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.DataSync.Events"
+    },
+    "python": {
+      "module": "aws_cdk.mixins_preview.aws_datasync.events"
+    },
+    "go": {
+      "packageName": "previewawsdatasyncevents"
+    }
+  }
+}

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

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

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

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

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

@@ -1,8 +1,8 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-datasync";
+import { aws_datasync as dataSyncRefs, aws_efs as efsRefs, aws_iam as iamRefs, aws_logs as logsRefs, aws_s3 as s3Refs } from "aws-cdk-lib/interfaces";
 /**
  * The `AWS::DataSync::Agent` resource activates an AWS DataSync agent that you've deployed for storage discovery or data transfers.
  *
@@ -19,10 +19,10 @@ import * as service from "aws-cdk-lib/aws-datasync";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-agent.html
  */
-export declare class CfnAgentPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnAgentPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAgentMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::Agent`.
      *
@@ -114,10 +114,10 @@ export interface CfnAgentMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationazureblob.html
  */
-export declare class CfnLocationAzureBlobPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationAzureBlobPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationAzureBlobMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationAzureBlob`.
      *
@@ -330,10 +330,10 @@ export interface CfnLocationAzureBlobMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationefs.html
  */
-export declare class CfnLocationEFSPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationEFSPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationEFSMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationEFS`.
      *
@@ -407,7 +407,7 @@ export interface CfnLocationEFSMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationefs.html#cfn-datasync-locationefs-efsfilesystemarn
      */
-    readonly efsFilesystemArn?: string;
+    readonly efsFilesystemArn?: efsRefs.IFileSystemRef | string;
     /**
      * Specifies an AWS Identity and Access Management (IAM) role that allows DataSync to access your Amazon EFS file system.
      *
@@ -451,10 +451,10 @@ export interface CfnLocationEFSMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxlustre.html
  */
-export declare class CfnLocationFSxLustrePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationFSxLustrePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationFSxLustreMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationFSxLustre`.
      *
@@ -522,10 +522,10 @@ export interface CfnLocationFSxLustreMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxontap.html
  */
-export declare class CfnLocationFSxONTAPPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationFSxONTAPPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationFSxONTAPMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationFSxONTAP`.
      *
@@ -574,6 +574,18 @@ export declare namespace CfnLocationFSxONTAPPropsMixin {
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-smb.html
      */
     interface SMBProperty {
+        /**
+         * Specifies configuration information for a DataSync-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and a customer-managed AWS KMS key.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-smb.html#cfn-datasync-locationfsxontap-smb-cmksecretconfig
+         */
+        readonly cmkSecretConfig?: CfnLocationFSxONTAPPropsMixin.CmkSecretConfigProperty | cdk.IResolvable;
+        /**
+         * Specifies configuration information for a customer-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and an IAM role that DataSync can assume and access the customer-managed secret.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-smb.html#cfn-datasync-locationfsxontap-smb-customsecretconfig
+         */
+        readonly customSecretConfig?: CfnLocationFSxONTAPPropsMixin.CustomSecretConfigProperty | cdk.IResolvable;
         /**
          * Specifies the name of the Windows domain that your storage virtual machine (SVM) belongs to.
          *
@@ -584,6 +596,14 @@ export declare namespace CfnLocationFSxONTAPPropsMixin {
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-smb.html#cfn-datasync-locationfsxontap-smb-domain
          */
         readonly domain?: string;
+        /**
+         * Specifies configuration information for a DataSync-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location.
+         *
+         * DataSync uses the default AWS-managed KMS key to encrypt this secret in AWS Secrets Manager.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-smb.html#cfn-datasync-locationfsxontap-smb-managedsecretconfig
+         */
+        readonly managedSecretConfig?: cdk.IResolvable | CfnLocationFSxONTAPPropsMixin.ManagedSecretConfigProperty;
         /**
          * Specifies how DataSync can access a location using the SMB protocol.
          *
@@ -642,6 +662,67 @@ export declare namespace CfnLocationFSxONTAPPropsMixin {
          */
         readonly version?: string;
     }
+    /**
+     * Specifies configuration information for a DataSync-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and a customer-managed AWS KMS key.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-cmksecretconfig.html
+     */
+    interface CmkSecretConfigProperty {
+        /**
+         * Specifies the ARN for the customer-managed AWS KMS key used to encrypt the secret specified for SecretArn.
+         *
+         * DataSync provides this key to AWS Secrets Manager.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-cmksecretconfig.html#cfn-datasync-locationfsxontap-cmksecretconfig-kmskeyarn
+         */
+        readonly kmsKeyArn?: string;
+        /**
+         * Specifies the ARN for an AWS Secrets Manager secret, managed by DataSync.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-cmksecretconfig.html#cfn-datasync-locationfsxontap-cmksecretconfig-secretarn
+         */
+        readonly secretArn?: string;
+    }
+    /**
+     * Specifies configuration information for a customer-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and an IAM role that DataSync can assume and access the customer-managed secret.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-customsecretconfig.html
+     */
+    interface CustomSecretConfigProperty {
+        /**
+         * Specifies the ARN for the AWS Identity and Access Management role that DataSync uses to access the secret specified for SecretArn.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-customsecretconfig.html#cfn-datasync-locationfsxontap-customsecretconfig-secretaccessrolearn
+         */
+        readonly secretAccessRoleArn?: string;
+        /**
+         * Specifies the ARN for a customer created AWS Secrets Manager secret.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-customsecretconfig.html#cfn-datasync-locationfsxontap-customsecretconfig-secretarn
+         */
+        readonly secretArn?: string;
+    }
+    /**
+     * Specifies configuration information for a DataSync-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location.
+     *
+     * DataSync uses the default AWS-managed KMS key to encrypt this secret in AWS Secrets Manager.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-managedsecretconfig.html
+     */
+    interface ManagedSecretConfigProperty {
+        /**
+         * Specifies the ARN for an AWS Secrets Manager secret.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxontap-managedsecretconfig.html#cfn-datasync-locationfsxontap-managedsecretconfig-secretarn
+         */
+        readonly secretArn?: string;
+    }
     /**
      * Specifies the Network File System (NFS) protocol configuration that AWS DataSync uses to access a storage virtual machine (SVM) on your Amazon FSx for NetApp ONTAP file system.
      *
@@ -746,10 +827,10 @@ export interface CfnLocationFSxONTAPMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxopenzfs.html
  */
-export declare class CfnLocationFSxOpenZFSPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationFSxOpenZFSPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationFSxOpenZFSMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationFSxOpenZFS`.
      *
@@ -876,10 +957,10 @@ export interface CfnLocationFSxOpenZFSMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html
  */
-export declare class CfnLocationFSxWindowsPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationFSxWindowsPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationFSxWindowsMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationFSxWindows`.
      *
@@ -896,6 +977,69 @@ export declare class CfnLocationFSxWindowsPropsMixin extends core.Mixin implemen
      */
     applyTo(construct: constructs.IConstruct): void;
 }
+export declare namespace CfnLocationFSxWindowsPropsMixin {
+    /**
+     * Specifies configuration information for a DataSync-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and a customer-managed AWS KMS key.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxwindows-cmksecretconfig.html
+     */
+    interface CmkSecretConfigProperty {
+        /**
+         * Specifies the ARN for the customer-managed AWS KMS key used to encrypt the secret specified for SecretArn.
+         *
+         * DataSync provides this key to AWS Secrets Manager.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxwindows-cmksecretconfig.html#cfn-datasync-locationfsxwindows-cmksecretconfig-kmskeyarn
+         */
+        readonly kmsKeyArn?: string;
+        /**
+         * Specifies the ARN for an AWS Secrets Manager secret, managed by DataSync.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxwindows-cmksecretconfig.html#cfn-datasync-locationfsxwindows-cmksecretconfig-secretarn
+         */
+        readonly secretArn?: string;
+    }
+    /**
+     * Specifies configuration information for a customer-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and an IAM role that DataSync can assume and access the customer-managed secret.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxwindows-customsecretconfig.html
+     */
+    interface CustomSecretConfigProperty {
+        /**
+         * Specifies the ARN for the AWS Identity and Access Management role that DataSync uses to access the secret specified for SecretArn.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxwindows-customsecretconfig.html#cfn-datasync-locationfsxwindows-customsecretconfig-secretaccessrolearn
+         */
+        readonly secretAccessRoleArn?: string;
+        /**
+         * Specifies the ARN for a customer created AWS Secrets Manager secret.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxwindows-customsecretconfig.html#cfn-datasync-locationfsxwindows-customsecretconfig-secretarn
+         */
+        readonly secretArn?: string;
+    }
+    /**
+     * Specifies configuration information for a DataSync-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location.
+     *
+     * DataSync uses the default AWS-managed KMS key to encrypt this secret in AWS Secrets Manager.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxwindows-managedsecretconfig.html
+     */
+    interface ManagedSecretConfigProperty {
+        /**
+         * Specifies the ARN for an AWS Secrets Manager secret.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationfsxwindows-managedsecretconfig.html#cfn-datasync-locationfsxwindows-managedsecretconfig-secretarn
+         */
+        readonly secretArn?: string;
+    }
+}
 /**
  * Properties for CfnLocationFSxWindowsPropsMixin
  *
@@ -904,6 +1048,18 @@ export declare class CfnLocationFSxWindowsPropsMixin extends core.Mixin implemen
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html
  */
 export interface CfnLocationFSxWindowsMixinProps {
+    /**
+     * Specifies configuration information for a DataSync-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and a customer-managed AWS KMS key.
+     *
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html#cfn-datasync-locationfsxwindows-cmksecretconfig
+     */
+    readonly cmkSecretConfig?: CfnLocationFSxWindowsPropsMixin.CmkSecretConfigProperty | cdk.IResolvable;
+    /**
+     * Specifies configuration information for a customer-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and an IAM role that DataSync can assume and access the customer-managed secret.
+     *
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html#cfn-datasync-locationfsxwindows-customsecretconfig
+     */
+    readonly customSecretConfig?: CfnLocationFSxWindowsPropsMixin.CustomSecretConfigProperty | cdk.IResolvable;
     /**
      * Specifies the name of the Windows domain that the FSx for Windows File Server file system belongs to.
      *
@@ -967,10 +1123,10 @@ export interface CfnLocationFSxWindowsMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html
  */
-export declare class CfnLocationHDFSPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationHDFSPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationHDFSMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationHDFS`.
      *
@@ -1040,6 +1196,67 @@ export declare namespace CfnLocationHDFSPropsMixin {
          */
         readonly port?: number;
     }
+    /**
+     * Specifies configuration information for a DataSync-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and a customer-managed AWS KMS key.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-cmksecretconfig.html
+     */
+    interface CmkSecretConfigProperty {
+        /**
+         * Specifies the ARN for the customer-managed AWS KMS key used to encrypt the secret specified for SecretArn.
+         *
+         * DataSync provides this key to AWS Secrets Manager.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-cmksecretconfig.html#cfn-datasync-locationhdfs-cmksecretconfig-kmskeyarn
+         */
+        readonly kmsKeyArn?: string;
+        /**
+         * Specifies the ARN for an AWS Secrets Manager secret, managed by DataSync.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-cmksecretconfig.html#cfn-datasync-locationhdfs-cmksecretconfig-secretarn
+         */
+        readonly secretArn?: string;
+    }
+    /**
+     * Specifies configuration information for a customer-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and an IAM role that DataSync can assume and access the customer-managed secret.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-customsecretconfig.html
+     */
+    interface CustomSecretConfigProperty {
+        /**
+         * Specifies the ARN for the AWS Identity and Access Management role that DataSync uses to access the secret specified for SecretArn.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-customsecretconfig.html#cfn-datasync-locationhdfs-customsecretconfig-secretaccessrolearn
+         */
+        readonly secretAccessRoleArn?: string;
+        /**
+         * Specifies the ARN for a customer created AWS Secrets Manager secret.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-customsecretconfig.html#cfn-datasync-locationhdfs-customsecretconfig-secretarn
+         */
+        readonly secretArn?: string;
+    }
+    /**
+     * Specifies configuration information for a DataSync-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location.
+     *
+     * DataSync uses the default AWS-managed KMS key to encrypt this secret in AWS Secrets Manager.
+     *
+     * @struct
+     * @stability external
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-managedsecretconfig.html
+     */
+    interface ManagedSecretConfigProperty {
+        /**
+         * Specifies the ARN for an AWS Secrets Manager secret.
+         *
+         * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-managedsecretconfig.html#cfn-datasync-locationhdfs-managedsecretconfig-secretarn
+         */
+        readonly secretArn?: string;
+    }
 }
 /**
  * Properties for CfnLocationHDFSPropsMixin
@@ -1069,6 +1286,18 @@ export interface CfnLocationHDFSMixinProps {
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-blocksize
      */
     readonly blockSize?: number;
+    /**
+     * Specifies configuration information for a DataSync-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and a customer-managed AWS KMS key.
+     *
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-cmksecretconfig
+     */
+    readonly cmkSecretConfig?: CfnLocationHDFSPropsMixin.CmkSecretConfigProperty | cdk.IResolvable;
+    /**
+     * Specifies configuration information for a customer-managed secret, such as an authentication token or set of credentials that DataSync uses to access a specific transfer location, and an IAM role that DataSync can assume and access the customer-managed secret.
+     *
+     * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-customsecretconfig
+     */
+    readonly customSecretConfig?: CfnLocationHDFSPropsMixin.CustomSecretConfigProperty | cdk.IResolvable;
     /**
      * The Kerberos key table (keytab) that contains mappings between the defined Kerberos principal and the encrypted keys.
      *
@@ -1155,10 +1384,10 @@ export interface CfnLocationHDFSMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationnfs.html
  */
-export declare class CfnLocationNFSPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationNFSPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationNFSMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationNFS`.
      *
@@ -1217,7 +1446,7 @@ export declare namespace CfnLocationNFSPropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationnfs-onpremconfig.html#cfn-datasync-locationnfs-onpremconfig-agentarns
          */
-        readonly agentArns?: Array<string>;
+        readonly agentArns?: Array<dataSyncRefs.IAgentRef | string>;
     }
 }
 /**
@@ -1275,10 +1504,10 @@ export interface CfnLocationNFSMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html
  */
-export declare class CfnLocationObjectStoragePropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationObjectStoragePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationObjectStorageMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationObjectStorage`.
      *
@@ -1493,10 +1722,10 @@ export interface CfnLocationObjectStorageMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locations3.html
  */
-export declare class CfnLocationS3PropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationS3PropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationS3MixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationS3`.
      *
@@ -1529,7 +1758,7 @@ export declare namespace CfnLocationS3PropsMixin {
          *
          * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locations3-s3config.html#cfn-datasync-locations3-s3config-bucketaccessrolearn
          */
-        readonly bucketAccessRoleArn?: string;
+        readonly bucketAccessRoleArn?: iamRefs.IRoleRef | string;
     }
 }
 /**
@@ -1545,7 +1774,7 @@ export interface CfnLocationS3MixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locations3.html#cfn-datasync-locations3-s3bucketarn
      */
-    readonly s3BucketArn?: string;
+    readonly s3BucketArn?: s3Refs.IBucketRef | string;
     /**
      * The Amazon Resource Name (ARN) of the AWS Identity and Access Management (IAM) role that is used to access an Amazon S3 bucket.
      *
@@ -1595,10 +1824,10 @@ export interface CfnLocationS3MixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html
  */
-export declare class CfnLocationSMBPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnLocationSMBPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnLocationSMBMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::LocationSMB`.
      *
@@ -1856,10 +2085,10 @@ export interface CfnLocationSMBMixinProps {
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html
  */
-export declare class CfnTaskPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnTaskPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnTaskMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::DataSync::Task`.
      *
@@ -2447,13 +2676,13 @@ export interface CfnTaskMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-cloudwatchloggrouparn
      */
-    readonly cloudWatchLogGroupArn?: string;
+    readonly cloudWatchLogGroupArn?: logsRefs.ILogGroupRef | string;
     /**
      * The Amazon Resource Name (ARN) of an AWS storage resource's location.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-destinationlocationarn
      */
-    readonly destinationLocationArn?: string;
+    readonly destinationLocationArn?: dataSyncRefs.ILocationEFSRef | dataSyncRefs.ILocationS3Ref | string;
     /**
      * Specifies exclude filters that define the files, objects, and folders in your source location that you don't want DataSync to transfer.
      *
@@ -2503,7 +2732,7 @@ export interface CfnTaskMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-sourcelocationarn
      */
-    readonly sourceLocationArn?: string;
+    readonly sourceLocationArn?: dataSyncRefs.ILocationNFSRef | dataSyncRefs.ILocationS3Ref | string;
     /**
      * Specifies the tags that you want to apply to your task.
      *