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/Generated/Models/DatasetBZip2Compression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetBZip2Compression.cs similarity index 70% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetBZip2Compression.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetBZip2Compression.cs index 70519eaf4e8b..723a84a66f58 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetBZip2Compression.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetBZip2Compression.cs @@ -1,20 +1,7 @@ -// -// 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. -// +using System.Collections.Generic; 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. /// 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/Generated/Models/DatasetDeflateCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetDeflateCompression.cs similarity index 75% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetDeflateCompression.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetDeflateCompression.cs index 69232c3caf14..1e9e763de983 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetDeflateCompression.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetDeflateCompression.cs @@ -1,20 +1,12 @@ -// -// 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. -// +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 { - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - /// /// The Deflate compression method used on a dataset. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetGZipCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetGZipCompression.cs similarity index 70% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetGZipCompression.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetGZipCompression.cs index cdc058594604..102f983b8682 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetGZipCompression.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetGZipCompression.cs @@ -1,23 +1,8 @@ -// -// 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. -// +using System.Collections.Generic; +using Newtonsoft.Json; 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 { @@ -52,6 +37,5 @@ public DatasetGZipCompression() /// [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/Customizations/DatasetTarCompression.cs similarity index 70% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarCompression.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarCompression.cs index 4b1fac814a0f..a67d2a7587f8 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarCompression.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarCompression.cs @@ -1,20 +1,7 @@ -// -// 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. -// +using System.Collections.Generic; 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. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarGZipCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarGZipCompression.cs similarity index 75% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarGZipCompression.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarGZipCompression.cs index e8fa46e3cd99..074bb60cca9e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetTarGZipCompression.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetTarGZipCompression.cs @@ -1,20 +1,8 @@ -// -// 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. -// +using System.Collections.Generic; +using Newtonsoft.Json; 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. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetZipDeflateCompression.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetZipDeflateCompression.cs similarity index 76% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetZipDeflateCompression.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetZipDeflateCompression.cs index 84892246fb67..988d7304b57e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DatasetZipDeflateCompression.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/DatasetZipDeflateCompression.cs @@ -1,20 +1,8 @@ -// -// 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. -// +using System.Collections.Generic; +using Newtonsoft.Json; 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. /// 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/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/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")]