From e18def0db8be3669020981fbca02400fc819d0b7 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 30 Aug 2021 10:35:24 +0800 Subject: [PATCH 1/9] [DataFactory]Supported AmazonRdsForOracle Source --- .../datafactory_resource-manager.txt | 8 +- .../src/CHANGELOG.md | 4 + .../Models/AmazonRdsForOracleLinkedService.cs | 106 ++++++++++++++++ .../AmazonRdsForOraclePartitionOption.cs | 23 ++++ .../AmazonRdsForOraclePartitionSettings.cs | 94 ++++++++++++++ .../Models/AmazonRdsForOracleSource.cs | 115 ++++++++++++++++++ .../Models/AmazonRdsForOracleTableDataset.cs | 100 +++++++++++++++ ...rosoft.Azure.Management.DataFactory.csproj | 4 +- .../src/Properties/AssemblyInfo.cs | 4 +- .../tests/JsonSamples/DatasetJsonSamples.cs | 34 ++++++ .../JsonSamples/LinkedServiceJsonSamples.cs | 50 ++++++++ .../tests/JsonSamples/PipelineJsonSamples.cs | 37 ++++++ 12 files changed, 571 insertions(+), 8 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleLinkedService.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOraclePartitionOption.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOraclePartitionSettings.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleSource.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleTableDataset.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 17bef7089d1f..33df5469eeb6 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:\Projects\azure-sdk-for-net-1\sdk -2021-08-17 01:13:24 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:\Projects\azure-sdk-for-net\sdk +2021-08-30 02:31:50 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 3893616381e816729ef9cdd768e87fb2845e189d +Commit: b020247789ba2ab0065ebbcfa69050ce729493b8 AutoRest information Requested version: v2 -Bootstrapper version: autorest@2.0.4413 +Bootstrapper version: autorest@3.3.2 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index f460921de63e..1d5102d6a657 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 4.24.0 +### Feature Additions +- Supported AmazonRdsForOracle Source + ## Version 4.23.0 ### Feature Additions - Supported power query GA payload diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleLinkedService.cs new file mode 100644 index 000000000000..d7211a84d263 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleLinkedService.cs @@ -0,0 +1,106 @@ +// +// 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; + + /// + /// AmazonRdsForOracle database. + /// + [Newtonsoft.Json.JsonObject("AmazonRdsForOracle")] + [Rest.Serialization.JsonTransformation] + public partial class AmazonRdsForOracleLinkedService : LinkedService + { + /// + /// Initializes a new instance of the AmazonRdsForOracleLinkedService + /// class. + /// + public AmazonRdsForOracleLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AmazonRdsForOracleLinkedService + /// class. + /// + /// The connection string. Type: string, + /// SecureString or AzureKeyVaultSecretReference. + /// Unmatched properties from the + /// message are deserialized this collection + /// The integration runtime reference. + /// Linked service description. + /// Parameters for linked service. + /// List of tags that can be used for + /// describing the linked service. + /// The Azure key vault secret reference of + /// password in connection string. + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + public AmazonRdsForOracleLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase password = default(SecretBase), object encryptedCredential = default(object)) + : base(additionalProperties, connectVia, description, parameters, annotations) + { + ConnectionString = connectionString; + Password = password; + EncryptedCredential = encryptedCredential; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the connection string. Type: string, SecureString or + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.connectionString")] + public object ConnectionString { get; set; } + + /// + /// Gets or sets the Azure key vault secret reference of password in + /// connection string. + /// + [JsonProperty(PropertyName = "typeProperties.password")] + public SecretBase Password { get; set; } + + /// + /// Gets or sets the encrypted credential used for authentication. + /// Credentials are encrypted using the integration runtime credential + /// manager. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] + public object EncryptedCredential { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (ConnectionString == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOraclePartitionOption.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOraclePartitionOption.cs new file mode 100644 index 000000000000..f9d5a783acdc --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOraclePartitionOption.cs @@ -0,0 +1,23 @@ +// +// 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 AmazonRdsForOraclePartitionOption. + /// + public static class AmazonRdsForOraclePartitionOption + { + public const string None = "None"; + public const string PhysicalPartitionsOfTable = "PhysicalPartitionsOfTable"; + public const string DynamicRange = "DynamicRange"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOraclePartitionSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOraclePartitionSettings.cs new file mode 100644 index 000000000000..c91248b9937c --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOraclePartitionSettings.cs @@ -0,0 +1,94 @@ +// +// 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.Linq; + + /// + /// The settings that will be leveraged for AmazonRdsForOracle source + /// partitioning. + /// + public partial class AmazonRdsForOraclePartitionSettings + { + /// + /// Initializes a new instance of the + /// AmazonRdsForOraclePartitionSettings class. + /// + public AmazonRdsForOraclePartitionSettings() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// AmazonRdsForOraclePartitionSettings class. + /// + /// Names of the physical partitions of + /// AmazonRdsForOracle table. + /// The name of the column in integer + /// type that will be used for proceeding range partitioning. Type: + /// string (or Expression with resultType string). + /// The maximum value of column + /// specified in partitionColumnName that will be used for proceeding + /// range partitioning. Type: string (or Expression with resultType + /// string). + /// The minimum value of column + /// specified in partitionColumnName that will be used for proceeding + /// range partitioning. Type: string (or Expression with resultType + /// string). + public AmazonRdsForOraclePartitionSettings(object partitionNames = default(object), object partitionColumnName = default(object), object partitionUpperBound = default(object), object partitionLowerBound = default(object)) + { + PartitionNames = partitionNames; + PartitionColumnName = partitionColumnName; + PartitionUpperBound = partitionUpperBound; + PartitionLowerBound = partitionLowerBound; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets names of the physical partitions of AmazonRdsForOracle + /// table. + /// + [JsonProperty(PropertyName = "partitionNames")] + public object PartitionNames { get; set; } + + /// + /// Gets or sets the name of the column in integer type that will be + /// used for proceeding range partitioning. Type: string (or Expression + /// with resultType string). + /// + [JsonProperty(PropertyName = "partitionColumnName")] + public object PartitionColumnName { get; set; } + + /// + /// Gets or sets the maximum value of column specified in + /// partitionColumnName that will be used for proceeding range + /// partitioning. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "partitionUpperBound")] + public object PartitionUpperBound { get; set; } + + /// + /// Gets or sets the minimum value of column specified in + /// partitionColumnName that will be used for proceeding range + /// partitioning. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "partitionLowerBound")] + public object PartitionLowerBound { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleSource.cs new file mode 100644 index 000000000000..8c98134a0c58 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleSource.cs @@ -0,0 +1,115 @@ +// +// 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 AmazonRdsForOracle source. + /// + public partial class AmazonRdsForOracleSource : CopySource + { + /// + /// Initializes a new instance of the AmazonRdsForOracleSource class. + /// + public AmazonRdsForOracleSource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AmazonRdsForOracleSource 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). + /// If true, disable data store + /// metrics collection. Default is false. Type: boolean (or Expression + /// with resultType boolean). + /// AmazonRdsForOracle reader query. + /// Type: string (or Expression with resultType string). + /// Query timeout. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// The partition mechanism that will be + /// used for AmazonRdsForOracle read in parallel. Type: string (or + /// Expression with resultType string). + /// The settings that will be leveraged + /// for AmazonRdsForOracle source partitioning. + /// Specifies the additional columns to + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). + public AmazonRdsForOracleSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object oracleReaderQuery = default(object), object queryTimeout = default(object), object partitionOption = default(object), AmazonRdsForOraclePartitionSettings partitionSettings = default(AmazonRdsForOraclePartitionSettings), object additionalColumns = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) + { + OracleReaderQuery = oracleReaderQuery; + QueryTimeout = queryTimeout; + PartitionOption = partitionOption; + PartitionSettings = partitionSettings; + AdditionalColumns = additionalColumns; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets amazonRdsForOracle reader query. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "oracleReaderQuery")] + public object OracleReaderQuery { get; set; } + + /// + /// Gets or sets query timeout. Type: string (or Expression with + /// resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// + [JsonProperty(PropertyName = "queryTimeout")] + public object QueryTimeout { get; set; } + + /// + /// Gets or sets the partition mechanism that will be used for + /// AmazonRdsForOracle read in parallel. Type: string (or Expression + /// with resultType string). + /// + [JsonProperty(PropertyName = "partitionOption")] + public object PartitionOption { get; set; } + + /// + /// Gets or sets the settings that will be leveraged for + /// AmazonRdsForOracle source partitioning. + /// + [JsonProperty(PropertyName = "partitionSettings")] + public AmazonRdsForOraclePartitionSettings PartitionSettings { get; set; } + + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public object AdditionalColumns { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleTableDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleTableDataset.cs new file mode 100644 index 000000000000..c7a7ba7e95d4 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForOracleTableDataset.cs @@ -0,0 +1,100 @@ +// +// 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; + + /// + /// The AmazonRdsForOracle database dataset. + /// + [Newtonsoft.Json.JsonObject("AmazonRdsForOracleTable")] + [Rest.Serialization.JsonTransformation] + public partial class AmazonRdsForOracleTableDataset : Dataset + { + /// + /// Initializes a new instance of the AmazonRdsForOracleTableDataset + /// class. + /// + public AmazonRdsForOracleTableDataset() + { + LinkedServiceName = new LinkedServiceReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the AmazonRdsForOracleTableDataset + /// class. + /// + /// Linked service reference. + /// 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 schema name + /// of the AmazonRdsForOracle database. Type: string (or Expression + /// with resultType string). + /// The table name of the AmazonRdsForOracle + /// database. Type: string (or Expression with resultType + /// string). + public AmazonRdsForOracleTableDataset(LinkedServiceReference linkedServiceName, 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 amazonRdsForOracleTableDatasetSchema = default(object), object table = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) + { + AmazonRdsForOracleTableDatasetSchema = amazonRdsForOracleTableDatasetSchema; + Table = table; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the schema name of the AmazonRdsForOracle database. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.schema")] + public object AmazonRdsForOracleTableDatasetSchema { get; set; } + + /// + /// Gets or sets the table name of the AmazonRdsForOracle database. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.table")] + public object Table { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + } + } +} 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 fce8a1cc2193..a2cfc000436c 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,12 @@ 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.23.0 + 4.24.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 21e3e5737d23..d5dd6aaf0cd2 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.23.0.0")] -[assembly: AssemblyFileVersion("4.23.0.0")] +[assembly: AssemblyVersion("4.24.0.0")] +[assembly: AssemblyFileVersion("4.24.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 38f3361a71da..0f2a1ae41a1a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs @@ -215,6 +215,40 @@ public class DatasetJsonSamples : JsonSampleCollection } } } +"; + + [JsonSample] + public const string AmazonRdsForOracleTable = @" +{ + name: ""AmazonRdsForOracleTable"", + properties: + { + type: ""AmazonRdsForOracleTable"", + description: ""Example of AmazonRdsForOracle with parameter, description, and expression"", + parameters: { + StartTime: { + type: ""String"", + defaultValue: ""2017-01-31T00:00:00Z"" + } + }, + linkedServiceName: + { + referenceName : ""ls"", + type : ""LinkedServiceReference"" + }, + typeProperties: + { + schema: { + value: ""@parameters('StartTime')"", + type: ""Expression"" + }, + table: { + value: ""@parameters('StartTime')"", + type: ""Expression"" + } + } + } +} "; [JsonSample] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs index baaeaa3775d0..d97c650576ee 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -614,6 +614,56 @@ public class LinkedServiceJsonSamples : JsonSampleCollection ] } } +"; + + [JsonSample(version: "Copy")] + public const string AmazonRdsForOracleSourcePipeline = @" +{ + name: ""DataPipeline_PostgreSqlSample"", + properties: + { + activities: + [ + { + name: ""AmazonRdsForOracleToPostgreSqlCopyActivity"", + inputs: [ {referenceName: ""DA_Input"", type: ""DatasetReference""} ], + outputs: [ {referenceName: ""DA_Output"", type: ""DatasetReference""} ], + type: ""Copy"", + typeProperties: + { + source: + { + type: ""AmazonRdsForOracleSource"", + query: ""select * from faketable"" + }, + sink: + { + type: ""AzurePostgreSqlSink"", + preCopyScript: ""fake script"" + } + }, + policy: + { + retry: 2, + timeout: ""01:00:00"" + } + } + ] + } +} "; [JsonSample(version: "Copy")] From 6b18f2ac6ae51a9f5d4034688fc5e759d0738a27 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 13 Sep 2021 10:36:33 +0800 Subject: [PATCH 2/9] [DataFactory]Added new features into 4.25.0 --- .../datafactory_resource-manager.txt | 5 +- .../src/CHANGELOG.md | 6 + .../AmazonRdsForSqlServerLinkedService.cs | 128 +++++++++++++++++ .../Models/AmazonRdsForSqlServerSource.cs | 132 ++++++++++++++++++ .../AmazonRdsForSqlServerTableDataset.cs | 99 +++++++++++++ ...ntegrationRuntimeCustomerVirtualNetwork.cs | 56 ++++++++ .../Models/ManagedIntegrationRuntime.cs | 12 +- .../Models/SqlAlwaysEncryptedAkvAuthType.cs | 1 + .../Models/SqlAlwaysEncryptedProperties.cs | 21 ++- ...rosoft.Azure.Management.DataFactory.csproj | 6 +- .../src/Properties/AssemblyInfo.cs | 4 +- .../tests/JsonSamples/DatasetJsonSamples.cs | 20 +++ .../IntegrationRuntimeJsonSamples.cs | 3 + .../JsonSamples/LinkedServiceJsonSamples.cs | 31 +++- .../tests/JsonSamples/PipelineJsonSamples.cs | 65 +++++++++ 15 files changed, 578 insertions(+), 11 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerLinkedService.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerSource.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerTableDataset.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeCustomerVirtualNetwork.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 33df5469eeb6..7a6a2587c2ed 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,11 +4,12 @@ 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:\Projects\azure-sdk-for-net\sdk -2021-08-30 02:31:50 UTC +Autorest CSharp Version: 2.3.82 +2021-09-13 02:13:39 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: b020247789ba2ab0065ebbcfa69050ce729493b8 +Commit: 9a19506631005d0ff1e3f394c86a9ce10cf51910 AutoRest information Requested version: v2 Bootstrapper version: autorest@3.3.2 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 1d5102d6a657..e08b5f2b0262 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 4.25.0 +### Feature Additions +- Supported UAMI in sql always +- Supported AmazonRdsForSqlServer Source +- Supported subnet id for swift injection of azure-ssis IR + ## Version 4.24.0 ### Feature Additions - Supported AmazonRdsForOracle Source diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerLinkedService.cs new file mode 100644 index 000000000000..c1e4ab8a64c5 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerLinkedService.cs @@ -0,0 +1,128 @@ +// +// 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; + + /// + /// Amazon RDS for SQL Server linked service. + /// + [Newtonsoft.Json.JsonObject("AmazonRdsForSqlServer")] + [Rest.Serialization.JsonTransformation] + public partial class AmazonRdsForSqlServerLinkedService : LinkedService + { + /// + /// Initializes a new instance of the + /// AmazonRdsForSqlServerLinkedService class. + /// + public AmazonRdsForSqlServerLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// AmazonRdsForSqlServerLinkedService class. + /// + /// The connection string. Type: string, + /// SecureString or AzureKeyVaultSecretReference. + /// Unmatched properties from the + /// message are deserialized this collection + /// The integration runtime reference. + /// Linked service description. + /// Parameters for linked service. + /// List of tags that can be used for + /// describing the linked service. + /// The on-premises Windows authentication user + /// name. Type: string (or Expression with resultType string). + /// The on-premises Windows authentication + /// password. + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + /// Sql always encrypted + /// properties. + public AmazonRdsForSqlServerLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object userName = default(object), SecretBase password = default(SecretBase), object encryptedCredential = default(object), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties)) + : base(additionalProperties, connectVia, description, parameters, annotations) + { + ConnectionString = connectionString; + UserName = userName; + Password = password; + EncryptedCredential = encryptedCredential; + AlwaysEncryptedSettings = alwaysEncryptedSettings; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the connection string. Type: string, SecureString or + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.connectionString")] + public object ConnectionString { get; set; } + + /// + /// Gets or sets the on-premises Windows authentication user name. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.userName")] + public object UserName { get; set; } + + /// + /// Gets or sets the on-premises Windows authentication password. + /// + [JsonProperty(PropertyName = "typeProperties.password")] + public SecretBase Password { get; set; } + + /// + /// Gets or sets the encrypted credential used for authentication. + /// Credentials are encrypted using the integration runtime credential + /// manager. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] + public object EncryptedCredential { get; set; } + + /// + /// Gets or sets sql always encrypted properties. + /// + [JsonProperty(PropertyName = "typeProperties.alwaysEncryptedSettings")] + public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (ConnectionString == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); + } + if (AlwaysEncryptedSettings != null) + { + AlwaysEncryptedSettings.Validate(); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerSource.cs new file mode 100644 index 000000000000..4cd61534b2c8 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerSource.cs @@ -0,0 +1,132 @@ +// +// 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 Amazon RDS for SQL Server source. + /// + public partial class AmazonRdsForSqlServerSource : TabularSource + { + /// + /// Initializes a new instance of the AmazonRdsForSqlServerSource + /// class. + /// + public AmazonRdsForSqlServerSource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AmazonRdsForSqlServerSource + /// 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). + /// If true, disable data store + /// metrics collection. Default is false. Type: boolean (or Expression + /// with resultType boolean). + /// Query timeout. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). + /// SQL reader query. Type: string (or + /// Expression with resultType string). + /// Name of the stored + /// procedure for a SQL Database source. This cannot be used at the + /// same time as SqlReaderQuery. Type: string (or Expression with + /// resultType string). + /// Value and type setting for + /// stored procedure parameters. Example: "{Parameter1: {value: "1", + /// type: "int"}}". + /// Which additional types to + /// produce. + /// The partition mechanism that will be + /// used for Sql read in parallel. Possible values include: "None", + /// "PhysicalPartitionsOfTable", "DynamicRange". + /// The settings that will be leveraged + /// for Sql source partitioning. + public AmazonRdsForSqlServerSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) + { + SqlReaderQuery = sqlReaderQuery; + SqlReaderStoredProcedureName = sqlReaderStoredProcedureName; + StoredProcedureParameters = storedProcedureParameters; + ProduceAdditionalTypes = produceAdditionalTypes; + PartitionOption = partitionOption; + PartitionSettings = partitionSettings; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets SQL reader query. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "sqlReaderQuery")] + public object SqlReaderQuery { get; set; } + + /// + /// Gets or sets name of the stored procedure for a SQL Database + /// source. This cannot be used at the same time as SqlReaderQuery. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "sqlReaderStoredProcedureName")] + public object SqlReaderStoredProcedureName { get; set; } + + /// + /// Gets or sets value and type setting for stored procedure + /// parameters. Example: "{Parameter1: {value: "1", type: "int"}}". + /// + [JsonProperty(PropertyName = "storedProcedureParameters")] + public IDictionary StoredProcedureParameters { get; set; } + + /// + /// Gets or sets which additional types to produce. + /// + [JsonProperty(PropertyName = "produceAdditionalTypes")] + public object ProduceAdditionalTypes { get; set; } + + /// + /// Gets or sets the partition mechanism that will be used for Sql read + /// in parallel. Possible values include: "None", + /// "PhysicalPartitionsOfTable", "DynamicRange". + /// + [JsonProperty(PropertyName = "partitionOption")] + public object PartitionOption { get; set; } + + /// + /// Gets or sets the settings that will be leveraged for Sql source + /// partitioning. + /// + [JsonProperty(PropertyName = "partitionSettings")] + public SqlPartitionSettings PartitionSettings { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerTableDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerTableDataset.cs new file mode 100644 index 000000000000..a42d7a43c68b --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerTableDataset.cs @@ -0,0 +1,99 @@ +// +// 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; + + /// + /// The Amazon RDS for SQL Server dataset. + /// + [Newtonsoft.Json.JsonObject("AmazonRdsForSqlServerTable")] + [Rest.Serialization.JsonTransformation] + public partial class AmazonRdsForSqlServerTableDataset : Dataset + { + /// + /// Initializes a new instance of the AmazonRdsForSqlServerTableDataset + /// class. + /// + public AmazonRdsForSqlServerTableDataset() + { + LinkedServiceName = new LinkedServiceReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the AmazonRdsForSqlServerTableDataset + /// class. + /// + /// Linked service reference. + /// 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 schema + /// name of the SQL Server dataset. Type: string (or Expression with + /// resultType string). + /// The table name of the SQL Server dataset. Type: + /// string (or Expression with resultType string). + public AmazonRdsForSqlServerTableDataset(LinkedServiceReference linkedServiceName, 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 amazonRdsForSqlServerTableDatasetSchema = default(object), object table = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) + { + AmazonRdsForSqlServerTableDatasetSchema = amazonRdsForSqlServerTableDatasetSchema; + Table = table; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the schema name of the SQL Server dataset. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.schema")] + public object AmazonRdsForSqlServerTableDatasetSchema { get; set; } + + /// + /// Gets or sets the table name of the SQL Server dataset. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.table")] + public object Table { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeCustomerVirtualNetwork.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeCustomerVirtualNetwork.cs new file mode 100644 index 000000000000..3525920e7512 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeCustomerVirtualNetwork.cs @@ -0,0 +1,56 @@ +// +// 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.Linq; + + /// + /// The definition and properties of virtual network to which Azure-SSIS + /// integration runtime will join. + /// + public partial class IntegrationRuntimeCustomerVirtualNetwork + { + /// + /// Initializes a new instance of the + /// IntegrationRuntimeCustomerVirtualNetwork class. + /// + public IntegrationRuntimeCustomerVirtualNetwork() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// IntegrationRuntimeCustomerVirtualNetwork class. + /// + /// The ID of subnet to which Azure-SSIS + /// integration runtime will join. + public IntegrationRuntimeCustomerVirtualNetwork(string subnetId = default(string)) + { + SubnetId = subnetId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the ID of subnet to which Azure-SSIS integration + /// runtime will join. + /// + [JsonProperty(PropertyName = "subnetId")] + public string SubnetId { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs index 3c75564aa8ce..d5f38bda3768 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs @@ -48,14 +48,17 @@ public ManagedIntegrationRuntime() /// integration runtime. /// SSIS properties for managed /// integration runtime. + /// The name of virtual network to + /// which Azure-SSIS integration runtime will join /// Managed Virtual Network /// reference. - public ManagedIntegrationRuntime(IDictionary additionalProperties = default(IDictionary), string description = default(string), string state = default(string), IntegrationRuntimeComputeProperties computeProperties = default(IntegrationRuntimeComputeProperties), IntegrationRuntimeSsisProperties ssisProperties = default(IntegrationRuntimeSsisProperties), ManagedVirtualNetworkReference managedVirtualNetwork = default(ManagedVirtualNetworkReference)) + public ManagedIntegrationRuntime(IDictionary additionalProperties = default(IDictionary), string description = default(string), string state = default(string), IntegrationRuntimeComputeProperties computeProperties = default(IntegrationRuntimeComputeProperties), IntegrationRuntimeSsisProperties ssisProperties = default(IntegrationRuntimeSsisProperties), IntegrationRuntimeCustomerVirtualNetwork customerVirtualNetwork = default(IntegrationRuntimeCustomerVirtualNetwork), ManagedVirtualNetworkReference managedVirtualNetwork = default(ManagedVirtualNetworkReference)) : base(additionalProperties, description) { State = state; ComputeProperties = computeProperties; SsisProperties = ssisProperties; + CustomerVirtualNetwork = customerVirtualNetwork; ManagedVirtualNetwork = managedVirtualNetwork; CustomInit(); } @@ -86,6 +89,13 @@ public ManagedIntegrationRuntime() [JsonProperty(PropertyName = "typeProperties.ssisProperties")] public IntegrationRuntimeSsisProperties SsisProperties { get; set; } + /// + /// Gets or sets the name of virtual network to which Azure-SSIS + /// integration runtime will join + /// + [JsonProperty(PropertyName = "typeProperties.customerVirtualNetwork")] + public IntegrationRuntimeCustomerVirtualNetwork CustomerVirtualNetwork { get; set; } + /// /// Gets or sets managed Virtual Network reference. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs index 2072bf64d6d1..b0dc3e353f24 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs @@ -18,5 +18,6 @@ public static class SqlAlwaysEncryptedAkvAuthType { public const string ServicePrincipal = "ServicePrincipal"; public const string ManagedIdentity = "ManagedIdentity"; + public const string UserAssignedManagedIdentity = "UserAssignedManagedIdentity"; } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs index 2feba7093053..70dbf4f4b8f9 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs @@ -35,17 +35,20 @@ public SqlAlwaysEncryptedProperties() /// Sql always encrypted AKV /// authentication type. Type: string (or Expression with resultType /// string). Possible values include: 'ServicePrincipal', - /// 'ManagedIdentity' + /// 'ManagedIdentity', 'UserAssignedManagedIdentity' /// The client ID of the application /// in Azure Active Directory used for Azure Key Vault authentication. /// Type: string (or Expression with resultType string). /// The key of the service principal /// used to authenticate against Azure Key Vault. - public SqlAlwaysEncryptedProperties(string alwaysEncryptedAkvAuthType, object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase)) + /// The credential reference containing + /// authentication information. + public SqlAlwaysEncryptedProperties(string alwaysEncryptedAkvAuthType, object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), CredentialReference credential = default(CredentialReference)) { AlwaysEncryptedAkvAuthType = alwaysEncryptedAkvAuthType; ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; + Credential = credential; CustomInit(); } @@ -57,7 +60,8 @@ public SqlAlwaysEncryptedProperties() /// /// Gets or sets sql always encrypted AKV authentication type. Type: /// string (or Expression with resultType string). Possible values - /// include: 'ServicePrincipal', 'ManagedIdentity' + /// include: 'ServicePrincipal', 'ManagedIdentity', + /// 'UserAssignedManagedIdentity' /// [JsonProperty(PropertyName = "alwaysEncryptedAkvAuthType")] public string AlwaysEncryptedAkvAuthType { get; set; } @@ -77,6 +81,13 @@ public SqlAlwaysEncryptedProperties() [JsonProperty(PropertyName = "servicePrincipalKey")] public SecretBase ServicePrincipalKey { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -89,6 +100,10 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "AlwaysEncryptedAkvAuthType"); } + if (Credential != null) + { + Credential.Validate(); + } } } } 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 a2cfc000436c..274954c37b4f 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,14 @@ 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.24.0 + 4.25.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 d5dd6aaf0cd2..a2cbce82465a 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.24.0.0")] -[assembly: AssemblyFileVersion("4.24.0.0")] +[assembly: AssemblyVersion("4.25.0.0")] +[assembly: AssemblyFileVersion("4.25.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 0f2a1ae41a1a..45f7810f2612 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs @@ -1747,6 +1747,26 @@ public class DatasetJsonSamples : JsonSampleCollection } } } +"; + [JsonSample] + public const string AmazonRdsForSqlServerTableV2 = @" +{ + name: ""AmazonRdsForSqlServerTable"", + properties: + { + type: ""AmazonRdsForSqlServerTable"", + linkedServiceName: + { + referenceName : ""ls"", + type : ""LinkedServiceReference"" + }, + typeProperties: + { + schema: ""dbo"", + table: ""testtable"" + } + } +} "; [JsonSample] public const string AzureSqlDWTableV2 = @" diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs index b3753f4a8170..45ea7525a784 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs @@ -26,6 +26,9 @@ public class IntegrationRuntimeJsonSamples : JsonSampleCollection ] } } +"; + + [JsonSample(version: "Copy")] + public const string CopyAmazonRdsForSqlServerToBlobWithTabularTranslator = @" +{ + name: ""MyPipelineName"", + properties: + { + description : ""Copy from AmazonRdsForSqlServer to Blob"", + activities: + [ + { + type: ""Copy"", + name: ""TestActivity"", + description: ""Test activity description"", + typeProperties: + { + source: + { + type: ""AmazonRdsForSqlServerSource"", + sourceRetryCount: 2, + sourceRetryWait: ""00:00:01"", + sqlReaderQuery: ""$EncryptedString$MyEncryptedQuery"", + sqlReaderStoredProcedureName: ""CopyTestSrcStoredProcedureWithParameters"", + storedProcedureParameters: { + ""stringData"": { value: ""test"", type: ""String""}, + ""id"": { value: ""3"", type: ""Int""} + }, + isolationLevel: ""ReadCommitted"" + }, + sink: + { + type: ""BlobSink"", + blobWriterAddHeader: true, + writeBatchSize: 1000000, + writeBatchTimeout: ""01:00:00"" + }, + translator: + { + type: ""TabularTranslator"", + columnMappings: ""PartitionKey:PartitionKey"" + } + }, + inputs: + [ + { + referenceName: ""InputAmazonRdsForSqlServerDA"", type: ""DatasetReference"" + } + ], + outputs: + [ + { + referenceName: ""OutputBlobDA"", type: ""DatasetReference"" + } + ], + linkedServiceName: { referenceName: ""MyLinkedServiceName"", type: ""LinkedServiceReference"" }, + policy: + { + retry: 3, + timeout: ""00:00:05"", + } + } + ] + } +} "; [JsonSample(version: "Copy")] From af2759429d61759ab416aa9a7db0f6c94ad71c7f Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Fri, 8 Oct 2021 10:13:17 +0800 Subject: [PATCH 3/9] [DataFactory]Added new features into 4.26.0 --- .../datafactory_resource-manager.txt | 11 ++-- .../src/CHANGELOG.md | 6 ++ .../ExecuteWranglingDataflowActivity.cs | 20 ++++-- .../Models/FactoryUpdateParameters.cs | 13 +++- .../Generated/Models/PowerQuerySinkMapping.cs | 63 +++++++++++++++++++ .../src/Generated/Models/WranglingDataFlow.cs | 11 +++- ...rosoft.Azure.Management.DataFactory.csproj | 8 +-- .../src/Properties/AssemblyInfo.cs | 4 +- .../tests/JsonSamples/DataFlowJsonSamples.cs | 3 +- .../tests/JsonSamples/PipelineJsonSamples.cs | 45 +++++++++++++ 10 files changed, 164 insertions(+), 20 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySinkMapping.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 7a6a2587c2ed..4c616f768f92 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -3,13 +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:\Projects\azure-sdk-for-net\sdk -Autorest CSharp Version: 2.3.82 -2021-09-13 02:13:39 UTC +cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk +2021-10-08 01:40:17 UTC Azure-rest-api-specs repository information GitHub fork: Azure -Branch: master -Commit: 9a19506631005d0ff1e3f394c86a9ce10cf51910 +Branch: main +Commit: 2ebe584103a362fa87f2f60c9bab89ab410c7571 AutoRest information Requested version: v2 -Bootstrapper version: autorest@3.3.2 +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 e08b5f2b0262..481485464eb7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 4.26.0 +### Feature Additions +- Supported Power Query model changes for multiple queries +- Added locale support in Power Query activity +- Added publicNetworkAccess into FactoryUpdateParameters + ## Version 4.25.0 ### Feature Additions - Supported UAMI in sql always diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs index 6f66212d22e8..3025552c5ede 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs @@ -62,10 +62,12 @@ public ExecuteWranglingDataflowActivity() /// flow execution. Allows sinks with the same save order to be /// processed concurrently. Type: boolean (or Expression with /// resultType boolean) - /// List of Power Query activity sinks mapped to a - /// queryName. + /// (Deprecated. Please use Queries). List of Power + /// Query activity sinks mapped to a queryName. + /// List of mapping for Power Query mashup query + /// to sink dataset(s). /// Activity policy. - public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), IDictionary sinks = default(IDictionary), ActivityPolicy policy = default(ActivityPolicy)) + public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), IDictionary sinks = default(IDictionary), IList queries = default(IList), ActivityPolicy policy = default(ActivityPolicy)) : base(name, additionalProperties, description, dependsOn, userProperties) { DataFlow = dataFlow; @@ -76,6 +78,7 @@ public ExecuteWranglingDataflowActivity() ContinueOnError = continueOnError; RunConcurrently = runConcurrently; Sinks = sinks; + Queries = queries; Policy = policy; CustomInit(); } @@ -134,12 +137,19 @@ public ExecuteWranglingDataflowActivity() public object RunConcurrently { get; set; } /// - /// Gets or sets list of Power Query activity sinks mapped to a - /// queryName. + /// Gets or sets (Deprecated. Please use Queries). List of Power Query + /// activity sinks mapped to a queryName. /// [JsonProperty(PropertyName = "typeProperties.sinks")] public IDictionary Sinks { get; set; } + /// + /// Gets or sets list of mapping for Power Query mashup query to sink + /// dataset(s). + /// + [JsonProperty(PropertyName = "typeProperties.queries")] + public IList Queries { get; set; } + /// /// Gets or sets activity policy. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs index 0f65c6a02eb6..fc5f63bde9ce 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs @@ -34,10 +34,14 @@ public FactoryUpdateParameters() /// The resource tags. /// Managed service identity of the /// factory. - public FactoryUpdateParameters(IDictionary tags = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity)) + /// Whether or not public network + /// access is allowed for the data factory. Possible values include: + /// 'Enabled', 'Disabled' + public FactoryUpdateParameters(IDictionary tags = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string publicNetworkAccess = default(string)) { Tags = tags; Identity = identity; + PublicNetworkAccess = publicNetworkAccess; CustomInit(); } @@ -58,6 +62,13 @@ public FactoryUpdateParameters() [JsonProperty(PropertyName = "identity")] public FactoryIdentity Identity { get; set; } + /// + /// Gets or sets whether or not public network access is allowed for + /// the data factory. Possible values include: 'Enabled', 'Disabled' + /// + [JsonProperty(PropertyName = "publicNetworkAccess")] + public string PublicNetworkAccess { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySinkMapping.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySinkMapping.cs new file mode 100644 index 000000000000..f4dae5123fb1 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySinkMapping.cs @@ -0,0 +1,63 @@ +// +// 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; + + /// + /// Map Power Query mashup query to sink dataset(s). + /// + public partial class PowerQuerySinkMapping + { + /// + /// Initializes a new instance of the PowerQuerySinkMapping class. + /// + public PowerQuerySinkMapping() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the PowerQuerySinkMapping class. + /// + /// Name of the query in Power Query mashup + /// document. + /// List of sinks mapped to Power Query + /// mashup query. + public PowerQuerySinkMapping(string queryName = default(string), IList dataflowSinks = default(IList)) + { + QueryName = queryName; + DataflowSinks = dataflowSinks; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets name of the query in Power Query mashup document. + /// + [JsonProperty(PropertyName = "queryName")] + public string QueryName { get; set; } + + /// + /// Gets or sets list of sinks mapped to Power Query mashup query. + /// + [JsonProperty(PropertyName = "dataflowSinks")] + public IList DataflowSinks { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs index aad4c5a477ba..5712b59b5f01 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs @@ -41,11 +41,14 @@ public WranglingDataFlow() /// specified, Data flow will appear at the root level. /// List of sources in Power Query. /// Power query mashup script. - public WranglingDataFlow(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IList sources = default(IList), string script = default(string)) + /// Locale of the Power query mashup + /// document. + public WranglingDataFlow(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IList sources = default(IList), string script = default(string), string documentLocale = default(string)) : base(description, annotations, folder) { Sources = sources; Script = script; + DocumentLocale = documentLocale; CustomInit(); } @@ -66,5 +69,11 @@ public WranglingDataFlow() [JsonProperty(PropertyName = "typeProperties.script")] public string Script { get; set; } + /// + /// Gets or sets locale of the Power query mashup document. + /// + [JsonProperty(PropertyName = "typeProperties.documentLocale")] + public string DocumentLocale { get; set; } + } } 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 274954c37b4f..f8818360c715 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,14 +5,14 @@ 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.25.0 + 4.26.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 a2cbce82465a..ff0b9cbee244 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.25.0.0")] -[assembly: AssemblyFileVersion("4.25.0.0")] +[assembly: AssemblyVersion("4.26.0.0")] +[assembly: AssemblyFileVersion("4.26.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs index d00cdb7e53a3..56069d86cabd 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs @@ -116,7 +116,8 @@ public class DataFlowJsonSamples : JsonSampleCollection ""name"": ""CADSource"" } ], - ""script"": ""some script"" + ""script"": ""some script"", + ""documentLocale"": ""de-DE"" } } } 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 37e9f5b233e3..6ea70750358e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs @@ -7542,6 +7542,51 @@ public class PipelineJsonSamples : JsonSampleCollection ] } } +"; + + [JsonSample] + public const string ExecuteWranglingDataFlowActivityPipelineNew = @" +{ + name: ""My Power Query Activity pipeline"", + properties: + { + activities: + [ + { + name: ""TestActivity"", + description: ""Test activity description"", + type: ""ExecuteWranglingDataflow"", + typeProperties: { + dataFlow: { + referenceName: ""referenced1"", + type: ""DataFlowReference"" + }, + staging: { + linkedService: { + referenceName: ""referenced2"", + type: ""LinkedServiceReference"" + }, + folderPath: ""adfjobs/staging"" + }, + integrationRuntime: { + referenceName: ""dataflowIR10minTTL"", + type: ""IntegrationRuntimeReference"" + }, + compute: { + computeType: ""MemoryOptimized"", + coreCount: 8 + }, + queries:[ + { + queryName: """", + dataflowSinks: [] + } + ] + } + } + ] + } +} "; } } From c742805fc80651892bf5de5698e05e931cdc8455 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 26 Oct 2021 14:40:08 +0800 Subject: [PATCH 4/9] [DataFactory]Supported Dataflow flowlets in ADF --- .../datafactory_resource-manager.txt | 5 +- .../src/CHANGELOG.md | 4 + .../Generated/Models/DataFlowDebugPackage.cs | 28 ++++- .../src/Generated/Models/DataFlowSink.cs | 5 +- .../src/Generated/Models/DataFlowSource.cs | 5 +- .../src/Generated/Models/Flowlet.cs | 111 ++++++++++++++++++ .../src/Generated/Models/MappingDataFlow.cs | 10 +- .../src/Generated/Models/PowerQuerySink.cs | 5 +- .../src/Generated/Models/PowerQuerySource.cs | 5 +- .../src/Generated/Models/Transformation.cs | 14 ++- ...rosoft.Azure.Management.DataFactory.csproj | 6 +- .../src/Properties/AssemblyInfo.cs | 4 +- .../tests/JsonSamples/DataFlowJsonSamples.cs | 3 +- 13 files changed, 181 insertions(+), 24 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Flowlet.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 4c616f768f92..66e05325c93a 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,11 +4,12 @@ Commencing code generation Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk -2021-10-08 01:40:17 UTC +Autorest CSharp Version: 2.3.82 +2021-10-26 06:09:01 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 2ebe584103a362fa87f2f60c9bab89ab410c7571 +Commit: 348665d474283df6a73d6a2ec6defef271251f13 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 481485464eb7..72b521776b87 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 4.27.0 +### Feature Additions +- Supported Dataflow flowlets in ADF + ## Version 4.26.0 ### Feature Additions - Supported Power Query model changes for multiple queries diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowDebugPackage.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowDebugPackage.cs index c6dc85624f26..32e44a94be82 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowDebugPackage.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowDebugPackage.cs @@ -35,15 +35,17 @@ public DataFlowDebugPackage() /// message are deserialized this collection /// The ID of data flow debug session. /// Data flow instance. + /// List of Data flows /// List of datasets. /// List of linked services. /// Staging info for debug session. /// Data flow debug settings. - public DataFlowDebugPackage(IDictionary additionalProperties = default(IDictionary), string sessionId = default(string), DataFlowDebugResource dataFlow = default(DataFlowDebugResource), IList datasets = default(IList), IList linkedServices = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), DataFlowDebugPackageDebugSettings debugSettings = default(DataFlowDebugPackageDebugSettings)) + public DataFlowDebugPackage(IDictionary additionalProperties = default(IDictionary), string sessionId = default(string), DataFlowDebugResource dataFlow = default(DataFlowDebugResource), IList dataFlows = default(IList), IList datasets = default(IList), IList linkedServices = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), DataFlowDebugPackageDebugSettings debugSettings = default(DataFlowDebugPackageDebugSettings)) { AdditionalProperties = additionalProperties; SessionId = sessionId; DataFlow = dataFlow; + DataFlows = dataFlows; Datasets = datasets; LinkedServices = linkedServices; Staging = staging; @@ -75,6 +77,12 @@ public DataFlowDebugPackage() [JsonProperty(PropertyName = "dataFlow")] public DataFlowDebugResource DataFlow { get; set; } + /// + /// Gets or sets list of Data flows + /// + [JsonProperty(PropertyName = "dataFlows")] + public IList DataFlows { get; set; } + /// /// Gets or sets list of datasets. /// @@ -111,9 +119,9 @@ public virtual void Validate() { DataFlow.Validate(); } - if (Datasets != null) + if (DataFlows != null) { - foreach (var element in Datasets) + foreach (var element in DataFlows) { if (element != null) { @@ -121,9 +129,9 @@ public virtual void Validate() } } } - if (LinkedServices != null) + if (Datasets != null) { - foreach (var element1 in LinkedServices) + foreach (var element1 in Datasets) { if (element1 != null) { @@ -131,6 +139,16 @@ public virtual void Validate() } } } + if (LinkedServices != null) + { + foreach (var element2 in LinkedServices) + { + if (element2 != null) + { + element2.Validate(); + } + } + } if (Staging != null) { Staging.Validate(); 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 7fde44a13732..cf3617962274 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 @@ -31,12 +31,13 @@ public DataFlowSink() /// /// Transformation name. /// Transformation description. + /// Flowlet Reference /// Dataset reference. /// 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) + public DataFlowSink(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) + : base(name, description, flowlet) { Dataset = dataset; LinkedService = linkedService; 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 838e69cc4a25..fc8e3f0fc77b 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 @@ -31,12 +31,13 @@ public DataFlowSource() /// /// Transformation name. /// Transformation description. + /// Flowlet Reference /// Dataset reference. /// 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) + public DataFlowSource(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) + : base(name, description, flowlet) { Dataset = dataset; LinkedService = linkedService; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Flowlet.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Flowlet.cs new file mode 100644 index 000000000000..a21237d14fae --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Flowlet.cs @@ -0,0 +1,111 @@ +// +// 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; + + /// + /// Data flow flowlet + /// + [Rest.Serialization.JsonTransformation] + public partial class Flowlet : DataFlow + { + /// + /// Initializes a new instance of the Flowlet class. + /// + public Flowlet() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the Flowlet class. + /// + /// The description of the data flow. + /// List of tags that can be used for + /// describing the data flow. + /// The folder that this data flow is in. If not + /// specified, Data flow will appear at the root level. + /// Unmatched properties from the + /// message are deserialized this collection + /// List of sources in Flowlet. + /// List of sinks in Flowlet. + /// List of transformations in + /// Flowlet. + /// Flowlet script. + /// Flowlet script lines. + public Flowlet(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IDictionary additionalProperties = default(IDictionary), IList sources = default(IList), IList sinks = default(IList), IList transformations = default(IList), string script = default(string), IList scriptLines = default(IList), object additionalProperties1 = default(object)) + : base(description, annotations, folder) + { + AdditionalProperties = additionalProperties; + Sources = sources; + Sinks = sinks; + Transformations = transformations; + Script = script; + ScriptLines = scriptLines; + AdditionalProperties1 = additionalProperties1; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets unmatched properties from the message are deserialized + /// this collection + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Gets or sets list of sources in Flowlet. + /// + [JsonProperty(PropertyName = "typeProperties.sources")] + public IList Sources { get; set; } + + /// + /// Gets or sets list of sinks in Flowlet. + /// + [JsonProperty(PropertyName = "typeProperties.sinks")] + public IList Sinks { get; set; } + + /// + /// Gets or sets list of transformations in Flowlet. + /// + [JsonProperty(PropertyName = "typeProperties.transformations")] + public IList Transformations { get; set; } + + /// + /// Gets or sets flowlet script. + /// + [JsonProperty(PropertyName = "typeProperties.script")] + public string Script { get; set; } + + /// + /// Gets or sets flowlet script lines. + /// + [JsonProperty(PropertyName = "typeProperties.scriptLines")] + public IList ScriptLines { get; set; } + + /// + /// + [JsonProperty(PropertyName = "typeProperties.additionalProperties")] + public object AdditionalProperties1 { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MappingDataFlow.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MappingDataFlow.cs index 5cb562ed6281..3c9753de681a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MappingDataFlow.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MappingDataFlow.cs @@ -44,13 +44,15 @@ public MappingDataFlow() /// List of transformations in data /// flow. /// DataFlow script. - public MappingDataFlow(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IList sources = default(IList), IList sinks = default(IList), IList transformations = default(IList), string script = default(string)) + /// Data flow script lines. + public MappingDataFlow(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IList sources = default(IList), IList sinks = default(IList), IList transformations = default(IList), string script = default(string), IList scriptLines = default(IList)) : base(description, annotations, folder) { Sources = sources; Sinks = sinks; Transformations = transformations; Script = script; + ScriptLines = scriptLines; CustomInit(); } @@ -83,5 +85,11 @@ public MappingDataFlow() [JsonProperty(PropertyName = "typeProperties.script")] public string Script { get; set; } + /// + /// Gets or sets data flow script lines. + /// + [JsonProperty(PropertyName = "typeProperties.scriptLines")] + public IList ScriptLines { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs index 9831a8d23085..27de41df387e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs @@ -31,13 +31,14 @@ public PowerQuerySink() /// /// Transformation name. /// Transformation description. + /// Flowlet Reference /// Dataset reference. /// Linked service reference. /// Schema linked service /// reference. /// sink script. - public PowerQuerySink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) - : base(name, description, dataset, linkedService, schemaLinkedService) + public PowerQuerySink(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) + : base(name, description, flowlet, dataset, linkedService, schemaLinkedService) { Script = script; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySource.cs index 7d561f475ae4..4dbe1612c490 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySource.cs @@ -31,13 +31,14 @@ public PowerQuerySource() /// /// Transformation name. /// Transformation description. + /// Flowlet Reference /// Dataset reference. /// Linked service reference. /// Schema linked service /// reference. /// source script. - public PowerQuerySource(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) - : base(name, description, dataset, linkedService, schemaLinkedService) + public PowerQuerySource(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) + : base(name, description, flowlet, dataset, linkedService, schemaLinkedService) { Script = script; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Transformation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Transformation.cs index 08f3df869cf6..14b35526747d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Transformation.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Transformation.cs @@ -32,10 +32,12 @@ public Transformation() /// /// Transformation name. /// Transformation description. - public Transformation(string name, string description = default(string)) + /// Flowlet Reference + public Transformation(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference)) { Name = name; Description = description; + Flowlet = flowlet; CustomInit(); } @@ -56,6 +58,12 @@ public Transformation() [JsonProperty(PropertyName = "description")] public string Description { get; set; } + /// + /// Gets or sets flowlet Reference + /// + [JsonProperty(PropertyName = "flowlet")] + public DataFlowReference Flowlet { get; set; } + /// /// Validate the object. /// @@ -68,6 +76,10 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Name"); } + if (Flowlet != null) + { + Flowlet.Validate(); + } } } } 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 f8818360c715..dd493916430b 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,14 +5,12 @@ 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.26.0 + 4.27.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 ff0b9cbee244..a970139ba122 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.26.0.0")] -[assembly: AssemblyFileVersion("4.26.0.0")] +[assembly: AssemblyVersion("4.27.0.0")] +[assembly: AssemblyFileVersion("4.27.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs index 56069d86cabd..086d2bdbc642 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs @@ -48,7 +48,8 @@ public class DataFlowJsonSamples : JsonSampleCollection ""name"": ""CADSink"" } ], - ""script"": ""some script"" + ""script"": ""some script"", + ""scriptLines"": [""some script1"", ""some script2""] } } } From df9b10f5f114011dc0ddb915099fd739c6fed2da Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 28 Oct 2021 09:15:08 +0800 Subject: [PATCH 5/9] update for breakchanges --- .../Customizations/DataFlowDebugPackage.cs | 30 +++++++++++++++++++ .../src/Customizations/DataFlowSink.cs | 23 ++++++++++++++ .../src/Customizations/DataFlowSource.cs | 23 ++++++++++++++ .../src/Customizations/PowerQuerySink.cs | 22 ++++++++++++++ .../src/Customizations/PowerQuerySource.cs | 22 ++++++++++++++ 5 files changed, 120 insertions(+) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowDebugPackage.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSink.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSource.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySink.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySource.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowDebugPackage.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowDebugPackage.cs new file mode 100644 index 000000000000..48c482f2fdcb --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowDebugPackage.cs @@ -0,0 +1,30 @@ +using System.Collections.Generic; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class DataFlowDebugPackage + { + /// + /// Initializes a new instance of the DataFlowDebugPackage class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// The ID of data flow debug session. + /// Data flow instance. + /// List of datasets. + /// List of linked services. + /// Staging info for debug session. + /// Data flow debug settings. + public DataFlowDebugPackage(IDictionary additionalProperties = default(IDictionary), string sessionId = default(string), DataFlowDebugResource dataFlow = default(DataFlowDebugResource), IList datasets = default(IList), IList linkedServices = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), DataFlowDebugPackageDebugSettings debugSettings = default(DataFlowDebugPackageDebugSettings)) + { + AdditionalProperties = additionalProperties; + SessionId = sessionId; + DataFlow = dataFlow; + Datasets = datasets; + LinkedServices = linkedServices; + Staging = staging; + DebugSettings = debugSettings; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSink.cs new file mode 100644 index 000000000000..f7cde9d355b6 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSink.cs @@ -0,0 +1,23 @@ +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class DataFlowSink : Transformation + { + /// + /// Initializes a new instance of the DataFlowSink class. + /// + /// Transformation name. + /// Transformation description. + /// Dataset reference. + /// 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(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSource.cs new file mode 100644 index 000000000000..8ef1ad4b0946 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSource.cs @@ -0,0 +1,23 @@ +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class DataFlowSource : Transformation + { + /// + /// Initializes a new instance of the DataFlowSource class. + /// + /// Transformation name. + /// Transformation description. + /// Dataset reference. + /// 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(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySink.cs new file mode 100644 index 000000000000..d921c3a35602 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySink.cs @@ -0,0 +1,22 @@ +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class PowerQuerySink : DataFlowSink + { + /// + /// Initializes a new instance of the PowerQuerySink class. + /// + /// Transformation name. + /// Transformation description. + /// Dataset reference. + /// Linked service reference. + /// Schema linked service + /// reference. + /// sink script. + public PowerQuerySink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) + : base(name, description, dataset, linkedService, schemaLinkedService) + { + Script = script; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySource.cs new file mode 100644 index 000000000000..14a809ab96d2 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySource.cs @@ -0,0 +1,22 @@ +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class PowerQuerySource : DataFlowSource + { + /// + /// Initializes a new instance of the PowerQuerySource class. + /// + /// Transformation name. + /// Transformation description. + /// Dataset reference. + /// Linked service reference. + /// Schema linked service + /// reference. + /// source script. + public PowerQuerySource(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) + : base(name, description, dataset, linkedService, schemaLinkedService) + { + Script = script; + CustomInit(); + } + } +} From ea5867d29f62af086b36ff54d69bb8d9d54dc3e0 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 11 Nov 2021 10:03:44 +0800 Subject: [PATCH 6/9] [DataFactory]Added new features into 4.28.0 --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 5 ++ .../src/Customizations/DataFlowSink.cs | 21 ++++++- .../src/Customizations/DataFlowSource.cs | 21 ++++++- .../src/Customizations/DatasetCompression.cs | 25 ++++++++ .../src/Customizations/PowerQuerySink.cs | 18 ++++++ .../src/Customizations/PowerQuerySource.cs | 21 ++++++- .../src/Customizations/Transformation.cs | 25 ++++++++ .../Generated/DataFactoryManagementClient.cs | 2 - .../src/Generated/Models/AmazonS3Dataset.cs | 4 ++ .../src/Generated/Models/AzureBlobDataset.cs | 4 ++ .../Generated/Models/AzureBlobFSDataset.cs | 4 ++ .../Models/AzureDataLakeStoreDataset.cs | 4 ++ .../src/Generated/Models/BinaryDataset.cs | 4 ++ .../src/Generated/Models/DataFlowSink.cs | 28 +-------- .../src/Generated/Models/DataFlowSource.cs | 28 +-------- .../Models/DatasetBZip2Compression.cs | 49 --------------- .../Generated/Models/DatasetCompression.cs | 36 ++++++++++- .../Models/DatasetDeflateCompression.cs | 57 ------------------ .../Models/DatasetGZipCompression.cs | 57 ------------------ .../Generated/Models/DatasetTarCompression.cs | 49 --------------- .../Models/DatasetTarGZipCompression.cs | 57 ------------------ .../Models/DatasetZipDeflateCompression.cs | 59 ------------------- .../src/Generated/Models/ExcelDataset.cs | 4 ++ .../src/Generated/Models/FileShareDataset.cs | 4 ++ .../src/Generated/Models/HttpDataset.cs | 4 ++ .../src/Generated/Models/JsonDataset.cs | 4 ++ .../src/Generated/Models/PowerQuerySink.cs | 6 +- .../src/Generated/Models/PowerQuerySource.cs | 6 +- .../src/Generated/Models/Transformation.cs | 26 +++++++- .../src/Generated/Models/XmlDataset.cs | 4 ++ ...rosoft.Azure.Management.DataFactory.csproj | 5 +- .../src/Properties/AssemblyInfo.cs | 4 +- 33 files changed, 252 insertions(+), 397 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetCompression.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Transformation.cs delete mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetBZip2Compression.cs delete mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetDeflateCompression.cs delete mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetGZipCompression.cs delete mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarCompression.cs delete mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarGZipCompression.cs delete mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetZipDeflateCompression.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 66e05325c93a..33bd1aca4b18 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -5,11 +5,11 @@ Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk Autorest CSharp Version: 2.3.82 -2021-10-26 06:09:01 UTC +2021-11-11 01:15:27 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 348665d474283df6a73d6a2ec6defef271251f13 +Commit: 7fab18ac68c0720823cb5cd8f52faed16014f244 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 72b521776b87..b9a94ab6d86f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 4.28.0 +### Feature Additions +- Supported Dataset and LinkedService for Rest call transform +- Change compressionType to type of object + ## Version 4.27.0 ### Feature Additions - Supported Dataflow flowlets in ADF diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSink.cs index f7cde9d355b6..c3ddd2e5e90a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSink.cs @@ -12,7 +12,26 @@ public partial class DataFlowSink : Transformation /// 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) + : base(name, description, default(DataFlowReference)) + { + Dataset = dataset; + LinkedService = linkedService; + SchemaLinkedService = schemaLinkedService; + CustomInit(); + } + + /// + /// Initializes a new instance of the DataFlowSink class. + /// + /// Transformation name. + /// Transformation description. + /// Flowlet Reference + /// Dataset reference. + /// Linked service reference. + /// Schema linked service + /// reference. + public DataFlowSink(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) + : base(name, description, flowlet) { Dataset = dataset; LinkedService = linkedService; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSource.cs index 8ef1ad4b0946..ead90225869f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DataFlowSource.cs @@ -12,7 +12,26 @@ public partial class DataFlowSource : Transformation /// 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) + : base(name, description, default(DataFlowReference)) + { + Dataset = dataset; + LinkedService = linkedService; + SchemaLinkedService = schemaLinkedService; + CustomInit(); + } + + /// + /// Initializes a new instance of the DataFlowSource class. + /// + /// Transformation name. + /// Transformation description. + /// Flowlet Reference + /// Dataset reference. + /// Linked service reference. + /// Schema linked service + /// reference. + public DataFlowSource(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) + : base(name, description, flowlet) { Dataset = dataset; LinkedService = linkedService; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetCompression.cs new file mode 100644 index 000000000000..2c20ad9687ac --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetCompression.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + /// + /// The compression method used on a dataset. + /// + public partial class DatasetCompression + { + /// + /// Initializes a new instance of the DatasetCompression class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + public DatasetCompression(IDictionary additionalProperties = default(IDictionary)) + { + AdditionalProperties = additionalProperties; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySink.cs index d921c3a35602..2166fa83e210 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySink.cs @@ -18,5 +18,23 @@ public partial class PowerQuerySink : DataFlowSink Script = script; CustomInit(); } + + /// + /// Initializes a new instance of the PowerQuerySink class. + /// + /// Transformation name. + /// Transformation description. + /// Flowlet Reference + /// Dataset reference. + /// Linked service reference. + /// Schema linked service + /// reference. + /// sink script. + public PowerQuerySink(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) + : base(name, description, flowlet, dataset, linkedService, schemaLinkedService) + { + Script = script; + CustomInit(); + } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySource.cs index 14a809ab96d2..90d9bf37f36e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/PowerQuerySource.cs @@ -13,10 +13,29 @@ public partial class PowerQuerySource : DataFlowSource /// reference. /// source script. public PowerQuerySource(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) - : base(name, description, dataset, linkedService, schemaLinkedService) + : base(name, description, default(DataFlowReference), dataset, linkedService, schemaLinkedService) { Script = script; CustomInit(); } + + /// + /// Initializes a new instance of the PowerQuerySource class. + /// + /// Transformation name. + /// Transformation description. + /// Flowlet Reference + /// Dataset reference. + /// Linked service reference. + /// Schema linked service + /// reference. + /// source script. + public PowerQuerySource(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) + : base(name, description, flowlet, dataset, linkedService, schemaLinkedService) + { + Script = script; + CustomInit(); + } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Transformation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Transformation.cs new file mode 100644 index 000000000000..9c752b0af66c --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Transformation.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class Transformation + { + /// + /// Initializes a new instance of the Transformation class. + /// + /// Transformation name. + /// Transformation description. + /// Flowlet Reference + public Transformation(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference)) + { + Name = name; + Description = description; + Flowlet = flowlet; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs index 19ce57683f0c..a602715ee405 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs @@ -489,8 +489,6 @@ private void Initialize() DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("authenticationType")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("authenticationType")); - SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); - DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3Dataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3Dataset.cs index 028fcc579833..5d74680462cd 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3Dataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3Dataset.cs @@ -156,6 +156,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "BucketName"); } + if (Compression != null) + { + Compression.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobDataset.cs index e13696f0183f..57cce1c0f889 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobDataset.cs @@ -140,6 +140,10 @@ public AzureBlobDataset() public override void Validate() { base.Validate(); + if (Compression != null) + { + Compression.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSDataset.cs index 9a7c919d0f02..13b9026beb35 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSDataset.cs @@ -111,6 +111,10 @@ public AzureBlobFSDataset() public override void Validate() { base.Validate(); + if (Compression != null) + { + Compression.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreDataset.cs index 128e0edbcfa1..5e092b9a56ff 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreDataset.cs @@ -109,6 +109,10 @@ public AzureDataLakeStoreDataset() public override void Validate() { base.Validate(); + if (Compression != null) + { + Compression.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/BinaryDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/BinaryDataset.cs index e8dc76b61f04..78be5e1d668f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/BinaryDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/BinaryDataset.cs @@ -93,6 +93,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Location"); } + if (Compression != null) + { + Compression.Validate(); + } } } } 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 cf3617962274..ceb47cbb9b97 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 @@ -31,16 +31,14 @@ public DataFlowSink() /// /// Transformation name. /// Transformation description. - /// Flowlet Reference /// Dataset reference. /// Linked service reference. + /// Flowlet Reference /// Schema linked service /// reference. - public DataFlowSink(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) - : base(name, description, flowlet) + public DataFlowSink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), DataFlowReference flowlet = default(DataFlowReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) + : base(name, description, dataset, linkedService, flowlet) { - Dataset = dataset; - LinkedService = linkedService; SchemaLinkedService = schemaLinkedService; CustomInit(); } @@ -50,18 +48,6 @@ public DataFlowSink() /// partial void CustomInit(); - /// - /// Gets or sets dataset reference. - /// - [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. /// @@ -77,14 +63,6 @@ public DataFlowSink() public override void Validate() { base.Validate(); - if (Dataset != null) - { - 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 fc8e3f0fc77b..d6ca33961443 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 @@ -31,16 +31,14 @@ public DataFlowSource() /// /// Transformation name. /// Transformation description. - /// Flowlet Reference /// Dataset reference. /// Linked service reference. + /// Flowlet Reference /// Schema linked service /// reference. - public DataFlowSource(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) - : base(name, description, flowlet) + public DataFlowSource(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), DataFlowReference flowlet = default(DataFlowReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) + : base(name, description, dataset, linkedService, flowlet) { - Dataset = dataset; - LinkedService = linkedService; SchemaLinkedService = schemaLinkedService; CustomInit(); } @@ -50,18 +48,6 @@ public DataFlowSource() /// partial void CustomInit(); - /// - /// Gets or sets dataset reference. - /// - [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. /// @@ -77,14 +63,6 @@ public DataFlowSource() public override void Validate() { base.Validate(); - if (Dataset != null) - { - Dataset.Validate(); - } - if (LinkedService != null) - { - LinkedService.Validate(); - } if (SchemaLinkedService != null) { SchemaLinkedService.Validate(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetBZip2Compression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetBZip2Compression.cs deleted file mode 100644 index 70519eaf4e8b..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetBZip2Compression.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -// 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; - - /// - /// The BZip2 compression method used on a dataset. - /// - [Newtonsoft.Json.JsonObject("BZip2")] - public partial class DatasetBZip2Compression : DatasetCompression - { - /// - /// Initializes a new instance of the DatasetBZip2Compression class. - /// - public DatasetBZip2Compression() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the DatasetBZip2Compression class. - /// - /// Unmatched properties from the - /// message are deserialized this collection - public DatasetBZip2Compression(IDictionary additionalProperties = default(IDictionary)) - : base(additionalProperties) - { - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetCompression.cs index 684c3a8a2b97..b074fe86b12d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetCompression.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetCompression.cs @@ -10,6 +10,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -31,11 +32,17 @@ public DatasetCompression() /// /// Initializes a new instance of the DatasetCompression class. /// + /// Type of dataset compression. Type: string (or + /// Expression with resultType string). /// Unmatched properties from the /// message are deserialized this collection - public DatasetCompression(IDictionary additionalProperties = default(IDictionary)) + /// The dataset compression level. Type: string (or + /// Expression with resultType string). + public DatasetCompression(object type, IDictionary additionalProperties = default(IDictionary), object level = default(object)) { AdditionalProperties = additionalProperties; + Type = type; + Level = level; CustomInit(); } @@ -51,5 +58,32 @@ public DatasetCompression() [JsonExtensionData] public IDictionary AdditionalProperties { get; set; } + /// + /// Gets or sets type of dataset compression. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "type")] + public object Type { get; set; } + + /// + /// Gets or sets the dataset compression level. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "level")] + public object Level { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Type == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Type"); + } + } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetDeflateCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetDeflateCompression.cs deleted file mode 100644 index 69232c3caf14..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetDeflateCompression.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -// 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; - - /// - /// The Deflate compression method used on a dataset. - /// - [Newtonsoft.Json.JsonObject("Deflate")] - public partial class DatasetDeflateCompression : DatasetCompression - { - /// - /// Initializes a new instance of the DatasetDeflateCompression class. - /// - public DatasetDeflateCompression() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the DatasetDeflateCompression class. - /// - /// Unmatched properties from the - /// message are deserialized this collection - /// The Deflate compression level. - public DatasetDeflateCompression(IDictionary additionalProperties = default(IDictionary), object level = default(object)) - : base(additionalProperties) - { - Level = level; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets the Deflate compression level. - /// - [JsonProperty(PropertyName = "level")] - public object Level { get; set; } - - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetGZipCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetGZipCompression.cs deleted file mode 100644 index cdc058594604..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetGZipCompression.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -// 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; - - /// - /// The GZip compression method used on a dataset. - /// - [Newtonsoft.Json.JsonObject("GZip")] - public partial class DatasetGZipCompression : DatasetCompression - { - /// - /// Initializes a new instance of the DatasetGZipCompression class. - /// - public DatasetGZipCompression() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the DatasetGZipCompression class. - /// - /// Unmatched properties from the - /// message are deserialized this collection - /// The GZip compression level. - public DatasetGZipCompression(IDictionary additionalProperties = default(IDictionary), object level = default(object)) - : base(additionalProperties) - { - Level = level; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets the GZip compression level. - /// - [JsonProperty(PropertyName = "level")] - public object Level { get; set; } - - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarCompression.cs deleted file mode 100644 index 4b1fac814a0f..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarCompression.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -// 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; - - /// - /// The Tar archive method used on a dataset. - /// - [Newtonsoft.Json.JsonObject("Tar")] - public partial class DatasetTarCompression : DatasetCompression - { - /// - /// Initializes a new instance of the DatasetTarCompression class. - /// - public DatasetTarCompression() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the DatasetTarCompression class. - /// - /// Unmatched properties from the - /// message are deserialized this collection - public DatasetTarCompression(IDictionary additionalProperties = default(IDictionary)) - : base(additionalProperties) - { - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarGZipCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarGZipCompression.cs deleted file mode 100644 index e8fa46e3cd99..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarGZipCompression.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -// 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; - - /// - /// The TarGZip compression method used on a dataset. - /// - [Newtonsoft.Json.JsonObject("TarGZip")] - public partial class DatasetTarGZipCompression : DatasetCompression - { - /// - /// Initializes a new instance of the DatasetTarGZipCompression class. - /// - public DatasetTarGZipCompression() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the DatasetTarGZipCompression class. - /// - /// Unmatched properties from the - /// message are deserialized this collection - /// The TarGZip compression level. - public DatasetTarGZipCompression(IDictionary additionalProperties = default(IDictionary), object level = default(object)) - : base(additionalProperties) - { - Level = level; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets the TarGZip compression level. - /// - [JsonProperty(PropertyName = "level")] - public object Level { get; set; } - - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetZipDeflateCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetZipDeflateCompression.cs deleted file mode 100644 index 84892246fb67..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetZipDeflateCompression.cs +++ /dev/null @@ -1,59 +0,0 @@ -// -// 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; - - /// - /// The ZipDeflate compression method used on a dataset. - /// - [Newtonsoft.Json.JsonObject("ZipDeflate")] - public partial class DatasetZipDeflateCompression : DatasetCompression - { - /// - /// Initializes a new instance of the DatasetZipDeflateCompression - /// class. - /// - public DatasetZipDeflateCompression() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the DatasetZipDeflateCompression - /// class. - /// - /// Unmatched properties from the - /// message are deserialized this collection - /// The ZipDeflate compression level. - public DatasetZipDeflateCompression(IDictionary additionalProperties = default(IDictionary), object level = default(object)) - : base(additionalProperties) - { - Level = level; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets the ZipDeflate compression level. - /// - [JsonProperty(PropertyName = "level")] - public object Level { get; set; } - - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelDataset.cs index 694dba9ab678..def09cafb570 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelDataset.cs @@ -147,6 +147,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Location"); } + if (Compression != null) + { + Compression.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileShareDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileShareDataset.cs index f421c0179093..4092839f59cf 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileShareDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileShareDataset.cs @@ -142,6 +142,10 @@ public FileShareDataset() public override void Validate() { base.Validate(); + if (Compression != null) + { + Compression.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HttpDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HttpDataset.cs index b28fce9a0d0a..52fe8c10b74b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HttpDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HttpDataset.cs @@ -136,6 +136,10 @@ public HttpDataset() public override void Validate() { base.Validate(); + if (Compression != null) + { + Compression.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JsonDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JsonDataset.cs index 7f654d6c41f5..70ac15dc9f38 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JsonDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JsonDataset.cs @@ -111,6 +111,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Location"); } + if (Compression != null) + { + Compression.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs index 27de41df387e..849907231ece 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs @@ -31,14 +31,14 @@ public PowerQuerySink() /// /// Transformation name. /// Transformation description. - /// Flowlet Reference /// Dataset reference. /// Linked service reference. + /// Flowlet Reference /// Schema linked service /// reference. /// sink script. - public PowerQuerySink(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) - : base(name, description, flowlet, dataset, linkedService, schemaLinkedService) + public PowerQuerySink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), DataFlowReference flowlet = default(DataFlowReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) + : base(name, description, dataset, linkedService, flowlet, schemaLinkedService) { Script = script; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySource.cs index 4dbe1612c490..861e276246b2 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySource.cs @@ -31,14 +31,14 @@ public PowerQuerySource() /// /// Transformation name. /// Transformation description. - /// Flowlet Reference /// Dataset reference. /// Linked service reference. + /// Flowlet Reference /// Schema linked service /// reference. /// source script. - public PowerQuerySource(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) - : base(name, description, flowlet, dataset, linkedService, schemaLinkedService) + public PowerQuerySource(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), DataFlowReference flowlet = default(DataFlowReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) + : base(name, description, dataset, linkedService, flowlet, schemaLinkedService) { Script = script; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Transformation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Transformation.cs index 14b35526747d..e5f68a51a657 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Transformation.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Transformation.cs @@ -32,11 +32,15 @@ public Transformation() /// /// Transformation name. /// Transformation description. + /// Dataset reference. + /// Linked service reference. /// Flowlet Reference - public Transformation(string name, string description = default(string), DataFlowReference flowlet = default(DataFlowReference)) + public Transformation(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), DataFlowReference flowlet = default(DataFlowReference)) { Name = name; Description = description; + Dataset = dataset; + LinkedService = linkedService; Flowlet = flowlet; CustomInit(); } @@ -58,6 +62,18 @@ public Transformation() [JsonProperty(PropertyName = "description")] public string Description { get; set; } + /// + /// Gets or sets dataset reference. + /// + [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 flowlet Reference /// @@ -76,6 +92,14 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Name"); } + if (Dataset != null) + { + Dataset.Validate(); + } + if (LinkedService != null) + { + LinkedService.Validate(); + } if (Flowlet != null) { Flowlet.Validate(); 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 index 81ec8e31953d..e631ec0d8da0 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlDataset.cs @@ -121,6 +121,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Location"); } + if (Compression != null) + { + Compression.Validate(); + } } } } 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 dd493916430b..a285c1b3d814 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,13 @@ 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.27.0 + 4.28.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 a970139ba122..2cb08cf4d7f8 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.27.0.0")] -[assembly: AssemblyFileVersion("4.27.0.0")] +[assembly: AssemblyVersion("4.28.0.0")] +[assembly: AssemblyFileVersion("4.28.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] From 6bbaed456342cc7409693073d5645b4277d5f6e4 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 11 Nov 2021 15:01:16 +0800 Subject: [PATCH 7/9] add more files --- .../Customizations/DatasetBZip2Compression.cs | 36 ++++++++++++++ .../DatasetDeflateCompression.cs | 49 +++++++++++++++++++ .../Customizations/DatasetGZipCompression.cs | 41 ++++++++++++++++ .../Customizations/DatasetTarCompression.cs | 36 ++++++++++++++ .../DatasetTarGZipCompression.cs | 45 +++++++++++++++++ .../DatasetZipDeflateCompression.cs | 47 ++++++++++++++++++ 6 files changed, 254 insertions(+) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetBZip2Compression.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetDeflateCompression.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetGZipCompression.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarCompression.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarGZipCompression.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetZipDeflateCompression.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetBZip2Compression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetBZip2Compression.cs new file mode 100644 index 000000000000..723a84a66f58 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetBZip2Compression.cs @@ -0,0 +1,36 @@ +using System.Collections.Generic; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + /// + /// The BZip2 compression method used on a dataset. + /// + [Newtonsoft.Json.JsonObject("BZip2")] + public partial class DatasetBZip2Compression : DatasetCompression + { + /// + /// Initializes a new instance of the DatasetBZip2Compression class. + /// + public DatasetBZip2Compression() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the DatasetBZip2Compression class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + public DatasetBZip2Compression(IDictionary additionalProperties = default(IDictionary)) + : base(additionalProperties) + { + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetDeflateCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetDeflateCompression.cs new file mode 100644 index 000000000000..1e9e763de983 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetDeflateCompression.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Newtonsoft.Json; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + /// + /// The Deflate compression method used on a dataset. + /// + [Newtonsoft.Json.JsonObject("Deflate")] + public partial class DatasetDeflateCompression : DatasetCompression + { + /// + /// Initializes a new instance of the DatasetDeflateCompression class. + /// + public DatasetDeflateCompression() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the DatasetDeflateCompression class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// The Deflate compression level. + public DatasetDeflateCompression(IDictionary additionalProperties = default(IDictionary), object level = default(object)) + : base(additionalProperties) + { + Level = level; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the Deflate compression level. + /// + [JsonProperty(PropertyName = "level")] + public object Level { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetGZipCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetGZipCompression.cs new file mode 100644 index 000000000000..102f983b8682 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetGZipCompression.cs @@ -0,0 +1,41 @@ +using System.Collections.Generic; +using Newtonsoft.Json; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + [Newtonsoft.Json.JsonObject("GZip")] + public partial class DatasetGZipCompression : DatasetCompression + { + /// + /// Initializes a new instance of the DatasetGZipCompression class. + /// + public DatasetGZipCompression() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the DatasetGZipCompression class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// The GZip compression level. + public DatasetGZipCompression(IDictionary additionalProperties = default(IDictionary), object level = default(object)) + : base(additionalProperties) + { + Level = level; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the GZip compression level. + /// + [JsonProperty(PropertyName = "level")] + public object Level { get; set; } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarCompression.cs new file mode 100644 index 000000000000..a67d2a7587f8 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarCompression.cs @@ -0,0 +1,36 @@ +using System.Collections.Generic; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + /// + /// The Tar archive method used on a dataset. + /// + [Newtonsoft.Json.JsonObject("Tar")] + public partial class DatasetTarCompression : DatasetCompression + { + /// + /// Initializes a new instance of the DatasetTarCompression class. + /// + public DatasetTarCompression() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the DatasetTarCompression class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + public DatasetTarCompression(IDictionary additionalProperties = default(IDictionary)) + : base(additionalProperties) + { + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarGZipCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarGZipCompression.cs new file mode 100644 index 000000000000..074bb60cca9e --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarGZipCompression.cs @@ -0,0 +1,45 @@ +using System.Collections.Generic; +using Newtonsoft.Json; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + /// + /// The TarGZip compression method used on a dataset. + /// + [Newtonsoft.Json.JsonObject("TarGZip")] + public partial class DatasetTarGZipCompression : DatasetCompression + { + /// + /// Initializes a new instance of the DatasetTarGZipCompression class. + /// + public DatasetTarGZipCompression() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the DatasetTarGZipCompression class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// The TarGZip compression level. + public DatasetTarGZipCompression(IDictionary additionalProperties = default(IDictionary), object level = default(object)) + : base(additionalProperties) + { + Level = level; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the TarGZip compression level. + /// + [JsonProperty(PropertyName = "level")] + public object Level { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetZipDeflateCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetZipDeflateCompression.cs new file mode 100644 index 000000000000..988d7304b57e --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetZipDeflateCompression.cs @@ -0,0 +1,47 @@ +using System.Collections.Generic; +using Newtonsoft.Json; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + /// + /// The ZipDeflate compression method used on a dataset. + /// + [Newtonsoft.Json.JsonObject("ZipDeflate")] + public partial class DatasetZipDeflateCompression : DatasetCompression + { + /// + /// Initializes a new instance of the DatasetZipDeflateCompression + /// class. + /// + public DatasetZipDeflateCompression() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the DatasetZipDeflateCompression + /// class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// The ZipDeflate compression level. + public DatasetZipDeflateCompression(IDictionary additionalProperties = default(IDictionary), object level = default(object)) + : base(additionalProperties) + { + Level = level; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the ZipDeflate compression level. + /// + [JsonProperty(PropertyName = "level")] + public object Level { get; set; } + + } +} From b27b6b0696ea69c679f08dfb0d9363822565ad43 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 1 Dec 2021 09:37:55 +0800 Subject: [PATCH 8/9] [DataFactory]Added new features into 4.29.0 --- .../datafactory_resource-manager.txt | 4 ++-- .../src/CHANGELOG.md | 7 +++++++ .../src/Generated/Models/DataFlowReference.cs | 10 +++++++++- .../src/Generated/Models/Flowlet.cs | 18 +----------------- .../src/Generated/Models/FtpReadSettings.cs | 14 +++++++++++++- .../src/Generated/Models/PipelineRun.cs | 6 ++++-- .../src/Generated/Models/SftpReadSettings.cs | 14 +++++++++++++- ...crosoft.Azure.Management.DataFactory.csproj | 8 +++++--- .../src/Properties/AssemblyInfo.cs | 4 ++-- .../tests/JsonSamples/PipelineJsonSamples.cs | 3 ++- 10 files changed, 58 insertions(+), 30 deletions(-) diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 33bd1aca4b18..c1f24902ea81 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -5,11 +5,11 @@ Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk Autorest CSharp Version: 2.3.82 -2021-11-11 01:15:27 UTC +2021-12-01 01:22:36 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 7fab18ac68c0720823cb5cd8f52faed16014f244 +Commit: 624997837bdf457954eafbc8c9e7479541029478 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 b9a94ab6d86f..7accf3a30593 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 4.29.0 +### Feature Additions +- Removed unnecessary additional properties for data flow flowlet for bug fix +- Added optional property disableChunking in FTP and SFTP read settings +- Added parameters for dataflow activity +- Added possible values to pipeline run status description + ## Version 4.28.0 ### Feature Additions - Supported Dataset and LinkedService for Rest call transform diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowReference.cs index da9861bce286..c46e78927edd 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowReference.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowReference.cs @@ -37,11 +37,13 @@ public DataFlowReference() /// message are deserialized this collection /// Reference data flow parameters from /// dataset. - public DataFlowReference(string referenceName, IDictionary additionalProperties = default(IDictionary), object datasetParameters = default(object)) + /// Data flow parameters + public DataFlowReference(string referenceName, IDictionary additionalProperties = default(IDictionary), object datasetParameters = default(object), IDictionary parameters = default(IDictionary)) { AdditionalProperties = additionalProperties; ReferenceName = referenceName; DatasetParameters = datasetParameters; + Parameters = parameters; CustomInit(); } /// @@ -76,6 +78,12 @@ static DataFlowReference() [JsonProperty(PropertyName = "datasetParameters")] public object DatasetParameters { get; set; } + /// + /// Gets or sets data flow parameters + /// + [JsonProperty(PropertyName = "parameters")] + public IDictionary Parameters { get; set; } + /// /// Data flow reference type. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Flowlet.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Flowlet.cs index a21237d14fae..3d72ef4e17f1 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Flowlet.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Flowlet.cs @@ -39,24 +39,20 @@ public Flowlet() /// describing the data flow. /// The folder that this data flow is in. If not /// specified, Data flow will appear at the root level. - /// Unmatched properties from the - /// message are deserialized this collection /// List of sources in Flowlet. /// List of sinks in Flowlet. /// List of transformations in /// Flowlet. /// Flowlet script. /// Flowlet script lines. - public Flowlet(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IDictionary additionalProperties = default(IDictionary), IList sources = default(IList), IList sinks = default(IList), IList transformations = default(IList), string script = default(string), IList scriptLines = default(IList), object additionalProperties1 = default(object)) + public Flowlet(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IList sources = default(IList), IList sinks = default(IList), IList transformations = default(IList), string script = default(string), IList scriptLines = default(IList)) : base(description, annotations, folder) { - AdditionalProperties = additionalProperties; Sources = sources; Sinks = sinks; Transformations = transformations; Script = script; ScriptLines = scriptLines; - AdditionalProperties1 = additionalProperties1; CustomInit(); } @@ -65,13 +61,6 @@ public Flowlet() /// partial void CustomInit(); - /// - /// Gets or sets unmatched properties from the message are deserialized - /// this collection - /// - [JsonExtensionData] - public IDictionary AdditionalProperties { get; set; } - /// /// Gets or sets list of sources in Flowlet. /// @@ -102,10 +91,5 @@ public Flowlet() [JsonProperty(PropertyName = "typeProperties.scriptLines")] public IList ScriptLines { get; set; } - /// - /// - [JsonProperty(PropertyName = "typeProperties.additionalProperties")] - public object AdditionalProperties1 { get; set; } - } } 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 3a53f03d86bb..968760377d1e 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 @@ -61,7 +61,10 @@ public FtpReadSettings() /// string). /// Specify whether to use binary /// transfer mode for FTP stores. - public FtpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object disableMetricsCollection = 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?)) + /// If true, disable parallel reading + /// within each file. Default is false. Type: boolean (or Expression + /// with resultType boolean). + public FtpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object disableMetricsCollection = 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?), object disableChunking = default(object)) : base(additionalProperties, maxConcurrentConnections, disableMetricsCollection) { Recursive = recursive; @@ -72,6 +75,7 @@ public FtpReadSettings() DeleteFilesAfterCompletion = deleteFilesAfterCompletion; FileListPath = fileListPath; UseBinaryTransfer = useBinaryTransfer; + DisableChunking = disableChunking; CustomInit(); } @@ -138,5 +142,13 @@ public FtpReadSettings() [JsonProperty(PropertyName = "useBinaryTransfer")] public bool? UseBinaryTransfer { get; set; } + /// + /// Gets or sets if true, disable parallel reading within each file. + /// Default is false. Type: boolean (or Expression with resultType + /// boolean). + /// + [JsonProperty(PropertyName = "disableChunking")] + public object DisableChunking { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRun.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRun.cs index f1d431a01efa..4a1eaa4c8bde 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRun.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRun.cs @@ -52,7 +52,8 @@ public PipelineRun() /// The end time of a pipeline run in ISO8601 /// format. /// The duration of a pipeline run. - /// The status of a pipeline run. + /// The status of a pipeline run. Possible values: + /// Queued, InProgress, Succeeded, Failed, Canceling, Cancelled /// The message from a pipeline run. public PipelineRun(IDictionary additionalProperties = default(IDictionary), string runId = default(string), string runGroupId = default(string), bool? isLatest = default(bool?), string pipelineName = default(string), IDictionary parameters = default(IDictionary), IDictionary runDimensions = default(IDictionary), PipelineRunInvokedBy invokedBy = default(PipelineRunInvokedBy), System.DateTime? lastUpdated = default(System.DateTime?), System.DateTime? runStart = default(System.DateTime?), System.DateTime? runEnd = default(System.DateTime?), int? durationInMs = default(int?), string status = default(string), string message = default(string)) { @@ -156,7 +157,8 @@ public PipelineRun() public int? DurationInMs { get; private set; } /// - /// Gets the status of a pipeline run. + /// Gets the status of a pipeline run. Possible values: Queued, + /// InProgress, Succeeded, Failed, Canceling, Cancelled /// [JsonProperty(PropertyName = "status")] public string Status { get; private set; } 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 ef26ea2cd27c..a677c1cc0da9 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 @@ -65,7 +65,10 @@ public SftpReadSettings() /// 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 disableMetricsCollection = 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)) + /// If true, disable parallel reading + /// within each file. Default is false. Type: boolean (or Expression + /// with resultType boolean). + public SftpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object disableMetricsCollection = 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), object disableChunking = default(object)) : base(additionalProperties, maxConcurrentConnections, disableMetricsCollection) { Recursive = recursive; @@ -77,6 +80,7 @@ public SftpReadSettings() DeleteFilesAfterCompletion = deleteFilesAfterCompletion; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; + DisableChunking = disableChunking; CustomInit(); } @@ -150,5 +154,13 @@ public SftpReadSettings() [JsonProperty(PropertyName = "modifiedDatetimeEnd")] public object ModifiedDatetimeEnd { get; set; } + /// + /// Gets or sets if true, disable parallel reading within each file. + /// Default is false. Type: boolean (or Expression with resultType + /// boolean). + /// + [JsonProperty(PropertyName = "disableChunking")] + public object DisableChunking { get; set; } + } } 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 a285c1b3d814..b29672aadb12 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,13 +5,15 @@ 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.28.0 + 4.29.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 2cb08cf4d7f8..d95d6cb5c9d9 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.28.0.0")] -[assembly: AssemblyFileVersion("4.28.0.0")] +[assembly: AssemblyVersion("4.29.0.0")] +[assembly: AssemblyFileVersion("4.29.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] 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 6ea70750358e..408e10c307b6 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs @@ -5042,7 +5042,8 @@ public class PipelineJsonSamples : JsonSampleCollection ""recursive"": true, ""wildcardFolderPath"": ""A*"", ""wildcardFileName"": ""*.csv"", - ""useBinaryTransfer"": true + ""useBinaryTransfer"": true, + ""disableChunking"": true }, ""formatSettings"": { ""type"": ""DelimitedTextReadSettings"", From e2671e00bd661c3e4b395ffe9b75b9fb8340044f Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 9 Dec 2021 10:21:18 +0800 Subject: [PATCH 9/9] update version --- eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt | 4 ++-- .../Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md | 3 ++- .../src/Microsoft.Azure.Management.DataFactory.csproj | 2 +- .../src/Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index c1f24902ea81..620a19559122 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -5,11 +5,11 @@ Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk Autorest CSharp Version: 2.3.82 -2021-12-01 01:22:36 UTC +2021-12-09 02:19:59 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 624997837bdf457954eafbc8c9e7479541029478 +Commit: 40cb73ed0c84fa515b911af5fdf77f68b764ea74 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 7accf3a30593..d3b5d422ee80 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog for the Azure Data Factory V2 .NET SDK -## Version 4.29.0 +## Version 5.0.0 ### Feature Additions +### Breaking Changes - Removed unnecessary additional properties for data flow flowlet for bug fix - Added optional property disableChunking in FTP and SFTP read settings - Added parameters for dataflow activity 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 b29672aadb12..f0dc89dee1a6 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,7 +5,7 @@ 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.29.0 + 5.0.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 d95d6cb5c9d9..a61b4f110ab7 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.29.0.0")] -[assembly: AssemblyFileVersion("4.29.0.0")] +[assembly: AssemblyVersion("5.0.0.0")] +[assembly: AssemblyFileVersion("5.0.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")]