diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 7b610bcce1f7..f9ea1aa224f4 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -3,12 +3,12 @@ AutoRest installed successfully. Commencing code generation Generating CSharp code Executing AutoRest command -cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Git\AdmsSdkChange\sdk -2020-05-26 06:33:38 UTC +cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Git\Azure\azure-sdk-for-net\sdk +2020-06-03 08:26:23 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 98f100daf12446cbdc6359ba9b34e8a10f8410f3 +Commit: 41346a1b8bcf8265d7e86d844a72acc7ed9cfa1a AutoRest information Requested version: v2 Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index f54af3d20901..402f0de42436 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,16 +1,10 @@ # Changelog for the Azure Data Factory V2 .NET SDK -## Version 4.11.0 -### Feature Additions -- Added support for the follwoing new datasets in ADF - ExcelDataset, along with source and sink for Copy activity -- ExcelDataset will support following locations AzureBlobStorageLocation, AzureBlobFSLocation, AzureDataLakeStoreLocation, AmazonS3Location, FileServerLocation, FtpServerLocation, SftpLocation, HttpServerLocation, HdfsLocation - -## Version 4.10.0 -### Feature Additions -- Added new type conversion support in Copy activity - ## Version 4.9.0 ### Feature Additions +- Added support for xml dataset in ADF +- Added support for excel dataset in ADF +- Added new type conversion support in Copy activity - Added support for copying data to and from Snowflake using copy activity - Added package store support for Azure-SSIS integration runtime - Added httpRequestTimeout for ODataSource, SapEccSource, SapCloudForCustomerSource, SapCloudForCustomerSink, DynamicsAXSource diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3ReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3ReadSettings.cs index 98f367113ecd..c4867aa2caca 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3ReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3ReadSettings.cs @@ -54,13 +54,17 @@ public AmazonS3ReadSettings() /// Specify the root path where /// partition discovery starts from. Type: string (or Expression with /// resultType string). + /// Indicates whether the + /// source files need to be deleted after copy completion. Default is + /// false. Type: boolean (or Expression with resultType + /// boolean). /// The start of file's modified /// datetime. Type: string (or Expression with resultType /// string). /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public AmazonS3ReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public AmazonS3ReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object deleteFilesAfterCompletion = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; @@ -70,6 +74,7 @@ public AmazonS3ReadSettings() FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; PartitionRootPath = partitionRootPath; + DeleteFilesAfterCompletion = deleteFilesAfterCompletion; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; CustomInit(); @@ -130,6 +135,14 @@ public AmazonS3ReadSettings() [JsonProperty(PropertyName = "partitionRootPath")] public object PartitionRootPath { get; set; } + /// + /// Gets or sets indicates whether the source files need to be deleted + /// after copy completion. Default is false. Type: boolean (or + /// Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "deleteFilesAfterCompletion")] + public object DeleteFilesAfterCompletion { get; set; } + /// /// Gets or sets the start of file's modified datetime. Type: string /// (or Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSReadSettings.cs index 0ea2392dd6cd..7d26d4ce46bd 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSReadSettings.cs @@ -52,13 +52,17 @@ public AzureBlobFSReadSettings() /// Specify the root path where /// partition discovery starts from. Type: string (or Expression with /// resultType string). + /// Indicates whether the + /// source files need to be deleted after copy completion. Default is + /// false. Type: boolean (or Expression with resultType + /// boolean). /// The start of file's modified /// datetime. Type: string (or Expression with resultType /// string). /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public AzureBlobFSReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public AzureBlobFSReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object deleteFilesAfterCompletion = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; @@ -67,6 +71,7 @@ public AzureBlobFSReadSettings() FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; PartitionRootPath = partitionRootPath; + DeleteFilesAfterCompletion = deleteFilesAfterCompletion; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; CustomInit(); @@ -120,6 +125,14 @@ public AzureBlobFSReadSettings() [JsonProperty(PropertyName = "partitionRootPath")] public object PartitionRootPath { get; set; } + /// + /// Gets or sets indicates whether the source files need to be deleted + /// after copy completion. Default is false. Type: boolean (or + /// Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "deleteFilesAfterCompletion")] + public object DeleteFilesAfterCompletion { get; set; } + /// /// Gets or sets the start of file's modified datetime. Type: string /// (or Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageReadSettings.cs index d2e7679f33c9..3c31ef1dec5e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageReadSettings.cs @@ -56,13 +56,17 @@ public AzureBlobStorageReadSettings() /// Specify the root path where /// partition discovery starts from. Type: string (or Expression with /// resultType string). + /// Indicates whether the + /// source files need to be deleted after copy completion. Default is + /// false. Type: boolean (or Expression with resultType + /// boolean). /// The start of file's modified /// datetime. Type: string (or Expression with resultType /// string). /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public AzureBlobStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public AzureBlobStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object deleteFilesAfterCompletion = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; @@ -72,6 +76,7 @@ public AzureBlobStorageReadSettings() FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; PartitionRootPath = partitionRootPath; + DeleteFilesAfterCompletion = deleteFilesAfterCompletion; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; CustomInit(); @@ -132,6 +137,14 @@ public AzureBlobStorageReadSettings() [JsonProperty(PropertyName = "partitionRootPath")] public object PartitionRootPath { get; set; } + /// + /// Gets or sets indicates whether the source files need to be deleted + /// after copy completion. Default is false. Type: boolean (or + /// Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "deleteFilesAfterCompletion")] + public object DeleteFilesAfterCompletion { get; set; } + /// /// Gets or sets the start of file's modified datetime. Type: string /// (or Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreReadSettings.cs index dd9ab7977d59..59fd4720f38c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreReadSettings.cs @@ -49,26 +49,43 @@ public AzureDataLakeStoreReadSettings() /// file (relative path to the path configured in the dataset) that you /// want to copy. Type: string (or Expression with resultType /// string). + /// Lists files after the value (exclusive) + /// based on file/folder names’ lexicographical order. Applies under + /// the folderPath in data set, and filter files/sub-folders under the + /// folderPath. Type: string (or Expression with resultType + /// string). + /// Lists files before the value (inclusive) + /// based on file/folder names’ lexicographical order. Applies under + /// the folderPath in data set, and filter files/sub-folders under the + /// folderPath. Type: string (or Expression with resultType + /// string). /// Indicates whether to enable /// partition discovery. /// Specify the root path where /// partition discovery starts from. Type: string (or Expression with /// resultType string). + /// Indicates whether the + /// source files need to be deleted after copy completion. Default is + /// false. Type: boolean (or Expression with resultType + /// boolean). /// The start of file's modified /// datetime. Type: string (or Expression with resultType /// string). /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public AzureDataLakeStoreReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public AzureDataLakeStoreReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), object listAfter = default(object), object listBefore = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object deleteFilesAfterCompletion = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; FileListPath = fileListPath; + ListAfter = listAfter; + ListBefore = listBefore; EnablePartitionDiscovery = enablePartitionDiscovery; PartitionRootPath = partitionRootPath; + DeleteFilesAfterCompletion = deleteFilesAfterCompletion; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; CustomInit(); @@ -109,6 +126,24 @@ public AzureDataLakeStoreReadSettings() [JsonProperty(PropertyName = "fileListPath")] public object FileListPath { get; set; } + /// + /// Gets or sets lists files after the value (exclusive) based on + /// file/folder names’ lexicographical order. Applies under the + /// folderPath in data set, and filter files/sub-folders under the + /// folderPath. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "listAfter")] + public object ListAfter { get; set; } + + /// + /// Gets or sets lists files before the value (inclusive) based on + /// file/folder names’ lexicographical order. Applies under the + /// folderPath in data set, and filter files/sub-folders under the + /// folderPath. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "listBefore")] + public object ListBefore { get; set; } + /// /// Gets or sets indicates whether to enable partition discovery. /// @@ -122,6 +157,14 @@ public AzureDataLakeStoreReadSettings() [JsonProperty(PropertyName = "partitionRootPath")] public object PartitionRootPath { get; set; } + /// + /// Gets or sets indicates whether the source files need to be deleted + /// after copy completion. Default is false. Type: boolean (or + /// Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "deleteFilesAfterCompletion")] + public object DeleteFilesAfterCompletion { get; set; } + /// /// Gets or sets the start of file's modified datetime. Type: string /// (or Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageReadSettings.cs index 69700152d132..05a2c07d75c2 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageReadSettings.cs @@ -58,13 +58,17 @@ public AzureFileStorageReadSettings() /// Specify the root path where /// partition discovery starts from. Type: string (or Expression with /// resultType string). + /// Indicates whether the + /// source files need to be deleted after copy completion. Default is + /// false. Type: boolean (or Expression with resultType + /// boolean). /// The start of file's modified /// datetime. Type: string (or Expression with resultType /// string). /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public AzureFileStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public AzureFileStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object deleteFilesAfterCompletion = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; @@ -74,6 +78,7 @@ public AzureFileStorageReadSettings() FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; PartitionRootPath = partitionRootPath; + DeleteFilesAfterCompletion = deleteFilesAfterCompletion; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; CustomInit(); @@ -135,6 +140,14 @@ public AzureFileStorageReadSettings() [JsonProperty(PropertyName = "partitionRootPath")] public object PartitionRootPath { get; set; } + /// + /// Gets or sets indicates whether the source files need to be deleted + /// after copy completion. Default is false. Type: boolean (or + /// Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "deleteFilesAfterCompletion")] + public object DeleteFilesAfterCompletion { get; set; } + /// /// Gets or sets the start of file's modified datetime. Type: string /// (or Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs index 89a39070f26a..7fde44a13732 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs @@ -32,10 +32,15 @@ public DataFlowSink() /// Transformation name. /// Transformation description. /// Dataset reference. - public DataFlowSink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference)) + /// Linked service reference. + /// Schema linked service + /// reference. + public DataFlowSink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) : base(name, description) { Dataset = dataset; + LinkedService = linkedService; + SchemaLinkedService = schemaLinkedService; CustomInit(); } @@ -50,6 +55,18 @@ public DataFlowSink() [JsonProperty(PropertyName = "dataset")] public DatasetReference Dataset { get; set; } + /// + /// Gets or sets linked service reference. + /// + [JsonProperty(PropertyName = "linkedService")] + public LinkedServiceReference LinkedService { get; set; } + + /// + /// Gets or sets schema linked service reference. + /// + [JsonProperty(PropertyName = "schemaLinkedService")] + public LinkedServiceReference SchemaLinkedService { get; set; } + /// /// Validate the object. /// @@ -63,6 +80,14 @@ public override void Validate() { Dataset.Validate(); } + if (LinkedService != null) + { + LinkedService.Validate(); + } + if (SchemaLinkedService != null) + { + SchemaLinkedService.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSource.cs index 980ed9cd488f..838e69cc4a25 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSource.cs @@ -32,10 +32,15 @@ public DataFlowSource() /// Transformation name. /// Transformation description. /// Dataset reference. - public DataFlowSource(string name, string description = default(string), DatasetReference dataset = default(DatasetReference)) + /// Linked service reference. + /// Schema linked service + /// reference. + public DataFlowSource(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) : base(name, description) { Dataset = dataset; + LinkedService = linkedService; + SchemaLinkedService = schemaLinkedService; CustomInit(); } @@ -50,6 +55,18 @@ public DataFlowSource() [JsonProperty(PropertyName = "dataset")] public DatasetReference Dataset { get; set; } + /// + /// Gets or sets linked service reference. + /// + [JsonProperty(PropertyName = "linkedService")] + public LinkedServiceReference LinkedService { get; set; } + + /// + /// Gets or sets schema linked service reference. + /// + [JsonProperty(PropertyName = "schemaLinkedService")] + public LinkedServiceReference SchemaLinkedService { get; set; } + /// /// Validate the object. /// @@ -63,6 +80,14 @@ public override void Validate() { Dataset.Validate(); } + if (LinkedService != null) + { + LinkedService.Validate(); + } + if (SchemaLinkedService != null) + { + SchemaLinkedService.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs index 33e0252cfbcf..9a3ef89d1f7c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs @@ -51,7 +51,9 @@ public Factory() /// Version of the factory. /// Git repo information of the /// factory. - public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string eTag = default(string), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), FactoryRepoConfiguration repoConfiguration = default(FactoryRepoConfiguration)) + /// List of parameters for + /// factory. + public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string eTag = default(string), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), FactoryRepoConfiguration repoConfiguration = default(FactoryRepoConfiguration), IDictionary globalParameters = default(IDictionary)) : base(id, name, type, location, tags, eTag) { AdditionalProperties = additionalProperties; @@ -60,6 +62,7 @@ public Factory() CreateTime = createTime; Version = version; RepoConfiguration = repoConfiguration; + GlobalParameters = globalParameters; CustomInit(); } @@ -105,6 +108,12 @@ public Factory() [JsonProperty(PropertyName = "properties.repoConfiguration")] public FactoryRepoConfiguration RepoConfiguration { get; set; } + /// + /// Gets or sets list of parameters for factory. + /// + [JsonProperty(PropertyName = "properties.globalParameters")] + public IDictionary GlobalParameters { get; set; } + /// /// Validate the object. /// @@ -117,6 +126,16 @@ public virtual void Validate() { RepoConfiguration.Validate(); } + if (GlobalParameters != null) + { + foreach (var valueElement in GlobalParameters.Values) + { + if (valueElement != null) + { + valueElement.Validate(); + } + } + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerReadSettings.cs index 784615ba4f15..a50584658386 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerReadSettings.cs @@ -52,6 +52,10 @@ public FileServerReadSettings() /// Specify the root path where /// partition discovery starts from. Type: string (or Expression with /// resultType string). + /// Indicates whether the + /// source files need to be deleted after copy completion. Default is + /// false. Type: boolean (or Expression with resultType + /// boolean). /// The start of file's modified /// datetime. Type: string (or Expression with resultType /// string). @@ -61,7 +65,7 @@ public FileServerReadSettings() /// Specify a filter to be used to select a /// subset of files in the folderPath rather than all files. Type: /// string (or Expression with resultType string). - public FileServerReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object), object fileFilter = default(object)) + public FileServerReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object deleteFilesAfterCompletion = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object), object fileFilter = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; @@ -70,6 +74,7 @@ public FileServerReadSettings() FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; PartitionRootPath = partitionRootPath; + DeleteFilesAfterCompletion = deleteFilesAfterCompletion; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; FileFilter = fileFilter; @@ -124,6 +129,14 @@ public FileServerReadSettings() [JsonProperty(PropertyName = "partitionRootPath")] public object PartitionRootPath { get; set; } + /// + /// Gets or sets indicates whether the source files need to be deleted + /// after copy completion. Default is false. Type: boolean (or + /// Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "deleteFilesAfterCompletion")] + public object DeleteFilesAfterCompletion { get; set; } + /// /// Gets or sets the start of file's modified datetime. Type: string /// (or Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FtpReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FtpReadSettings.cs index 379e9bfd4fba..678775c7b66a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FtpReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FtpReadSettings.cs @@ -48,13 +48,17 @@ public FtpReadSettings() /// Specify the root path where /// partition discovery starts from. Type: string (or Expression with /// resultType string). + /// Indicates whether the + /// source files need to be deleted after copy completion. Default is + /// false. Type: boolean (or Expression with resultType + /// boolean). /// Point to a text file that lists each /// file (relative path to the path configured in the dataset) that you /// want to copy. Type: string (or Expression with resultType /// string). /// Specify whether to use binary /// transfer mode for FTP stores. - public FtpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object fileListPath = default(object), bool? useBinaryTransfer = default(bool?)) + public FtpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object deleteFilesAfterCompletion = default(object), object fileListPath = default(object), bool? useBinaryTransfer = default(bool?)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; @@ -62,6 +66,7 @@ public FtpReadSettings() WildcardFileName = wildcardFileName; EnablePartitionDiscovery = enablePartitionDiscovery; PartitionRootPath = partitionRootPath; + DeleteFilesAfterCompletion = deleteFilesAfterCompletion; FileListPath = fileListPath; UseBinaryTransfer = useBinaryTransfer; CustomInit(); @@ -107,6 +112,14 @@ public FtpReadSettings() [JsonProperty(PropertyName = "partitionRootPath")] public object PartitionRootPath { get; set; } + /// + /// Gets or sets indicates whether the source files need to be deleted + /// after copy completion. Default is false. Type: boolean (or + /// Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "deleteFilesAfterCompletion")] + public object DeleteFilesAfterCompletion { get; set; } + /// /// Gets or sets point to a text file that lists each file (relative /// path to the path configured in the dataset) that you want to copy. diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GlobalParameterSpecification.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GlobalParameterSpecification.cs new file mode 100644 index 000000000000..ee56776881c9 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GlobalParameterSpecification.cs @@ -0,0 +1,81 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// Definition of a single parameter for an entity. + /// + public partial class GlobalParameterSpecification + { + /// + /// Initializes a new instance of the GlobalParameterSpecification + /// class. + /// + public GlobalParameterSpecification() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the GlobalParameterSpecification + /// class. + /// + /// Global Parameter type. Possible values include: + /// 'Object', 'String', 'Int', 'Float', 'Bool', 'Array' + /// Value of parameter. + public GlobalParameterSpecification(string type, object value) + { + Type = type; + Value = value; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets global Parameter type. Possible values include: + /// 'Object', 'String', 'Int', 'Float', 'Bool', 'Array' + /// + [JsonProperty(PropertyName = "type")] + public string Type { get; set; } + + /// + /// Gets or sets value of parameter. + /// + [JsonProperty(PropertyName = "value")] + public object Value { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Type == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Type"); + } + if (Value == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Value"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GlobalParameterType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GlobalParameterType.cs new file mode 100644 index 000000000000..2c6c78eb35be --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GlobalParameterType.cs @@ -0,0 +1,26 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + + /// + /// Defines values for GlobalParameterType. + /// + public static class GlobalParameterType + { + public const string Object = "Object"; + public const string String = "String"; + public const string Int = "Int"; + public const string Float = "Float"; + public const string Bool = "Bool"; + public const string Array = "Array"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleCloudStorageReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleCloudStorageReadSettings.cs index 606f15fe21db..493b2ff915f0 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleCloudStorageReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleCloudStorageReadSettings.cs @@ -59,13 +59,17 @@ public GoogleCloudStorageReadSettings() /// Specify the root path where /// partition discovery starts from. Type: string (or Expression with /// resultType string). + /// Indicates whether the + /// source files need to be deleted after copy completion. Default is + /// false. Type: boolean (or Expression with resultType + /// boolean). /// The start of file's modified /// datetime. Type: string (or Expression with resultType /// string). /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public GoogleCloudStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public GoogleCloudStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object deleteFilesAfterCompletion = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; @@ -75,6 +79,7 @@ public GoogleCloudStorageReadSettings() FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; PartitionRootPath = partitionRootPath; + DeleteFilesAfterCompletion = deleteFilesAfterCompletion; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; CustomInit(); @@ -135,6 +140,14 @@ public GoogleCloudStorageReadSettings() [JsonProperty(PropertyName = "partitionRootPath")] public object PartitionRootPath { get; set; } + /// + /// Gets or sets indicates whether the source files need to be deleted + /// after copy completion. Default is false. Type: boolean (or + /// Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "deleteFilesAfterCompletion")] + public object DeleteFilesAfterCompletion { get; set; } + /// /// Gets or sets the start of file's modified datetime. Type: string /// (or Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpReadSettings.cs index c8ef2a08a179..46d7feb33a2c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpReadSettings.cs @@ -52,13 +52,17 @@ public SftpReadSettings() /// file (relative path to the path configured in the dataset) that you /// want to copy. Type: string (or Expression with resultType /// string). + /// Indicates whether the + /// source files need to be deleted after copy completion. Default is + /// false. Type: boolean (or Expression with resultType + /// boolean). /// The start of file's modified /// datetime. Type: string (or Expression with resultType /// string). /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public SftpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object fileListPath = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public SftpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object partitionRootPath = default(object), object fileListPath = default(object), object deleteFilesAfterCompletion = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; @@ -67,6 +71,7 @@ public SftpReadSettings() EnablePartitionDiscovery = enablePartitionDiscovery; PartitionRootPath = partitionRootPath; FileListPath = fileListPath; + DeleteFilesAfterCompletion = deleteFilesAfterCompletion; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; CustomInit(); @@ -120,6 +125,14 @@ public SftpReadSettings() [JsonProperty(PropertyName = "fileListPath")] public object FileListPath { get; set; } + /// + /// Gets or sets indicates whether the source files need to be deleted + /// after copy completion. Default is false. Type: boolean (or + /// Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "deleteFilesAfterCompletion")] + public object DeleteFilesAfterCompletion { get; set; } + /// /// Gets or sets the start of file's modified datetime. Type: string /// (or Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WaitActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WaitActivity.cs index ebbd56af6d1d..a64134ca3d93 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WaitActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WaitActivity.cs @@ -42,7 +42,7 @@ public WaitActivity() /// Activity description. /// Activity depends on condition. /// Activity user properties. - public WaitActivity(string name, int waitTimeInSeconds, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList)) + public WaitActivity(string name, object waitTimeInSeconds, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList)) : base(name, additionalProperties, description, dependsOn, userProperties) { WaitTimeInSeconds = waitTimeInSeconds; @@ -58,7 +58,7 @@ public WaitActivity() /// Gets or sets duration in seconds. /// [JsonProperty(PropertyName = "typeProperties.waitTimeInSeconds")] - public int WaitTimeInSeconds { get; set; } + public object WaitTimeInSeconds { get; set; } /// /// Validate the object. @@ -69,6 +69,10 @@ public WaitActivity() public override void Validate() { base.Validate(); + if (WaitTimeInSeconds == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "WaitTimeInSeconds"); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlDataset.cs new file mode 100644 index 000000000000..81ec8e31953d --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlDataset.cs @@ -0,0 +1,126 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Xml dataset. + /// + [Newtonsoft.Json.JsonObject("Xml")] + [Rest.Serialization.JsonTransformation] + public partial class XmlDataset : Dataset + { + /// + /// Initializes a new instance of the XmlDataset class. + /// + public XmlDataset() + { + LinkedServiceName = new LinkedServiceReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the XmlDataset class. + /// + /// Linked service reference. + /// The location of the json data + /// storage. + /// Unmatched properties from the + /// message are deserialized this collection + /// Dataset description. + /// Columns that define the structure of the + /// dataset. Type: array (or Expression with resultType array), + /// itemType: DatasetDataElement. + /// Columns that define the physical type schema + /// of the dataset. Type: array (or Expression with resultType array), + /// itemType: DatasetSchemaDataElement. + /// Parameters for dataset. + /// List of tags that can be used for + /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. + /// The code page name of the preferred + /// encoding. If not specified, the default value is UTF-8, unless BOM + /// denotes another Unicode encoding. Refer to the name column of the + /// table in the following link to set supported values: + /// https://msdn.microsoft.com/library/system.text.encoding.aspx. Type: + /// string (or Expression with resultType string). + /// The null value string. Type: string (or + /// Expression with resultType string). + /// The data compression method used for the + /// json dataset. + public XmlDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object encodingName = default(object), object nullValue = default(object), DatasetCompression compression = default(DatasetCompression)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) + { + Location = location; + EncodingName = encodingName; + NullValue = nullValue; + Compression = compression; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the location of the json data storage. + /// + [JsonProperty(PropertyName = "typeProperties.location")] + public DatasetLocation Location { get; set; } + + /// + /// Gets or sets the code page name of the preferred encoding. If not + /// specified, the default value is UTF-8, unless BOM denotes another + /// Unicode encoding. Refer to the name column of the table in the + /// following link to set supported values: + /// https://msdn.microsoft.com/library/system.text.encoding.aspx. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.encodingName")] + public object EncodingName { get; set; } + + /// + /// Gets or sets the null value string. Type: string (or Expression + /// with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.nullValue")] + public object NullValue { get; set; } + + /// + /// Gets or sets the data compression method used for the json dataset. + /// + [JsonProperty(PropertyName = "typeProperties.compression")] + public DatasetCompression Compression { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (Location == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Location"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlReadSettings.cs new file mode 100644 index 000000000000..0638822125c0 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlReadSettings.cs @@ -0,0 +1,86 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Xml read settings. + /// + public partial class XmlReadSettings : FormatReadSettings + { + /// + /// Initializes a new instance of the XmlReadSettings class. + /// + public XmlReadSettings() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the XmlReadSettings class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Compression settings. + /// Indicates what validation method is + /// used when reading the xml files. Allowed values: 'none', 'xsd', or + /// 'dtd'. Type: string (or Expression with resultType string). + /// Namespace uri to prefix mappings to + /// override the prefixes in column names when namespace is enabled, if + /// no prefix is defined for a namespace uri, the prefix of xml + /// element/attribute name in the xml data file will be used. Example: + /// "{"http://www.example.com/xml":"prefix"}" Type: object (or + /// Expression with resultType object). + public XmlReadSettings(IDictionary additionalProperties = default(IDictionary), CompressionReadSettings compressionProperties = default(CompressionReadSettings), object validationMode = default(object), object namespacePrefixes = default(object)) + : base(additionalProperties) + { + CompressionProperties = compressionProperties; + ValidationMode = validationMode; + NamespacePrefixes = namespacePrefixes; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets compression settings. + /// + [JsonProperty(PropertyName = "compressionProperties")] + public CompressionReadSettings CompressionProperties { get; set; } + + /// + /// Gets or sets indicates what validation method is used when reading + /// the xml files. Allowed values: 'none', 'xsd', or 'dtd'. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "validationMode")] + public object ValidationMode { get; set; } + + /// + /// Gets or sets namespace uri to prefix mappings to override the + /// prefixes in column names when namespace is enabled, if no prefix is + /// defined for a namespace uri, the prefix of xml element/attribute + /// name in the xml data file will be used. Example: + /// "{"http://www.example.com/xml":"prefix"}" Type: object (or + /// Expression with resultType object). + /// + [JsonProperty(PropertyName = "namespacePrefixes")] + public object NamespacePrefixes { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlSource.cs new file mode 100644 index 000000000000..d85bdf78e751 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlSource.cs @@ -0,0 +1,84 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// A copy activity Xml source. + /// + public partial class XmlSource : CopySource + { + /// + /// Initializes a new instance of the XmlSource class. + /// + public XmlSource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the XmlSource class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Source retry count. Type: integer + /// (or Expression with resultType integer). + /// Source retry wait. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// The maximum concurrent + /// connection count for the source data store. Type: integer (or + /// Expression with resultType integer). + /// Xml store settings. + /// Xml format settings. + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public XmlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), XmlReadSettings formatSettings = default(XmlReadSettings), IList additionalColumns = default(IList)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) + { + StoreSettings = storeSettings; + FormatSettings = formatSettings; + AdditionalColumns = additionalColumns; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets xml store settings. + /// + [JsonProperty(PropertyName = "storeSettings")] + public StoreReadSettings StoreSettings { get; set; } + + /// + /// Gets or sets xml format settings. + /// + [JsonProperty(PropertyName = "formatSettings")] + public XmlReadSettings FormatSettings { get; set; } + + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs index 40a91383da49..efb339dec941 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs @@ -40,10 +40,10 @@ public static IEnumerable> ApiInfo_DataFactoryMana // BEGIN: Code Generation Metadata Section public static readonly String AutoRestVersion = "v2"; public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Git\\AdmsSdkChange\\sdk"; + public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Git\\Azure\\azure-sdk-for-net\\sdk"; public static readonly String GithubForkName = "Azure"; public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "98f100daf12446cbdc6359ba9b34e8a10f8410f3"; + public static readonly String GithubCommidId = "41346a1b8bcf8265d7e86d844a72acc7ed9cfa1a"; public static readonly String CodeGenerationErrors = ""; public static readonly String GithubRepoName = "azure-rest-api-specs"; // END: Code Generation Metadata Section diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index 2b12725873c4..84a02d9ac551 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -5,12 +5,24 @@ Microsoft.Azure.Management.DataFactory Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms. - 4.10.0 + 4.9.0 Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs index 4c746ec7f624..2aa51e6f399d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("4.3.0.0")] -[assembly: AssemblyFileVersion("4.10.0.0")] +[assembly: AssemblyVersion("4.9.0.0")] +[assembly: AssemblyFileVersion("4.9.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs index e1e074eb5325..86a97d0be547 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs @@ -1160,6 +1160,34 @@ public class DatasetJsonSamples : JsonSampleCollection } }"; + [JsonSample] + public const string XmlDataset = @" +{ + name: ""MyXml"", + properties: { + type: ""Xml"", + linkedServiceName: + { + referenceName : ""ls"", + type : ""LinkedServiceReference"" + }, + typeProperties: { + location: { + type: ""AzureBlobStorageLocation"", + folderPath: ""testFolder"", + fileName: ""test.json"", + container: ""MyContainer"" + }, + encodingName: ""UTF-8"", + nullValue: ""null"", + compression: { + type: ""GZip"", + level: ""Optimal"" + } + } + } +}"; + [JsonSample] public const string Json = @" { diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs index e026abe7dba2..d4b94f58d46e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs @@ -4959,6 +4959,107 @@ public class PipelineJsonSamples : JsonSampleCollection } }"; + [JsonSample] + public const string CopyActivity_Xml_AzureBlob = @"{ + ""properties"": { + ""activities"": [ + { + ""type"": ""Copy"", + ""typeProperties"": { + ""source"": { + ""type"": ""XmlSource"", + ""storeSettings"": { + ""type"": ""AzureBlobStorageReadSettings"", + ""recursive"": true, + ""enablePartitionDiscovery"": true, + ""wildcardFolderPath"": ""abc*d"", + ""wildcardFileName"": ""*.xml"" + }, + ""formatSettings"": { + ""type"": ""XmlReadSettings"", + ""validationMode"": ""xsd"" + } + }, + ""sink"": { + ""type"": ""JsonSink"", + ""storeSettings"": { + ""type"": ""AzureDataLakeStoreWriteSettings"", + ""maxConcurrentConnections"": 3, + ""copyBehavior"": ""PreserveHierarchy"" + }, + ""formatSettings"": { + ""type"": ""JsonWriteSettings"", + ""filePattern"": ""arrayOfObjects"" + } + } + }, + ""inputs"": [ + { + ""referenceName"": ""sourceDataset"", + ""type"": ""DatasetReference"" + } + ], + ""outputs"": [ + { + ""referenceName"": ""sinkDataset"", + ""type"": ""DatasetReference"" + } + ], + ""name"": ""ExampleCopyActivity"" + }, + { + ""type"": ""Copy"", + ""typeProperties"": { + ""source"": { + ""type"": ""XmlSource"", + ""storeSettings"": { + ""type"": ""AzureBlobStorageReadSettings"", + ""recursive"": true + }, + ""formatSettings"": { + ""type"": ""XmlReadSettings"", + ""compressionProperties"": { + ""type"": ""ZipDeflateReadSettings"", + ""preserveZipFileNameAsFolder"": false + } + }, + ""additionalColumns"": [ + { + ""name"": ""clmn"", + ""value"": ""$$FILEPATH"" + } + ] + }, + ""sink"": { + ""type"": ""DelimitedTextSink"", + ""storeSettings"": { + ""type"": ""AzureBlobStorageWriteSettings"", + ""recursive"": true + }, + ""formatSettings"": { + ""type"": ""DelimitedTextWriteSettings"", + ""fileExtension"": "".txt"" + } + } + }, + ""name"": ""XmlBlobToBlob_Unzip"", + ""inputs"": [ + { + ""referenceName"": ""SourceBlobDataset"", + ""type"": ""DatasetReference"" + } + ], + ""outputs"": [ + { + ""referenceName"": ""SinkBlobDataset"", + ""type"": ""DatasetReference"" + } + ] + } + ] + } +}"; + [JsonSample] public const string CopyActivity_Binary_Binary = @"{ ""name"": ""MyPipeline"",