From 671522a483875ac353a7543949eaa44980ae8bdc Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Sat, 1 Aug 2020 00:33:43 +0000 Subject: [PATCH 1/2] Update from master --- .../src/CHANGELOG.md | 7 --- ...kageLocation.cs => SSISPackageLocation.cs} | 0 .../SdkInfo_DataFactoryManagementClient.cs | 11 ---- ...rosoft.Azure.Management.DataFactory.csproj | 13 +++-- .../src/Properties/AssemblyInfo.cs | 4 +- .../JsonSamples/LinkedServiceJsonSamples.cs | 57 ++----------------- .../tests/JsonSamples/PipelineJsonSamples.cs | 5 +- 7 files changed, 17 insertions(+), 80 deletions(-) rename sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/{SsisPackageLocation.cs => SSISPackageLocation.cs} (100%) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 992ea8cf4dd7..8c77a27e2c2f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,12 +1,5 @@ # Changelog for the Azure Data Factory V2 .NET SDK -## Version 4.11.0 -### Feature Additions -- Added support for Trigger Run Cancel API -- Added column delimiter for SAP Table/open hub -- Added azureCloudType for Aad Auth -- Added snapshot to Azure File Storage linked service - ## Version 4.10.0 ### Feature Additions - Added connectionProperties property to QuickBooks, Square, Xero, Zoho, SalesforceMarketingCloud linked service diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs similarity index 100% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs index c15c9ea7d5b4..b31348b3961b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs @@ -37,16 +37,5 @@ public static IEnumerable> ApiInfo_DataFactoryMana }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Projects\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "b8630cc7b5869fbb764eeca3a618b23141e612db"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } - diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index 39c9bf30f468..cc74fa17f876 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,15 +5,18 @@ 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.11.0 + 4.10.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 f45daac9c015..9556960550e4 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.11.0.0")] -[assembly: AssemblyFileVersion("4.11.0.0")] +[assembly: AssemblyVersion("4.10.0.0")] +[assembly: AssemblyFileVersion("4.10.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] 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 fc970af02d2c..2e907ad4986c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -11,27 +11,6 @@ namespace DataFactory.Tests.JsonSamples /// public class LinkedServiceJsonSamples : JsonSampleCollection { - [JsonSample] - public const string AzureBlobFSLinkedService = @" -{ - name: ""Test-Windows-Azure-storage-account-linkedService"", - properties: - { - type: ""AzureBlobFS"", - typeProperties: - { - url: ""https://testblobfs.dfs.core.windows.net"", - servicePrincipalId: ""9c8b1ab1-a894-4639-8fb9-75f98a36e9ab"", - servicePrincipalKey: { - type: ""SecureString"", - value: ""mykey"" - }, - tenant: ""72f988bf-86f1-41af-91ab-2d7cd011db47"", - azureCloudType: ""AzurePublic"" - } - } -}"; - [JsonSample] public const string AzureStorageLinkedService = @" { @@ -154,10 +133,9 @@ public class LinkedServiceJsonSamples : JsonSampleCollection { type: ""SapOpenHubSource"", excludeLastRequest: false, - baseRequestId: ""123"", - customRfcReadTableFunctionModule: ""fakecustomRfcReadTableFunctionModule"", - sapDataColumnDelimiter: ""|"" + baseRequestId: ""123"" }, sink: { @@ -5589,7 +5587,6 @@ public class PipelineJsonSamples : JsonSampleCollection { type: ""SapTableSource"", rowCount: 3, - sapDataColumnDelimiter: ""|"", partitionOption: ""PartitionOnCalendarDate"", partitionSettings: { From 038f8128c221eb4f7644685733b31d4ef8ce398e Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Sat, 1 Aug 2020 00:33:49 +0000 Subject: [PATCH 2/2] Generated from b630fbb8f3473ceced4556404f4d987f85661be5 fix defn --- .../src/CHANGELOG.md | 7 + .../Generated/ExposureControlOperations.cs | 244 ++++++++++++++++++ .../ExposureControlOperationsExtensions.cs | 46 ++++ .../Generated/IExposureControlOperations.cs | 28 ++ .../src/Generated/Models/DataFlowSink.cs | 15 +- .../src/Generated/Models/DataFlowSource.cs | 15 +- .../Models/ExposureControlBatchRequest.cs | 70 +++++ .../Models/ExposureControlBatchResponse.cs | 70 +++++ ...rosoft.Azure.Management.DataFactory.csproj | 13 +- .../src/Properties/AssemblyInfo.cs | 4 +- .../JsonSamples/LinkedServiceJsonSamples.cs | 57 +++- .../tests/JsonSamples/PipelineJsonSamples.cs | 5 +- 12 files changed, 555 insertions(+), 19 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExposureControlBatchRequest.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExposureControlBatchResponse.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 8c77a27e2c2f..992ea8cf4dd7 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.11.0 +### Feature Additions +- Added support for Trigger Run Cancel API +- Added column delimiter for SAP Table/open hub +- Added azureCloudType for Aad Auth +- Added snapshot to Azure File Storage linked service + ## Version 4.10.0 ### Feature Additions - Added connectionProperties property to QuickBooks, Square, Xero, Zoho, SalesforceMarketingCloud linked service diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ExposureControlOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ExposureControlOperations.cs index e31cffd39093..6dc9012af83c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ExposureControlOperations.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ExposureControlOperations.cs @@ -491,5 +491,249 @@ internal ExposureControlOperations(DataFactoryManagementClient client) return _result; } + /// + /// Get list of exposure control features for specific factory. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The exposure control request for list of features. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task> QueryFeatureValuesByFactoryWithHttpMessagesAsync(string resourceGroupName, string factoryName, ExposureControlBatchRequest exposureControlBatchRequest, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (resourceGroupName != null) + { + if (resourceGroupName.Length > 90) + { + throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90); + } + if (resourceGroupName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+$")) + { + throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+$"); + } + } + if (factoryName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "factoryName"); + } + if (factoryName != null) + { + if (factoryName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "factoryName", 63); + } + if (factoryName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "factoryName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(factoryName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "factoryName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + if (exposureControlBatchRequest == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "exposureControlBatchRequest"); + } + if (exposureControlBatchRequest != null) + { + exposureControlBatchRequest.Validate(); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("factoryName", factoryName); + tracingParameters.Add("exposureControlBatchRequest", exposureControlBatchRequest); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "QueryFeatureValuesByFactory", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/queryFeaturesValue").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{factoryName}", System.Uri.EscapeDataString(factoryName)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("POST"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + if(exposureControlBatchRequest != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(exposureControlBatchRequest, Client.SerializationSettings); + _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); + } + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex = new CloudException(_errorBody.Message); + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new AzureOperationResponse(); + _result.Request = _httpRequest; + _result.Response = _httpResponse; + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + // Deserialize Response + if ((int)_statusCode == 200) + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + try + { + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + } + catch (JsonException ex) + { + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); + } + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ExposureControlOperationsExtensions.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ExposureControlOperationsExtensions.cs index 94a171727890..f3e665981016 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ExposureControlOperationsExtensions.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ExposureControlOperationsExtensions.cs @@ -107,5 +107,51 @@ public static ExposureControlResponse GetFeatureValueByFactory(this IExposureCon } } + /// + /// Get list of exposure control features for specific factory. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The exposure control request for list of features. + /// + public static ExposureControlBatchResponse QueryFeatureValuesByFactory(this IExposureControlOperations operations, string resourceGroupName, string factoryName, ExposureControlBatchRequest exposureControlBatchRequest) + { + return operations.QueryFeatureValuesByFactoryAsync(resourceGroupName, factoryName, exposureControlBatchRequest).GetAwaiter().GetResult(); + } + + /// + /// Get list of exposure control features for specific factory. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The exposure control request for list of features. + /// + /// + /// The cancellation token. + /// + public static async Task QueryFeatureValuesByFactoryAsync(this IExposureControlOperations operations, string resourceGroupName, string factoryName, ExposureControlBatchRequest exposureControlBatchRequest, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.QueryFeatureValuesByFactoryWithHttpMessagesAsync(resourceGroupName, factoryName, exposureControlBatchRequest, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IExposureControlOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IExposureControlOperations.cs index 8683404514fb..0239ca2e3ef5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IExposureControlOperations.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IExposureControlOperations.cs @@ -76,5 +76,33 @@ public partial interface IExposureControlOperations /// Thrown when a required parameter is null /// Task> GetFeatureValueByFactoryWithHttpMessagesAsync(string resourceGroupName, string factoryName, ExposureControlRequest exposureControlRequest, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Get list of exposure control features for specific factory. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The exposure control request for list of features. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task> QueryFeatureValuesByFactoryWithHttpMessagesAsync(string resourceGroupName, string factoryName, ExposureControlBatchRequest exposureControlBatchRequest, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } 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..5e73cd8cb403 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 @@ -35,12 +35,15 @@ public DataFlowSink() /// 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)) + /// Staging info for execute data flow + /// activity. + public DataFlowSink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), DataFlowStagingInfo staging = default(DataFlowStagingInfo)) : base(name, description) { Dataset = dataset; LinkedService = linkedService; SchemaLinkedService = schemaLinkedService; + Staging = staging; CustomInit(); } @@ -67,6 +70,12 @@ public DataFlowSink() [JsonProperty(PropertyName = "schemaLinkedService")] public LinkedServiceReference SchemaLinkedService { get; set; } + /// + /// Gets or sets staging info for execute data flow activity. + /// + [JsonProperty(PropertyName = "staging")] + public DataFlowStagingInfo Staging { get; set; } + /// /// Validate the object. /// @@ -88,6 +97,10 @@ public override void Validate() { SchemaLinkedService.Validate(); } + if (Staging != null) + { + Staging.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 838e69cc4a25..cd976967cba1 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 @@ -35,12 +35,15 @@ public DataFlowSource() /// 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)) + /// Staging info for execute data flow + /// activity. + public DataFlowSource(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), DataFlowStagingInfo staging = default(DataFlowStagingInfo)) : base(name, description) { Dataset = dataset; LinkedService = linkedService; SchemaLinkedService = schemaLinkedService; + Staging = staging; CustomInit(); } @@ -67,6 +70,12 @@ public DataFlowSource() [JsonProperty(PropertyName = "schemaLinkedService")] public LinkedServiceReference SchemaLinkedService { get; set; } + /// + /// Gets or sets staging info for execute data flow activity. + /// + [JsonProperty(PropertyName = "staging")] + public DataFlowStagingInfo Staging { get; set; } + /// /// Validate the object. /// @@ -88,6 +97,10 @@ public override void Validate() { SchemaLinkedService.Validate(); } + if (Staging != null) + { + Staging.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExposureControlBatchRequest.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExposureControlBatchRequest.cs new file mode 100644 index 000000000000..4dd400968152 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExposureControlBatchRequest.cs @@ -0,0 +1,70 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// A list of exposure control features. + /// + public partial class ExposureControlBatchRequest + { + /// + /// Initializes a new instance of the ExposureControlBatchRequest + /// class. + /// + public ExposureControlBatchRequest() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ExposureControlBatchRequest + /// class. + /// + /// List of exposure control + /// features. + public ExposureControlBatchRequest(IList exposureControlRequests) + { + ExposureControlRequests = exposureControlRequests; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets list of exposure control features. + /// + [JsonProperty(PropertyName = "exposureControlRequests")] + public IList ExposureControlRequests { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (ExposureControlRequests == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ExposureControlRequests"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExposureControlBatchResponse.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExposureControlBatchResponse.cs new file mode 100644 index 000000000000..d17463940903 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExposureControlBatchResponse.cs @@ -0,0 +1,70 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// A list of exposure control feature values. + /// + public partial class ExposureControlBatchResponse + { + /// + /// Initializes a new instance of the ExposureControlBatchResponse + /// class. + /// + public ExposureControlBatchResponse() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ExposureControlBatchResponse + /// class. + /// + /// List of exposure control + /// feature values. + public ExposureControlBatchResponse(IList exposureControlResponses) + { + ExposureControlResponses = exposureControlResponses; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets list of exposure control feature values. + /// + [JsonProperty(PropertyName = "exposureControlResponses")] + public IList ExposureControlResponses { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (ExposureControlResponses == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ExposureControlResponses"); + } + } + } +} 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 cc74fa17f876..39c9bf30f468 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,18 +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.10.0 + 4.11.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 9556960550e4..f45daac9c015 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.10.0.0")] -[assembly: AssemblyFileVersion("4.10.0.0")] +[assembly: AssemblyVersion("4.11.0.0")] +[assembly: AssemblyFileVersion("4.11.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] 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 2e907ad4986c..fc970af02d2c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -11,6 +11,27 @@ namespace DataFactory.Tests.JsonSamples /// public class LinkedServiceJsonSamples : JsonSampleCollection { + [JsonSample] + public const string AzureBlobFSLinkedService = @" +{ + name: ""Test-Windows-Azure-storage-account-linkedService"", + properties: + { + type: ""AzureBlobFS"", + typeProperties: + { + url: ""https://testblobfs.dfs.core.windows.net"", + servicePrincipalId: ""9c8b1ab1-a894-4639-8fb9-75f98a36e9ab"", + servicePrincipalKey: { + type: ""SecureString"", + value: ""mykey"" + }, + tenant: ""72f988bf-86f1-41af-91ab-2d7cd011db47"", + azureCloudType: ""AzurePublic"" + } + } +}"; + [JsonSample] public const string AzureStorageLinkedService = @" { @@ -133,9 +154,10 @@ public class LinkedServiceJsonSamples : JsonSampleCollection { type: ""SapOpenHubSource"", excludeLastRequest: false, - baseRequestId: ""123"" + baseRequestId: ""123"", + customRfcReadTableFunctionModule: ""fakecustomRfcReadTableFunctionModule"", + sapDataColumnDelimiter: ""|"" }, sink: { @@ -5587,6 +5589,7 @@ public class PipelineJsonSamples : JsonSampleCollection { type: ""SapTableSource"", rowCount: 3, + sapDataColumnDelimiter: ""|"", partitionOption: ""PartitionOnCalendarDate"", partitionSettings: {