diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/DataFactoryManagementClient.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/DataFactoryManagementClient.cs index 977baa71c332..051dbd90efd8 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/DataFactoryManagementClient.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/DataFactoryManagementClient.cs @@ -85,11 +85,21 @@ public partial class DataFactoryManagementClient : ServiceClient public virtual IFactoriesOperations Factories { get; private set; } + /// + /// Gets the IExposureControlOperations. + /// + public virtual IExposureControlOperations ExposureControl { get; private set; } + /// /// Gets the IIntegrationRuntimesOperations. /// public virtual IIntegrationRuntimesOperations IntegrationRuntimes { get; private set; } + /// + /// Gets the IIntegrationRuntimeObjectMetadataOperations. + /// + public virtual IIntegrationRuntimeObjectMetadataOperations IntegrationRuntimeObjectMetadata { get; private set; } + /// /// Gets the IIntegrationRuntimeNodesOperations. /// @@ -378,7 +388,9 @@ private void Initialize() { Operations = new Operations(this); Factories = new FactoriesOperations(this); + ExposureControl = new ExposureControlOperations(this); IntegrationRuntimes = new IntegrationRuntimesOperations(this); + IntegrationRuntimeObjectMetadata = new IntegrationRuntimeObjectMetadataOperations(this); IntegrationRuntimeNodes = new IntegrationRuntimeNodesOperations(this); LinkedServices = new LinkedServicesOperations(this); Datasets = new DatasetsOperations(this); @@ -451,6 +463,8 @@ private void Initialize() DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("authorizationType")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("authorizationType")); + SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); + DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); CustomInitialize(); DeserializationSettings.Converters.Add(new TransformationJsonConverter()); DeserializationSettings.Converters.Add(new CloudErrorJsonConverter()); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/ExposureControlOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/ExposureControlOperations.cs new file mode 100644 index 000000000000..48b3ba06a1fd --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/ExposureControlOperations.cs @@ -0,0 +1,255 @@ +// +// 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 +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + using System.Net; + using System.Net.Http; + using System.Threading; + using System.Threading.Tasks; + + /// + /// ExposureControlOperations operations. + /// + internal partial class ExposureControlOperations : IServiceOperations, IExposureControlOperations + { + /// + /// Initializes a new instance of the ExposureControlOperations class. + /// + /// + /// Reference to the service client. + /// + /// + /// Thrown when a required parameter is null + /// + internal ExposureControlOperations(DataFactoryManagementClient client) + { + if (client == null) + { + throw new System.ArgumentNullException("client"); + } + Client = client; + } + + /// + /// Gets a reference to the DataFactoryManagementClient + /// + public DataFactoryManagementClient Client { get; private set; } + + /// + /// Get exposure control feature for specific location. + /// + /// + /// The location identifier. + /// + /// + /// The exposure control request. + /// + /// + /// 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> GetFeatureValueWithHttpMessagesAsync(string locationId, ExposureControlRequest exposureControlRequest, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (locationId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "locationId"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + if (exposureControlRequest == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "exposureControlRequest"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("locationId", locationId); + tracingParameters.Add("exposureControlRequest", exposureControlRequest); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "GetFeatureValue", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/locations/{locationId}/getFeatureValue").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{locationId}", System.Uri.EscapeDataString(locationId)); + 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(exposureControlRequest != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(exposureControlRequest, 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/src/SDKs/DataFactory/Management.DataFactory/Generated/ExposureControlOperationsExtensions.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/ExposureControlOperationsExtensions.cs new file mode 100644 index 000000000000..bd04e0d7b126 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/ExposureControlOperationsExtensions.cs @@ -0,0 +1,65 @@ +// +// 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 +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using System.Threading; + using System.Threading.Tasks; + + /// + /// Extension methods for ExposureControlOperations. + /// + public static partial class ExposureControlOperationsExtensions + { + /// + /// Get exposure control feature for specific location. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The location identifier. + /// + /// + /// The exposure control request. + /// + public static ExposureControlResponse GetFeatureValue(this IExposureControlOperations operations, string locationId, ExposureControlRequest exposureControlRequest) + { + return operations.GetFeatureValueAsync(locationId, exposureControlRequest).GetAwaiter().GetResult(); + } + + /// + /// Get exposure control feature for specific location. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The location identifier. + /// + /// + /// The exposure control request. + /// + /// + /// The cancellation token. + /// + public static async Task GetFeatureValueAsync(this IExposureControlOperations operations, string locationId, ExposureControlRequest exposureControlRequest, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.GetFeatureValueWithHttpMessagesAsync(locationId, exposureControlRequest, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperations.cs index 08776adef255..fa4c1581461a 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperations.cs @@ -1821,6 +1821,246 @@ internal FactoriesOperations(DataFactoryManagementClient client) return _result; } + /// + /// Get Data Plane access. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// Data Plane user access policy definition. + /// + /// + /// 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> GetDataPlaneAccessWithHttpMessagesAsync(string resourceGroupName, string factoryName, UserAccessPolicy policy, 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 (policy == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "policy"); + } + // 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("policy", policy); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "GetDataPlaneAccess", 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}/getDataPlaneAccess").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(policy != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(policy, 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; + } + /// /// Lists factories under the specified subscription. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperationsExtensions.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperationsExtensions.cs index 0967d0f44dce..9d3ff1f5620a 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperationsExtensions.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperationsExtensions.cs @@ -356,6 +356,52 @@ public static GitHubAccessTokenResponse GetGitHubAccessToken(this IFactoriesOper } } + /// + /// Get Data Plane access. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// Data Plane user access policy definition. + /// + public static AccessPolicyResponse GetDataPlaneAccess(this IFactoriesOperations operations, string resourceGroupName, string factoryName, UserAccessPolicy policy) + { + return operations.GetDataPlaneAccessAsync(resourceGroupName, factoryName, policy).GetAwaiter().GetResult(); + } + + /// + /// Get Data Plane access. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// Data Plane user access policy definition. + /// + /// + /// The cancellation token. + /// + public static async Task GetDataPlaneAccessAsync(this IFactoriesOperations operations, string resourceGroupName, string factoryName, UserAccessPolicy policy, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.GetDataPlaneAccessWithHttpMessagesAsync(resourceGroupName, factoryName, policy, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Lists factories under the specified subscription. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IDataFactoryManagementClient.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IDataFactoryManagementClient.cs index 7368b0189396..0c07f2211748 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IDataFactoryManagementClient.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IDataFactoryManagementClient.cs @@ -80,11 +80,21 @@ public partial interface IDataFactoryManagementClient : System.IDisposable /// IFactoriesOperations Factories { get; } + /// + /// Gets the IExposureControlOperations. + /// + IExposureControlOperations ExposureControl { get; } + /// /// Gets the IIntegrationRuntimesOperations. /// IIntegrationRuntimesOperations IntegrationRuntimes { get; } + /// + /// Gets the IIntegrationRuntimeObjectMetadataOperations. + /// + IIntegrationRuntimeObjectMetadataOperations IntegrationRuntimeObjectMetadata { get; } + /// /// Gets the IIntegrationRuntimeNodesOperations. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IExposureControlOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IExposureControlOperations.cs new file mode 100644 index 000000000000..a7f3108d4122 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IExposureControlOperations.cs @@ -0,0 +1,52 @@ +// +// 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 +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using System.Collections; + using System.Collections.Generic; + using System.Threading; + using System.Threading.Tasks; + + /// + /// ExposureControlOperations operations. + /// + public partial interface IExposureControlOperations + { + /// + /// Get exposure control feature for specific location. + /// + /// + /// The location identifier. + /// + /// + /// The exposure control request. + /// + /// + /// 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> GetFeatureValueWithHttpMessagesAsync(string locationId, ExposureControlRequest exposureControlRequest, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IFactoriesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IFactoriesOperations.cs index 6d08831810c1..89d2ca1df149 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IFactoriesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IFactoriesOperations.cs @@ -231,6 +231,34 @@ public partial interface IFactoriesOperations /// Task> GetGitHubAccessTokenWithHttpMessagesAsync(string resourceGroupName, string factoryName, GitHubAccessTokenRequest gitHubAccessTokenRequest, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// + /// Get Data Plane access. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// Data Plane user access policy definition. + /// + /// + /// 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> GetDataPlaneAccessWithHttpMessagesAsync(string resourceGroupName, string factoryName, UserAccessPolicy policy, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// /// Lists factories under the specified subscription. /// /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimeObjectMetadataOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimeObjectMetadataOperations.cs new file mode 100644 index 000000000000..689a23f1b29e --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimeObjectMetadataOperations.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 +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using System.Collections; + using System.Collections.Generic; + using System.Threading; + using System.Threading.Tasks; + + /// + /// IntegrationRuntimeObjectMetadataOperations operations. + /// + public partial interface IIntegrationRuntimeObjectMetadataOperations + { + /// + /// Refresh a SSIS integration runtime object metadata. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// 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> RefreshWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Get a SSIS integration runtime object metadata by specified path. + /// The return is pageable metadata list. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The parameters for getting a SSIS object metadata. + /// + /// + /// 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> GetWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, GetSsisObjectMetadataRequest getMetadataRequest = default(GetSsisObjectMetadataRequest), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Refresh a SSIS integration runtime object metadata. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// 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> BeginRefreshWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimesOperations.cs index f1b4ffe069bd..83f48ae643bd 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimesOperations.cs @@ -404,7 +404,7 @@ public partial interface IIntegrationRuntimesOperations Task> GetMonitoringDataWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Upgrade self-hosted integration runtime to latest version if - /// availably. + /// availability. /// /// /// The resource group name. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IPipelinesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IPipelinesOperations.cs index 23d82963a866..bcef7b1bb75f 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IPipelinesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IPipelinesOperations.cs @@ -156,7 +156,7 @@ public partial interface IPipelinesOperations /// /// /// The pipeline run identifier. If run ID is specified the parameters - /// of the the specified run will be used to create a new run. + /// of the specified run will be used to create a new run. /// /// /// Parameters of the pipeline run. These parameters will be used only diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeObjectMetadataOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeObjectMetadataOperations.cs new file mode 100644 index 000000000000..64e30d55568d --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeObjectMetadataOperations.cs @@ -0,0 +1,590 @@ +// +// 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 +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + using System.Net; + using System.Net.Http; + using System.Threading; + using System.Threading.Tasks; + + /// + /// IntegrationRuntimeObjectMetadataOperations operations. + /// + internal partial class IntegrationRuntimeObjectMetadataOperations : IServiceOperations, IIntegrationRuntimeObjectMetadataOperations + { + /// + /// Initializes a new instance of the IntegrationRuntimeObjectMetadataOperations class. + /// + /// + /// Reference to the service client. + /// + /// + /// Thrown when a required parameter is null + /// + internal IntegrationRuntimeObjectMetadataOperations(DataFactoryManagementClient client) + { + if (client == null) + { + throw new System.ArgumentNullException("client"); + } + Client = client; + } + + /// + /// Gets a reference to the DataFactoryManagementClient + /// + public DataFactoryManagementClient Client { get; private set; } + + /// + /// Refresh a SSIS integration runtime object metadata. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + public async Task> RefreshWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + // Send request + AzureOperationResponse _response = await BeginRefreshWithHttpMessagesAsync(resourceGroupName, factoryName, integrationRuntimeName, customHeaders, cancellationToken).ConfigureAwait(false); + return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); + } + + /// + /// Get a SSIS integration runtime object metadata by specified path. The + /// return is pageable metadata list. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The parameters for getting a SSIS object metadata. + /// + /// + /// 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> GetWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, GetSsisObjectMetadataRequest getMetadataRequest = default(GetSsisObjectMetadataRequest), 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 (integrationRuntimeName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "integrationRuntimeName"); + } + if (integrationRuntimeName != null) + { + if (integrationRuntimeName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "integrationRuntimeName", 63); + } + if (integrationRuntimeName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "integrationRuntimeName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(integrationRuntimeName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "integrationRuntimeName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // 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("integrationRuntimeName", integrationRuntimeName); + tracingParameters.Add("getMetadataRequest", getMetadataRequest); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "Get", 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}/integrationRuntimes/{integrationRuntimeName}/getObjectMetadata").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)); + _url = _url.Replace("{integrationRuntimeName}", System.Uri.EscapeDataString(integrationRuntimeName)); + 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(getMetadataRequest != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(getMetadataRequest, 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; + } + + /// + /// Refresh a SSIS integration runtime object metadata. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// 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> BeginRefreshWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, 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 (integrationRuntimeName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "integrationRuntimeName"); + } + if (integrationRuntimeName != null) + { + if (integrationRuntimeName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "integrationRuntimeName", 63); + } + if (integrationRuntimeName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "integrationRuntimeName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(integrationRuntimeName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "integrationRuntimeName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // 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("integrationRuntimeName", integrationRuntimeName); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "BeginRefresh", 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}/integrationRuntimes/{integrationRuntimeName}/refreshObjectMetadata").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)); + _url = _url.Replace("{integrationRuntimeName}", System.Uri.EscapeDataString(integrationRuntimeName)); + 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; + // 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 && (int)_statusCode != 202) + { + 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/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeObjectMetadataOperationsExtensions.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeObjectMetadataOperationsExtensions.cs new file mode 100644 index 000000000000..6f06be573469 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeObjectMetadataOperationsExtensions.cs @@ -0,0 +1,171 @@ +// +// 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 +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using System.Threading; + using System.Threading.Tasks; + + /// + /// Extension methods for IntegrationRuntimeObjectMetadataOperations. + /// + public static partial class IntegrationRuntimeObjectMetadataOperationsExtensions + { + /// + /// Refresh a SSIS integration runtime object metadata. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + public static SsisObjectMetadataStatusResponse Refresh(this IIntegrationRuntimeObjectMetadataOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName) + { + return operations.RefreshAsync(resourceGroupName, factoryName, integrationRuntimeName).GetAwaiter().GetResult(); + } + + /// + /// Refresh a SSIS integration runtime object metadata. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The cancellation token. + /// + public static async Task RefreshAsync(this IIntegrationRuntimeObjectMetadataOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.RefreshWithHttpMessagesAsync(resourceGroupName, factoryName, integrationRuntimeName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Get a SSIS integration runtime object metadata by specified path. The + /// return is pageable metadata list. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The parameters for getting a SSIS object metadata. + /// + public static SsisObjectMetadataListResponse Get(this IIntegrationRuntimeObjectMetadataOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName, GetSsisObjectMetadataRequest getMetadataRequest = default(GetSsisObjectMetadataRequest)) + { + return operations.GetAsync(resourceGroupName, factoryName, integrationRuntimeName, getMetadataRequest).GetAwaiter().GetResult(); + } + + /// + /// Get a SSIS integration runtime object metadata by specified path. The + /// return is pageable metadata list. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The parameters for getting a SSIS object metadata. + /// + /// + /// The cancellation token. + /// + public static async Task GetAsync(this IIntegrationRuntimeObjectMetadataOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName, GetSsisObjectMetadataRequest getMetadataRequest = default(GetSsisObjectMetadataRequest), CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, factoryName, integrationRuntimeName, getMetadataRequest, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Refresh a SSIS integration runtime object metadata. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + public static SsisObjectMetadataStatusResponse BeginRefresh(this IIntegrationRuntimeObjectMetadataOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName) + { + return operations.BeginRefreshAsync(resourceGroupName, factoryName, integrationRuntimeName).GetAwaiter().GetResult(); + } + + /// + /// Refresh a SSIS integration runtime object metadata. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The cancellation token. + /// + public static async Task BeginRefreshAsync(this IIntegrationRuntimeObjectMetadataOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.BeginRefreshWithHttpMessagesAsync(resourceGroupName, factoryName, integrationRuntimeName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperations.cs index c5892df9ebb6..f43f5420807b 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperations.cs @@ -2865,7 +2865,7 @@ internal IntegrationRuntimesOperations(DataFactoryManagementClient client) } /// - /// Upgrade self-hosted integration runtime to latest version if availably. + /// Upgrade self-hosted integration runtime to latest version if availability. /// /// /// The resource group name. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperationsExtensions.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperationsExtensions.cs index 5a634f9c4d74..d202bc13d4ac 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperationsExtensions.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperationsExtensions.cs @@ -655,7 +655,7 @@ public static IntegrationRuntimeMonitoringData GetMonitoringData(this IIntegrati } /// - /// Upgrade self-hosted integration runtime to latest version if availably. + /// Upgrade self-hosted integration runtime to latest version if availability. /// /// /// The operations group for this extension method. @@ -675,7 +675,7 @@ public static void Upgrade(this IIntegrationRuntimesOperations operations, strin } /// - /// Upgrade self-hosted integration runtime to latest version if availably. + /// Upgrade self-hosted integration runtime to latest version if availability. /// /// /// The operations group for this extension method. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AccessPolicyResponse.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AccessPolicyResponse.cs new file mode 100644 index 000000000000..dd903d1dea83 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AccessPolicyResponse.cs @@ -0,0 +1,68 @@ +// +// 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; + + /// + /// Get Data Plane read only token response definition. + /// + public partial class AccessPolicyResponse + { + /// + /// Initializes a new instance of the AccessPolicyResponse class. + /// + public AccessPolicyResponse() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AccessPolicyResponse class. + /// + /// The user access policy. + /// Data Plane read only access + /// token. + /// Data Plane service base URL. + public AccessPolicyResponse(UserAccessPolicy policy = default(UserAccessPolicy), string accessToken = default(string), string dataPlaneUrl = default(string)) + { + Policy = policy; + AccessToken = accessToken; + DataPlaneUrl = dataPlaneUrl; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the user access policy. + /// + [JsonProperty(PropertyName = "policy")] + public UserAccessPolicy Policy { get; set; } + + /// + /// Gets or sets data Plane read only access token. + /// + [JsonProperty(PropertyName = "accessToken")] + public string AccessToken { get; set; } + + /// + /// Gets or sets data Plane service base URL. + /// + [JsonProperty(PropertyName = "dataPlaneUrl")] + public string DataPlaneUrl { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSLinkedService.cs index 4a290fc4ec79..cf885341048c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSLinkedService.cs @@ -38,8 +38,8 @@ public AmazonMWSLinkedService() /// The endpoint of the Amazon MWS server, (i.e. /// mws.amazonservices.com) /// The Amazon Marketplace ID you want to - /// retrieve data from. To retrive data from multiple Marketplace IDs, - /// seperate them with a comma (,). (i.e. A2EUQ1WTGCTBG2) + /// retrieve data from. To retrieve data from multiple Marketplace IDs, + /// separate them with a comma (,). (i.e. A2EUQ1WTGCTBG2) /// The Amazon seller ID. /// The access key id used to access /// data. @@ -96,7 +96,7 @@ public AmazonMWSLinkedService() /// /// Gets or sets the Amazon Marketplace ID you want to retrieve data - /// from. To retrive data from multiple Marketplace IDs, seperate them + /// from. To retrieve data from multiple Marketplace IDs, separate them /// with a comma (,). (i.e. A2EUQ1WTGCTBG2) /// [JsonProperty(PropertyName = "typeProperties.marketplaceID")] diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSObjectDataset.cs index 990a33569393..7477eee4bdd1 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Amazon Marketplace Web Service dataset. /// [Newtonsoft.Json.JsonObject("AmazonMWSObject")] + [Rest.Serialization.JsonTransformation] public partial class AmazonMWSObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public AmazonMWSObjectDataset() /// 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. - public AmazonMWSObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public AmazonMWSObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public AmazonMWSObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonS3Dataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonS3Dataset.cs index 3b224a449772..eae5f6dd3d6f 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonS3Dataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonS3Dataset.cs @@ -46,6 +46,9 @@ public AmazonS3Dataset() /// 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. @@ -60,8 +63,8 @@ public AmazonS3Dataset() /// The format of files. /// The data compression method used for the /// Amazon S3 object. - public AmazonS3Dataset(LinkedServiceReference linkedServiceName, object bucketName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object key = default(object), object prefix = default(object), object version = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), DatasetCompression compression = default(DatasetCompression)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public AmazonS3Dataset(LinkedServiceReference linkedServiceName, object bucketName, 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 key = default(object), object prefix = default(object), object version = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), DatasetCompression compression = default(DatasetCompression)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { BucketName = bucketName; Key = key; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBlobDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBlobDataset.cs index 50a9778c270a..984693944a4b 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBlobDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBlobDataset.cs @@ -43,6 +43,9 @@ public AzureBlobDataset() /// 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. @@ -57,8 +60,8 @@ public AzureBlobDataset() /// The format of the Azure Blob storage. /// The data compression method used for the /// blob storage. - public AzureBlobDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object folderPath = default(object), object tableRootLocation = default(object), object fileName = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), DatasetCompression compression = default(DatasetCompression)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public AzureBlobDataset(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 folderPath = default(object), object tableRootLocation = default(object), object fileName = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), DatasetCompression compression = default(DatasetCompression)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { FolderPath = folderPath; TableRootLocation = tableRootLocation; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBlobStorageLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBlobStorageLinkedService.cs index 797407ee6970..88b5b0dfb135 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBlobStorageLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBlobStorageLinkedService.cs @@ -47,9 +47,14 @@ public AzureBlobStorageLinkedService() /// The connection string. It is /// mutually exclusive with sasUri, serviceEndpoint property. Type: /// string, SecureString or AzureKeyVaultSecretReference. + /// The Azure key vault secret reference of + /// accountKey in connection string. /// SAS URI of the Azure Blob Storage resource. It /// is mutually exclusive with connectionString, serviceEndpoint - /// property. + /// property. Type: string, SecureString or + /// AzureKeyVaultSecretReference. + /// The Azure key vault secret reference of + /// sasToken in sas uri. /// Blob service endpoint of the Azure /// Blob Storage resource. It is mutually exclusive with /// connectionString, sasUri property. @@ -65,11 +70,13 @@ public AzureBlobStorageLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), SecretBase sasUri = default(SecretBase), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), string encryptedCredential = default(string)) + public AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), string encryptedCredential = default(string)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + AccountKey = accountKey; SasUri = sasUri; + SasToken = sasToken; ServiceEndpoint = serviceEndpoint; ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; @@ -91,12 +98,27 @@ public AzureBlobStorageLinkedService() [JsonProperty(PropertyName = "typeProperties.connectionString")] public object ConnectionString { get; set; } + /// + /// Gets or sets the Azure key vault secret reference of accountKey in + /// connection string. + /// + [JsonProperty(PropertyName = "typeProperties.accountKey")] + public AzureKeyVaultSecretReference AccountKey { get; set; } + /// /// Gets or sets SAS URI of the Azure Blob Storage resource. It is /// mutually exclusive with connectionString, serviceEndpoint property. + /// Type: string, SecureString or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.sasUri")] - public SecretBase SasUri { get; set; } + public object SasUri { get; set; } + + /// + /// Gets or sets the Azure key vault secret reference of sasToken in + /// sas uri. + /// + [JsonProperty(PropertyName = "typeProperties.sasToken")] + public AzureKeyVaultSecretReference SasToken { get; set; } /// /// Gets or sets blob service endpoint of the Azure Blob Storage @@ -146,6 +168,14 @@ public AzureBlobStorageLinkedService() public override void Validate() { base.Validate(); + if (AccountKey != null) + { + AccountKey.Validate(); + } + if (SasToken != null) + { + SasToken.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeStoreDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeStoreDataset.cs index 9aab0369f830..a9c083a5bf74 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeStoreDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeStoreDataset.cs @@ -45,6 +45,9 @@ public AzureDataLakeStoreDataset() /// 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. @@ -55,8 +58,8 @@ public AzureDataLakeStoreDataset() /// The format of the Data Lake Store. /// The data compression method used for the /// item(s) in the Azure Data Lake Store. - public AzureDataLakeStoreDataset(LinkedServiceReference linkedServiceName, object folderPath, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object fileName = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), DatasetCompression compression = default(DatasetCompression)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public AzureDataLakeStoreDataset(LinkedServiceReference linkedServiceName, object folderPath, 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 fileName = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), DatasetCompression compression = default(DatasetCompression)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { FolderPath = folderPath; FileName = fileName; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlLinkedService.cs index dbffc73a065a..f0699039b6a6 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlLinkedService.cs @@ -44,14 +44,17 @@ public AzureMySqlLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. + /// 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 AzureMySqlLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) + public AzureMySqlLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Password = password; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -68,6 +71,13 @@ public AzureMySqlLinkedService() [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 AzureKeyVaultSecretReference Password { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -89,6 +99,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); } + if (Password != null) + { + Password.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlTableDataset.cs index 79fdf2538d9c..e0f40babe577 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlTableDataset.cs @@ -43,6 +43,9 @@ public AzureMySqlTableDataset() /// 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. @@ -50,8 +53,8 @@ public AzureMySqlTableDataset() /// specified, Dataset will appear at the root level. /// The Azure MySQL database table name. Type: /// string (or Expression with resultType string). - public AzureMySqlTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object tableName = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public AzureMySqlTableDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlLinkedService.cs index 95b1b36d66ae..85cd1e120a22 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlLinkedService.cs @@ -46,14 +46,17 @@ public AzurePostgreSqlLinkedService() /// describing the Dataset. /// An ODBC connection string. Type: /// string, SecureString or AzureKeyVaultSecretReference. + /// 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 AzurePostgreSqlLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) + public AzurePostgreSqlLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Password = password; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -70,6 +73,13 @@ public AzurePostgreSqlLinkedService() [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 AzureKeyVaultSecretReference Password { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -87,6 +97,10 @@ public AzurePostgreSqlLinkedService() public override void Validate() { base.Validate(); + if (Password != null) + { + Password.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlTableDataset.cs index e89ebb6b5d78..a010188aff4c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlTableDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Azure PostgreSQL dataset. /// [Newtonsoft.Json.JsonObject("AzurePostgreSqlTable")] + [Rest.Serialization.JsonTransformation] public partial class AzurePostgreSqlTableDataset : Dataset { /// @@ -42,14 +45,20 @@ public AzurePostgreSqlTableDataset() /// 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. - public AzurePostgreSqlTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public AzurePostgreSqlTableDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -58,10 +67,17 @@ public AzurePostgreSqlTableDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSearchIndexDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSearchIndexDataset.cs index 9e0d6a2b9d44..2e139be0c3d2 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSearchIndexDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSearchIndexDataset.cs @@ -45,13 +45,16 @@ public AzureSearchIndexDataset() /// 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. - public AzureSearchIndexDataset(LinkedServiceReference linkedServiceName, object indexName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public AzureSearchIndexDataset(LinkedServiceReference linkedServiceName, object indexName, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { IndexName = indexName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWLinkedService.cs index e010b4a06a5b..481dff37c0d8 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWLinkedService.cs @@ -45,6 +45,8 @@ public AzureSqlDWLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. + /// The Azure key vault secret reference of + /// password in connection string. /// The ID of the service principal /// used to authenticate against Azure SQL Data Warehouse. Type: string /// (or Expression with resultType string). @@ -57,10 +59,11 @@ public AzureSqlDWLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureSqlDWLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + public AzureSqlDWLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Password = password; ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; @@ -81,6 +84,13 @@ public AzureSqlDWLinkedService() [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 AzureKeyVaultSecretReference Password { get; set; } + /// /// Gets or sets the ID of the service principal used to authenticate /// against Azure SQL Data Warehouse. Type: string (or Expression with @@ -125,6 +135,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); } + if (Password != null) + { + Password.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWTableDataset.cs index 1dc1ca624c19..73e4dce9142f 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWTableDataset.cs @@ -46,13 +46,16 @@ public AzureSqlDWTableDataset() /// 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. - public AzureSqlDWTableDataset(LinkedServiceReference linkedServiceName, object tableName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public AzureSqlDWTableDataset(LinkedServiceReference linkedServiceName, object tableName, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDatabaseLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDatabaseLinkedService.cs index 4d93641e51cb..8d68d4ab8940 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDatabaseLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDatabaseLinkedService.cs @@ -46,6 +46,8 @@ public AzureSqlDatabaseLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. + /// The Azure key vault secret reference of + /// password in connection string. /// The ID of the service principal /// used to authenticate against Azure SQL Database. Type: string (or /// Expression with resultType string). @@ -58,10 +60,11 @@ public AzureSqlDatabaseLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureSqlDatabaseLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + public AzureSqlDatabaseLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Password = password; ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; @@ -81,6 +84,13 @@ public AzureSqlDatabaseLinkedService() [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 AzureKeyVaultSecretReference Password { get; set; } + /// /// Gets or sets the ID of the service principal used to authenticate /// against Azure SQL Database. Type: string (or Expression with @@ -125,6 +135,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); } + if (Password != null) + { + Password.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlTableDataset.cs index c57670f63545..dffa0b4aba47 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlTableDataset.cs @@ -45,13 +45,16 @@ public AzureSqlTableDataset() /// 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. - public AzureSqlTableDataset(LinkedServiceReference linkedServiceName, object tableName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public AzureSqlTableDataset(LinkedServiceReference linkedServiceName, object tableName, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureStorageLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureStorageLinkedService.cs index dfa556967bee..4a661fb0ea6e 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureStorageLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureStorageLinkedService.cs @@ -45,17 +45,24 @@ public AzureStorageLinkedService() /// The connection string. It is /// mutually exclusive with sasUri property. Type: string, SecureString /// or AzureKeyVaultSecretReference. + /// The Azure key vault secret reference of + /// accountKey in connection string. /// SAS URI of the Azure Storage resource. It is - /// mutually exclusive with connectionString property. + /// mutually exclusive with connectionString property. Type: string, + /// SecureString or AzureKeyVaultSecretReference. + /// The Azure key vault secret reference of + /// sasToken in sas uri. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), SecretBase sasUri = default(SecretBase), string encryptedCredential = default(string)) + public AzureStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string encryptedCredential = default(string)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + AccountKey = accountKey; SasUri = sasUri; + SasToken = sasToken; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -73,12 +80,27 @@ public AzureStorageLinkedService() [JsonProperty(PropertyName = "typeProperties.connectionString")] public object ConnectionString { get; set; } + /// + /// Gets or sets the Azure key vault secret reference of accountKey in + /// connection string. + /// + [JsonProperty(PropertyName = "typeProperties.accountKey")] + public AzureKeyVaultSecretReference AccountKey { get; set; } + /// /// Gets or sets SAS URI of the Azure Storage resource. It is mutually - /// exclusive with connectionString property. + /// exclusive with connectionString property. Type: string, + /// SecureString or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.sasUri")] - public SecretBase SasUri { get; set; } + public object SasUri { get; set; } + + /// + /// Gets or sets the Azure key vault secret reference of sasToken in + /// sas uri. + /// + [JsonProperty(PropertyName = "typeProperties.sasToken")] + public AzureKeyVaultSecretReference SasToken { get; set; } /// /// Gets or sets the encrypted credential used for authentication. @@ -97,6 +119,14 @@ public AzureStorageLinkedService() public override void Validate() { base.Validate(); + if (AccountKey != null) + { + AccountKey.Validate(); + } + if (SasToken != null) + { + SasToken.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableDataset.cs index 81c293e13e1a..0cf3a16350fb 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableDataset.cs @@ -45,13 +45,16 @@ public AzureTableDataset() /// 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. - public AzureTableDataset(LinkedServiceReference linkedServiceName, object tableName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public AzureTableDataset(LinkedServiceReference linkedServiceName, object tableName, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableStorageLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableStorageLinkedService.cs index 82ef27c35eef..6602143a0b0e 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableStorageLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableStorageLinkedService.cs @@ -47,17 +47,24 @@ public AzureTableStorageLinkedService() /// The connection string. It is /// mutually exclusive with sasUri property. Type: string, SecureString /// or AzureKeyVaultSecretReference. + /// The Azure key vault secret reference of + /// accountKey in connection string. /// SAS URI of the Azure Storage resource. It is - /// mutually exclusive with connectionString property. + /// mutually exclusive with connectionString property. Type: string, + /// SecureString or AzureKeyVaultSecretReference. + /// The Azure key vault secret reference of + /// sasToken in sas uri. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureTableStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), SecretBase sasUri = default(SecretBase), string encryptedCredential = default(string)) + public AzureTableStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string encryptedCredential = default(string)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + AccountKey = accountKey; SasUri = sasUri; + SasToken = sasToken; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -75,12 +82,27 @@ public AzureTableStorageLinkedService() [JsonProperty(PropertyName = "typeProperties.connectionString")] public object ConnectionString { get; set; } + /// + /// Gets or sets the Azure key vault secret reference of accountKey in + /// connection string. + /// + [JsonProperty(PropertyName = "typeProperties.accountKey")] + public AzureKeyVaultSecretReference AccountKey { get; set; } + /// /// Gets or sets SAS URI of the Azure Storage resource. It is mutually - /// exclusive with connectionString property. + /// exclusive with connectionString property. Type: string, + /// SecureString or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.sasUri")] - public SecretBase SasUri { get; set; } + public object SasUri { get; set; } + + /// + /// Gets or sets the Azure key vault secret reference of sasToken in + /// sas uri. + /// + [JsonProperty(PropertyName = "typeProperties.sasToken")] + public AzureKeyVaultSecretReference SasToken { get; set; } /// /// Gets or sets the encrypted credential used for authentication. @@ -99,6 +121,14 @@ public AzureTableStorageLinkedService() public override void Validate() { base.Validate(); + if (AccountKey != null) + { + AccountKey.Validate(); + } + if (SasToken != null) + { + SasToken.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventsTrigger.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventsTrigger.cs index e0a38877f28a..19ddd70e4562 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventsTrigger.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventsTrigger.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// Trigger that runs everytime a Blob event occurs. + /// Trigger that runs every time a Blob event occurs. /// [Rest.Serialization.JsonTransformation] public partial class BlobEventsTrigger : MultiplePipelineTrigger diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobTrigger.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobTrigger.cs index 75ddfba7e0da..8b61bbf61e69 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobTrigger.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobTrigger.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// Trigger that runs everytime the selected Blob container changes. + /// Trigger that runs every time the selected Blob container changes. /// [Rest.Serialization.JsonTransformation] public partial class BlobTrigger : MultiplePipelineTrigger diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CassandraTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CassandraTableDataset.cs index feba6abf8906..b0be07f81f87 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CassandraTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CassandraTableDataset.cs @@ -43,6 +43,9 @@ public CassandraTableDataset() /// 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. @@ -52,8 +55,8 @@ public CassandraTableDataset() /// Type: string (or Expression with resultType string). /// The keyspace of the Cassandra database. /// Type: string (or Expression with resultType string). - public CassandraTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object tableName = default(object), object keyspace = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public CassandraTableDataset(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 tableName = default(object), object keyspace = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { TableName = tableName; Keyspace = keyspace; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurLinkedService.cs index 2915312a9307..e7b3d0ae032c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurLinkedService.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// Concur Serivce linked service. + /// Concur Service linked service. /// [Newtonsoft.Json.JsonObject("Concur")] [Rest.Serialization.JsonTransformation] diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurObjectDataset.cs index 562726884bb3..ed895d0db113 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurObjectDataset.cs @@ -10,15 +10,18 @@ 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; /// - /// Concur Serivce dataset. + /// Concur Service dataset. /// [Newtonsoft.Json.JsonObject("ConcurObject")] + [Rest.Serialization.JsonTransformation] public partial class ConcurObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public ConcurObjectDataset() /// 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. - public ConcurObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public ConcurObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public ConcurObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurSource.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurSource.cs index 939337d404d7..f5951109386b 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurSource.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurSource.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// A copy activity Concur Serivce source. + /// A copy activity Concur Service source. /// public partial class ConcurSource : CopySource { diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CopyActivity.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CopyActivity.cs index 70bbc333043c..e29ec365437b 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CopyActivity.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CopyActivity.cs @@ -46,7 +46,7 @@ public CopyActivity() /// Linked service reference. /// Activity policy. /// Copy activity translator. If not - /// specificed, tabular translator is used. + /// specified, tabular translator is used. /// Specifies whether to copy data via an /// interim staging. Default value is false. Type: boolean (or /// Expression with resultType boolean). @@ -102,7 +102,7 @@ public CopyActivity() public CopySink Sink { get; set; } /// - /// Gets or sets copy activity translator. If not specificed, tabular + /// Gets or sets copy activity translator. If not specified, tabular /// translator is used. /// [JsonProperty(PropertyName = "typeProperties.translator")] diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CosmosDbLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CosmosDbLinkedService.cs index d1189d40a9d1..cdff36a636e7 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CosmosDbLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CosmosDbLinkedService.cs @@ -44,14 +44,17 @@ public CosmosDbLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. + /// The Azure key vault secret reference of + /// accountKey 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 CosmosDbLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) + public CosmosDbLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + AccountKey = accountKey; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -68,6 +71,13 @@ public CosmosDbLinkedService() [JsonProperty(PropertyName = "typeProperties.connectionString")] public object ConnectionString { get; set; } + /// + /// Gets or sets the Azure key vault secret reference of accountKey in + /// connection string. + /// + [JsonProperty(PropertyName = "typeProperties.accountKey")] + public AzureKeyVaultSecretReference AccountKey { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -89,6 +99,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); } + if (AccountKey != null) + { + AccountKey.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseLinkedService.cs index 6e9b195925e7..9d2b9e9f4832 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseLinkedService.cs @@ -44,14 +44,17 @@ public CouchbaseLinkedService() /// describing the Dataset. /// An ODBC connection string. Type: /// string, SecureString or AzureKeyVaultSecretReference. + /// The Azure key vault secret reference of + /// credString 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 CouchbaseLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) + public CouchbaseLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference credString = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + CredString = credString; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -68,6 +71,13 @@ public CouchbaseLinkedService() [JsonProperty(PropertyName = "typeProperties.connectionString")] public object ConnectionString { get; set; } + /// + /// Gets or sets the Azure key vault secret reference of credString in + /// connection string. + /// + [JsonProperty(PropertyName = "typeProperties.credString")] + public AzureKeyVaultSecretReference CredString { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -85,6 +95,10 @@ public CouchbaseLinkedService() public override void Validate() { base.Validate(); + if (CredString != null) + { + CredString.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseTableDataset.cs index 9df94a71a90b..a5f3dcfbab8c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseTableDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Couchbase server dataset. /// [Newtonsoft.Json.JsonObject("CouchbaseTable")] + [Rest.Serialization.JsonTransformation] public partial class CouchbaseTableDataset : Dataset { /// @@ -40,14 +43,20 @@ public CouchbaseTableDataset() /// 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. - public CouchbaseTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public CouchbaseTableDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public CouchbaseTableDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CustomDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CustomDataset.cs index bdff76a41e95..197a463f3b23 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CustomDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CustomDataset.cs @@ -41,13 +41,16 @@ public CustomDataset() /// 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. - public CustomDataset(LinkedServiceReference linkedServiceName, object typeProperties, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public CustomDataset(LinkedServiceReference linkedServiceName, object typeProperties, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { TypeProperties = typeProperties; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/Dataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/Dataset.cs index 96b4a44b3145..218416aab457 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/Dataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/Dataset.cs @@ -41,16 +41,20 @@ public Dataset() /// 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. - public Dataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) + public Dataset(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)) { AdditionalProperties = additionalProperties; Description = description; Structure = structure; + Schema = schema; LinkedServiceName = linkedServiceName; Parameters = parameters; Annotations = annotations; @@ -84,6 +88,14 @@ public Dataset() [JsonProperty(PropertyName = "structure")] public object Structure { get; set; } + /// + /// Gets or sets columns that define the physical type schema of the + /// dataset. Type: array (or Expression with resultType array), + /// itemType: DatasetSchemaDataElement. + /// + [JsonProperty(PropertyName = "schema")] + public object Schema { get; set; } + /// /// Gets or sets linked service reference. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DeleteActivity.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DeleteActivity.cs new file mode 100644 index 000000000000..35be8a414b7c --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DeleteActivity.cs @@ -0,0 +1,137 @@ +// +// 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; + + /// + /// Delete activity. + /// + [Newtonsoft.Json.JsonObject("Delete")] + [Rest.Serialization.JsonTransformation] + public partial class DeleteActivity : ExecutionActivity + { + /// + /// Initializes a new instance of the DeleteActivity class. + /// + public DeleteActivity() + { + Dataset = new DatasetReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the DeleteActivity class. + /// + /// Activity name. + /// Delete activity dataset reference. + /// Unmatched properties from the + /// message are deserialized this collection + /// Activity description. + /// Activity depends on condition. + /// Activity user properties. + /// Linked service reference. + /// Activity policy. + /// If true, files or sub-folders under current + /// folder path will be deleted recursively. Default is false. Type: + /// boolean (or Expression with resultType boolean). + /// The max concurrent + /// connections to connect data source at the same time. + /// Whether to record detailed logs of + /// delete-activity execution. Default value is false. Type: boolean + /// (or Expression with resultType boolean). + /// Log storage settings customer need + /// to provide when enableLogging is true. + public DeleteActivity(string name, DatasetReference dataset, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object recursive = default(object), int? maxConcurrentConnections = default(int?), object enableLogging = default(object), LogStorageSettings logStorageSettings = default(LogStorageSettings)) + : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) + { + Recursive = recursive; + MaxConcurrentConnections = maxConcurrentConnections; + EnableLogging = enableLogging; + LogStorageSettings = logStorageSettings; + Dataset = dataset; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets if true, files or sub-folders under current folder + /// path will be deleted recursively. Default is false. Type: boolean + /// (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "typeProperties.recursive")] + public object Recursive { get; set; } + + /// + /// Gets or sets the max concurrent connections to connect data source + /// at the same time. + /// + [JsonProperty(PropertyName = "typeProperties.maxConcurrentConnections")] + public int? MaxConcurrentConnections { get; set; } + + /// + /// Gets or sets whether to record detailed logs of delete-activity + /// execution. Default value is false. Type: boolean (or Expression + /// with resultType boolean). + /// + [JsonProperty(PropertyName = "typeProperties.enableLogging")] + public object EnableLogging { get; set; } + + /// + /// Gets or sets log storage settings customer need to provide when + /// enableLogging is true. + /// + [JsonProperty(PropertyName = "typeProperties.logStorageSettings")] + public LogStorageSettings LogStorageSettings { get; set; } + + /// + /// Gets or sets delete activity dataset reference. + /// + [JsonProperty(PropertyName = "typeProperties.dataset")] + public DatasetReference Dataset { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (Dataset == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Dataset"); + } + if (MaxConcurrentConnections < 1) + { + throw new ValidationException(ValidationRules.InclusiveMinimum, "MaxConcurrentConnections", 1); + } + if (LogStorageSettings != null) + { + LogStorageSettings.Validate(); + } + if (Dataset != null) + { + Dataset.Validate(); + } + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DocumentDbCollectionDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DocumentDbCollectionDataset.cs index 02ee35917e75..b80c3d00f01c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DocumentDbCollectionDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DocumentDbCollectionDataset.cs @@ -47,13 +47,16 @@ public DocumentDbCollectionDataset() /// 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. - public DocumentDbCollectionDataset(LinkedServiceReference linkedServiceName, object collectionName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public DocumentDbCollectionDataset(LinkedServiceReference linkedServiceName, object collectionName, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { CollectionName = collectionName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillLinkedService.cs index 678086db4ea3..b0afe22e30d4 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillLinkedService.cs @@ -44,14 +44,17 @@ public DrillLinkedService() /// describing the Dataset. /// An ODBC connection string. Type: /// string, SecureString or AzureKeyVaultSecretReference. + /// 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 DrillLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) + public DrillLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference pwd = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Pwd = pwd; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -68,6 +71,13 @@ public DrillLinkedService() [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.pwd")] + public AzureKeyVaultSecretReference Pwd { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -85,6 +95,10 @@ public DrillLinkedService() public override void Validate() { base.Validate(); + if (Pwd != null) + { + Pwd.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillTableDataset.cs index 03296e5a5977..2e55a3481a0c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillTableDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Drill server dataset. /// [Newtonsoft.Json.JsonObject("DrillTable")] + [Rest.Serialization.JsonTransformation] public partial class DrillTableDataset : Dataset { /// @@ -40,14 +43,20 @@ public DrillTableDataset() /// 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. - public DrillTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public DrillTableDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public DrillTableDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DynamicsEntityDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DynamicsEntityDataset.cs index 4c308e4d619a..b9285564298d 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DynamicsEntityDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DynamicsEntityDataset.cs @@ -43,6 +43,9 @@ public DynamicsEntityDataset() /// 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. @@ -50,8 +53,8 @@ public DynamicsEntityDataset() /// specified, Dataset will appear at the root level. /// The logical name of the entity. Type: /// string (or Expression with resultType string). - public DynamicsEntityDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object entityName = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public DynamicsEntityDataset(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 entityName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { EntityName = entityName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/EloquaObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/EloquaObjectDataset.cs index ffcec7f05424..77b0329dc32c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/EloquaObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/EloquaObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Eloqua server dataset. /// [Newtonsoft.Json.JsonObject("EloquaObject")] + [Rest.Serialization.JsonTransformation] public partial class EloquaObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public EloquaObjectDataset() /// 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. - public EloquaObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public EloquaObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public EloquaObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ExecuteSSISPackageActivity.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ExecuteSSISPackageActivity.cs index 3574b26a3369..ddf955ce1518 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ExecuteSSISPackageActivity.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ExecuteSSISPackageActivity.cs @@ -47,11 +47,16 @@ public ExecuteSSISPackageActivity() /// Linked service reference. /// Activity policy. /// Specifies the runtime to execute SSIS - /// package. Possible values include: 'x64', 'x86' + /// package. The value should be "x86" or "x64". Type: string (or + /// Expression with resultType string). /// The logging level of SSIS package - /// execution. + /// execution. Type: string (or Expression with resultType + /// string). /// The environment path to execute the - /// SSIS package. + /// SSIS package. Type: string (or Expression with resultType + /// string). + /// The package execution + /// credential. /// The project level parameters to /// execute the SSIS package. /// The package level parameters to @@ -62,13 +67,14 @@ public ExecuteSSISPackageActivity() /// connection managers to execute the SSIS package. /// The property overrides to execute /// the SSIS package. - public ExecuteSSISPackageActivity(string name, SSISPackageLocation packageLocation, IntegrationRuntimeReference connectVia, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), string runtime = default(string), string loggingLevel = default(string), string environmentPath = default(string), IDictionary projectParameters = default(IDictionary), IDictionary packageParameters = default(IDictionary), IDictionary> projectConnectionManagers = default(IDictionary>), IDictionary> packageConnectionManagers = default(IDictionary>), IDictionary propertyOverrides = default(IDictionary)) + public ExecuteSSISPackageActivity(string name, SSISPackageLocation packageLocation, IntegrationRuntimeReference connectVia, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object runtime = default(object), object loggingLevel = default(object), object environmentPath = default(object), SSISExecutionCredential executionCredential = default(SSISExecutionCredential), IDictionary projectParameters = default(IDictionary), IDictionary packageParameters = default(IDictionary), IDictionary> projectConnectionManagers = default(IDictionary>), IDictionary> packageConnectionManagers = default(IDictionary>), IDictionary propertyOverrides = default(IDictionary)) : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) { PackageLocation = packageLocation; Runtime = runtime; LoggingLevel = loggingLevel; EnvironmentPath = environmentPath; + ExecutionCredential = executionCredential; ConnectVia = connectVia; ProjectParameters = projectParameters; PackageParameters = packageParameters; @@ -90,23 +96,32 @@ public ExecuteSSISPackageActivity() public SSISPackageLocation PackageLocation { get; set; } /// - /// Gets or sets specifies the runtime to execute SSIS package. - /// Possible values include: 'x64', 'x86' + /// Gets or sets specifies the runtime to execute SSIS package. The + /// value should be "x86" or "x64". Type: string (or Expression with + /// resultType string). /// [JsonProperty(PropertyName = "typeProperties.runtime")] - public string Runtime { get; set; } + public object Runtime { get; set; } /// - /// Gets or sets the logging level of SSIS package execution. + /// Gets or sets the logging level of SSIS package execution. Type: + /// string (or Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.loggingLevel")] - public string LoggingLevel { get; set; } + public object LoggingLevel { get; set; } /// /// Gets or sets the environment path to execute the SSIS package. + /// Type: string (or Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.environmentPath")] - public string EnvironmentPath { get; set; } + public object EnvironmentPath { get; set; } + + /// + /// Gets or sets the package execution credential. + /// + [JsonProperty(PropertyName = "typeProperties.executionCredential")] + public SSISExecutionCredential ExecutionCredential { get; set; } /// /// Gets or sets the integration runtime reference. @@ -169,6 +184,10 @@ public override void Validate() { PackageLocation.Validate(); } + if (ExecutionCredential != null) + { + ExecutionCredential.Validate(); + } if (ConnectVia != null) { ConnectVia.Validate(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ExposureControlRequest.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ExposureControlRequest.cs new file mode 100644 index 000000000000..e091577a991a --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ExposureControlRequest.cs @@ -0,0 +1,59 @@ +// +// 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 exposure control request. + /// + public partial class ExposureControlRequest + { + /// + /// Initializes a new instance of the ExposureControlRequest class. + /// + public ExposureControlRequest() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ExposureControlRequest class. + /// + /// The feature name. + /// The feature type. + public ExposureControlRequest(string featureName = default(string), string featureType = default(string)) + { + FeatureName = featureName; + FeatureType = featureType; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the feature name. + /// + [JsonProperty(PropertyName = "featureName")] + public string FeatureName { get; set; } + + /// + /// Gets or sets the feature type. + /// + [JsonProperty(PropertyName = "featureType")] + public string FeatureType { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ExposureControlResponse.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ExposureControlResponse.cs new file mode 100644 index 000000000000..e7d706343b00 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ExposureControlResponse.cs @@ -0,0 +1,59 @@ +// +// 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 exposure control response. + /// + public partial class ExposureControlResponse + { + /// + /// Initializes a new instance of the ExposureControlResponse class. + /// + public ExposureControlResponse() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ExposureControlResponse class. + /// + /// The feature name. + /// The feature value. + public ExposureControlResponse(string featureName = default(string), string value = default(string)) + { + FeatureName = featureName; + Value = value; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets the feature name. + /// + [JsonProperty(PropertyName = "featureName")] + public string FeatureName { get; private set; } + + /// + /// Gets the feature value. + /// + [JsonProperty(PropertyName = "value")] + public string Value { get; private set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryGitHubConfiguration.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryGitHubConfiguration.cs index ed756f69b9b9..b6bd1e7ebd2b 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryGitHubConfiguration.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryGitHubConfiguration.cs @@ -30,7 +30,7 @@ public FactoryGitHubConfiguration() /// Initializes a new instance of the FactoryGitHubConfiguration class. /// /// Account name. - /// Rrepository name. + /// Repository name. /// Collaboration branch. /// Root folder. /// Last commit id. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryRepoConfiguration.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryRepoConfiguration.cs index 86fe4e58789d..539d782b3939 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryRepoConfiguration.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryRepoConfiguration.cs @@ -31,7 +31,7 @@ public FactoryRepoConfiguration() /// Initializes a new instance of the FactoryRepoConfiguration class. /// /// Account name. - /// Rrepository name. + /// Repository name. /// Collaboration branch. /// Root folder. /// Last commit id. @@ -57,7 +57,7 @@ public FactoryRepoConfiguration() public string AccountName { get; set; } /// - /// Gets or sets rrepository name. + /// Gets or sets repository name. /// [JsonProperty(PropertyName = "repositoryName")] public string RepositoryName { get; set; } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryVSTSConfiguration.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryVSTSConfiguration.cs index fea02fc13f2a..0b5f5a1c67c8 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryVSTSConfiguration.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryVSTSConfiguration.cs @@ -31,7 +31,7 @@ public FactoryVSTSConfiguration() /// Initializes a new instance of the FactoryVSTSConfiguration class. /// /// Account name. - /// Rrepository name. + /// Repository name. /// Collaboration branch. /// Root folder. /// VSTS project name. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FileShareDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FileShareDataset.cs index ee5eaecf09e4..0dadf9932930 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FileShareDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FileShareDataset.cs @@ -43,6 +43,9 @@ public FileShareDataset() /// 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. @@ -58,8 +61,8 @@ public FileShareDataset() /// string (or Expression with resultType string). /// The data compression method used for the /// file system. - public FileShareDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object folderPath = default(object), object fileName = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), object fileFilter = default(object), DatasetCompression compression = default(DatasetCompression)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public FileShareDataset(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 folderPath = default(object), object fileName = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), object fileFilter = default(object), DatasetCompression compression = default(DatasetCompression)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { FolderPath = folderPath; FileName = fileName; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GetSsisObjectMetadataRequest.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GetSsisObjectMetadataRequest.cs new file mode 100644 index 000000000000..8105466ecdee --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GetSsisObjectMetadataRequest.cs @@ -0,0 +1,53 @@ +// +// 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 request payload of get SSIS object metadata. + /// + public partial class GetSsisObjectMetadataRequest + { + /// + /// Initializes a new instance of the GetSsisObjectMetadataRequest + /// class. + /// + public GetSsisObjectMetadataRequest() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the GetSsisObjectMetadataRequest + /// class. + /// + /// Metadata path. + public GetSsisObjectMetadataRequest(string metadataPath = default(string)) + { + MetadataPath = metadataPath; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets metadata path. + /// + [JsonProperty(PropertyName = "metadataPath")] + public string MetadataPath { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryObjectDataset.cs index a3c5f87e0a07..f076fe46b294 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Google BigQuery service dataset. /// [Newtonsoft.Json.JsonObject("GoogleBigQueryObject")] + [Rest.Serialization.JsonTransformation] public partial class GoogleBigQueryObjectDataset : Dataset { /// @@ -42,14 +45,20 @@ public GoogleBigQueryObjectDataset() /// 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. - public GoogleBigQueryObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public GoogleBigQueryObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -58,10 +67,17 @@ public GoogleBigQueryObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumLinkedService.cs index 9968d17421b2..8a095f976541 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumLinkedService.cs @@ -44,14 +44,17 @@ public GreenplumLinkedService() /// describing the Dataset. /// An ODBC connection string. Type: /// string, SecureString or AzureKeyVaultSecretReference. + /// 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 GreenplumLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) + public GreenplumLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference pwd = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Pwd = pwd; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -68,6 +71,13 @@ public GreenplumLinkedService() [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.pwd")] + public AzureKeyVaultSecretReference Pwd { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -85,6 +95,10 @@ public GreenplumLinkedService() public override void Validate() { base.Validate(); + if (Pwd != null) + { + Pwd.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumTableDataset.cs index e3d3a8e21129..241207fc4109 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumTableDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Greenplum Database dataset. /// [Newtonsoft.Json.JsonObject("GreenplumTable")] + [Rest.Serialization.JsonTransformation] public partial class GreenplumTableDataset : Dataset { /// @@ -40,14 +43,20 @@ public GreenplumTableDataset() /// 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. - public GreenplumTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public GreenplumTableDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public GreenplumTableDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HBaseObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HBaseObjectDataset.cs index cc1e811fcea6..9105803ab5dd 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HBaseObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HBaseObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// HBase server dataset. /// [Newtonsoft.Json.JsonObject("HBaseObject")] + [Rest.Serialization.JsonTransformation] public partial class HBaseObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public HBaseObjectDataset() /// 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. - public HBaseObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public HBaseObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public HBaseObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightHiveActivity.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightHiveActivity.cs index 92957b77f689..1616ee9ddc91 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightHiveActivity.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightHiveActivity.cs @@ -55,7 +55,12 @@ public HDInsightHiveActivity() /// reference. /// Allows user to specify defines for Hive job /// request. - public HDInsightHiveActivity(string name, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), IList storageLinkedServices = default(IList), IList arguments = default(IList), string getDebugInfo = default(string), object scriptPath = default(object), LinkedServiceReference scriptLinkedService = default(LinkedServiceReference), IDictionary defines = default(IDictionary)) + /// User specified arguments under hivevar + /// namespace. + /// Query timeout value (in minutes). + /// Effective when the HDInsight cluster is with ESP (Enterprise + /// Security Package) + public HDInsightHiveActivity(string name, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), IList storageLinkedServices = default(IList), IList arguments = default(IList), string getDebugInfo = default(string), object scriptPath = default(object), LinkedServiceReference scriptLinkedService = default(LinkedServiceReference), IDictionary defines = default(IDictionary), IList variables = default(IList), int? queryTimeout = default(int?)) : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) { StorageLinkedServices = storageLinkedServices; @@ -64,6 +69,8 @@ public HDInsightHiveActivity() ScriptPath = scriptPath; ScriptLinkedService = scriptLinkedService; Defines = defines; + Variables = variables; + QueryTimeout = queryTimeout; CustomInit(); } @@ -110,6 +117,19 @@ public HDInsightHiveActivity() [JsonProperty(PropertyName = "typeProperties.defines")] public IDictionary Defines { get; set; } + /// + /// Gets or sets user specified arguments under hivevar namespace. + /// + [JsonProperty(PropertyName = "typeProperties.variables")] + public IList Variables { get; set; } + + /// + /// Gets or sets query timeout value (in minutes). Effective when the + /// HDInsight cluster is with ESP (Enterprise Security Package) + /// + [JsonProperty(PropertyName = "typeProperties.queryTimeout")] + public int? QueryTimeout { get; set; } + /// /// Validate the object. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightLinkedService.cs index 049c1ac807aa..8f18d3a3273f 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightLinkedService.cs @@ -55,7 +55,9 @@ public HDInsightLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public HDInsightLinkedService(object clusterUri, 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), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), LinkedServiceReference hcatalogLinkedServiceName = default(LinkedServiceReference), object encryptedCredential = default(object)) + /// Specify if the HDInsight is created with + /// ESP (Enterprise Security Package). Type: Boolean. + public HDInsightLinkedService(object clusterUri, 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), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), LinkedServiceReference hcatalogLinkedServiceName = default(LinkedServiceReference), object encryptedCredential = default(object), object isEspEnabled = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ClusterUri = clusterUri; @@ -64,6 +66,7 @@ public HDInsightLinkedService() LinkedServiceName = linkedServiceName; HcatalogLinkedServiceName = hcatalogLinkedServiceName; EncryptedCredential = encryptedCredential; + IsEspEnabled = isEspEnabled; CustomInit(); } @@ -113,6 +116,13 @@ public HDInsightLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets specify if the HDInsight is created with ESP + /// (Enterprise Security Package). Type: Boolean. + /// + [JsonProperty(PropertyName = "typeProperties.isEspEnabled")] + public object IsEspEnabled { get; set; } + /// /// Validate the object. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveObjectDataset.cs index d85d29af3dea..2cebcb221f47 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Hive Server dataset. /// [Newtonsoft.Json.JsonObject("HiveObject")] + [Rest.Serialization.JsonTransformation] public partial class HiveObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public HiveObjectDataset() /// 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. - public HiveObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public HiveObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public HiveObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HttpDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HttpDataset.cs index 5777569b0d3f..b28fce9a0d0a 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HttpDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HttpDataset.cs @@ -43,6 +43,9 @@ public HttpDataset() /// 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. @@ -63,8 +66,8 @@ public HttpDataset() /// The format of files. /// The data compression method used on /// files. - public HttpDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object relativeUrl = default(object), object requestMethod = default(object), object requestBody = default(object), object additionalHeaders = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), DatasetCompression compression = default(DatasetCompression)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public HttpDataset(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 relativeUrl = default(object), object requestMethod = default(object), object requestBody = default(object), object additionalHeaders = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), DatasetCompression compression = default(DatasetCompression)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { RelativeUrl = relativeUrl; RequestMethod = requestMethod; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotLinkedService.cs index 63a5d8145329..db68c396a77e 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotLinkedService.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// Hubspot Serivce linked service. + /// Hubspot Service linked service. /// [Newtonsoft.Json.JsonObject("Hubspot")] [Rest.Serialization.JsonTransformation] diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotObjectDataset.cs index d995f7f44998..7c69672c9f90 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotObjectDataset.cs @@ -10,15 +10,18 @@ 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; /// - /// Hubspot Serivce dataset. + /// Hubspot Service dataset. /// [Newtonsoft.Json.JsonObject("HubspotObject")] + [Rest.Serialization.JsonTransformation] public partial class HubspotObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public HubspotObjectDataset() /// 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. - public HubspotObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public HubspotObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public HubspotObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotSource.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotSource.cs index 54af3d2f610c..02a39ffccdc3 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotSource.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotSource.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// A copy activity Hubspot Serivce source. + /// A copy activity Hubspot Service source. /// public partial class HubspotSource : CopySource { diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ImpalaObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ImpalaObjectDataset.cs index 9a6c39b4f606..f52a2322b273 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ImpalaObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ImpalaObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Impala server dataset. /// [Newtonsoft.Json.JsonObject("ImpalaObject")] + [Rest.Serialization.JsonTransformation] public partial class ImpalaObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public ImpalaObjectDataset() /// 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. - public ImpalaObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public ImpalaObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public ImpalaObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraLinkedService.cs index 7e14908edb50..4f57c9d6c275 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraLinkedService.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// Jira Serivce linked service. + /// Jira Service linked service. /// [Newtonsoft.Json.JsonObject("Jira")] [Rest.Serialization.JsonTransformation] diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraObjectDataset.cs index 4e250dc99e71..951f47c0616c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraObjectDataset.cs @@ -10,15 +10,18 @@ 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; /// - /// Jira Serivce dataset. + /// Jira Service dataset. /// [Newtonsoft.Json.JsonObject("JiraObject")] + [Rest.Serialization.JsonTransformation] public partial class JiraObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public JiraObjectDataset() /// 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. - public JiraObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public JiraObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public JiraObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraSource.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraSource.cs index 9e0dcefe93db..c2b793ed9061 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraSource.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraSource.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// A copy activity Jira Serivce source. + /// A copy activity Jira Service source. /// public partial class JiraSource : CopySource { diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/LogStorageSettings.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/LogStorageSettings.cs new file mode 100644 index 000000000000..633975044eec --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/LogStorageSettings.cs @@ -0,0 +1,95 @@ +// +// 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; + + /// + /// Log storage settings. + /// + public partial class LogStorageSettings + { + /// + /// Initializes a new instance of the LogStorageSettings class. + /// + public LogStorageSettings() + { + LinkedServiceName = new LinkedServiceReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the LogStorageSettings class. + /// + /// Log storage linked service + /// reference. + /// Unmatched properties from the + /// message are deserialized this collection + /// The path to storage for storing detailed logs of + /// activity execution. Type: string (or Expression with resultType + /// string). + public LogStorageSettings(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), object path = default(object)) + { + AdditionalProperties = additionalProperties; + LinkedServiceName = linkedServiceName; + Path = path; + 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 log storage linked service reference. + /// + [JsonProperty(PropertyName = "linkedServiceName")] + public LinkedServiceReference LinkedServiceName { get; set; } + + /// + /// Gets or sets the path to storage for storing detailed logs of + /// activity execution. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "path")] + public object Path { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (LinkedServiceName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "LinkedServiceName"); + } + if (LinkedServiceName != null) + { + LinkedServiceName.Validate(); + } + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MagentoObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MagentoObjectDataset.cs index 9748f13a0d8c..0590d18f849c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MagentoObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MagentoObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Magento server dataset. /// [Newtonsoft.Json.JsonObject("MagentoObject")] + [Rest.Serialization.JsonTransformation] public partial class MagentoObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public MagentoObjectDataset() /// 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. - public MagentoObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public MagentoObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public MagentoObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBLinkedService.cs index 821384e14f47..e4db1314305e 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBLinkedService.cs @@ -44,14 +44,17 @@ public MariaDBLinkedService() /// describing the Dataset. /// An ODBC connection string. Type: /// string, SecureString or AzureKeyVaultSecretReference. + /// 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 MariaDBLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) + public MariaDBLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference pwd = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Pwd = pwd; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -68,6 +71,13 @@ public MariaDBLinkedService() [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.pwd")] + public AzureKeyVaultSecretReference Pwd { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -85,6 +95,10 @@ public MariaDBLinkedService() public override void Validate() { base.Validate(); + if (Pwd != null) + { + Pwd.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBTableDataset.cs index 0cef244385e7..0f4ea4f985ad 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBTableDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// MariaDB server dataset. /// [Newtonsoft.Json.JsonObject("MariaDBTable")] + [Rest.Serialization.JsonTransformation] public partial class MariaDBTableDataset : Dataset { /// @@ -40,14 +43,20 @@ public MariaDBTableDataset() /// 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. - public MariaDBTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public MariaDBTableDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public MariaDBTableDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MarketoObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MarketoObjectDataset.cs index fc7f7f0ed223..4e278cec1585 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MarketoObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MarketoObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Marketo server dataset. /// [Newtonsoft.Json.JsonObject("MarketoObject")] + [Rest.Serialization.JsonTransformation] public partial class MarketoObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public MarketoObjectDataset() /// 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. - public MarketoObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public MarketoObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public MarketoObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MongoDbCollectionDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MongoDbCollectionDataset.cs index 3ae532bd5689..d1808c7a0d47 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MongoDbCollectionDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MongoDbCollectionDataset.cs @@ -46,13 +46,16 @@ public MongoDbCollectionDataset() /// 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. - public MongoDbCollectionDataset(LinkedServiceReference linkedServiceName, object collectionName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public MongoDbCollectionDataset(LinkedServiceReference linkedServiceName, object collectionName, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { CollectionName = collectionName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MySqlLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MySqlLinkedService.cs index 16b32b4770b6..a2c1a49b90de 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MySqlLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MySqlLinkedService.cs @@ -43,14 +43,17 @@ public MySqlLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. + /// 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 MySqlLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) + public MySqlLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Password = password; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -66,6 +69,13 @@ public MySqlLinkedService() [JsonProperty(PropertyName = "typeProperties.connectionString")] public SecretBase ConnectionString { get; set; } + /// + /// Gets or sets the Azure key vault secret reference of password in + /// connection string. + /// + [JsonProperty(PropertyName = "typeProperties.password")] + public AzureKeyVaultSecretReference Password { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -87,6 +97,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); } + if (Password != null) + { + Password.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs index 98e9e7933af9..84dc7cf81028 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs @@ -44,14 +44,17 @@ public NetezzaLinkedService() /// describing the Dataset. /// An ODBC connection string. Type: /// string, SecureString or AzureKeyVaultSecretReference. + /// 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 NetezzaLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) + public NetezzaLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference pwd = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Pwd = pwd; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -68,6 +71,13 @@ public NetezzaLinkedService() [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.pwd")] + public AzureKeyVaultSecretReference Pwd { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -85,6 +95,10 @@ public NetezzaLinkedService() public override void Validate() { base.Validate(); + if (Pwd != null) + { + Pwd.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs index 1f809cf1a91b..f810e7c96630 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Netezza dataset. /// [Newtonsoft.Json.JsonObject("NetezzaTable")] + [Rest.Serialization.JsonTransformation] public partial class NetezzaTableDataset : Dataset { /// @@ -40,14 +43,20 @@ public NetezzaTableDataset() /// 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. - public NetezzaTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public NetezzaTableDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public NetezzaTableDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ODataResourceDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ODataResourceDataset.cs index 88f02665c80f..77d534f07fcb 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ODataResourceDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ODataResourceDataset.cs @@ -43,6 +43,9 @@ public ODataResourceDataset() /// 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. @@ -50,8 +53,8 @@ public ODataResourceDataset() /// specified, Dataset will appear at the root level. /// The OData resource path. Type: string (or /// Expression with resultType string). - public ODataResourceDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object path = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public ODataResourceDataset(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 path = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { Path = path; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleLinkedService.cs index 5f7dc3a07945..1ade3b3e1479 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleLinkedService.cs @@ -44,14 +44,17 @@ public OracleLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. + /// 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 OracleLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) + public OracleLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Password = password; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -68,6 +71,13 @@ public OracleLinkedService() [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 AzureKeyVaultSecretReference Password { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -89,6 +99,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); } + if (Password != null) + { + Password.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleTableDataset.cs index d8589c335175..639ad5656aae 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleTableDataset.cs @@ -46,13 +46,16 @@ public OracleTableDataset() /// 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. - public OracleTableDataset(LinkedServiceReference linkedServiceName, object tableName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public OracleTableDataset(LinkedServiceReference linkedServiceName, object tableName, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalLinkedService.cs index 62572ff27312..b6588374a575 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalLinkedService.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// Paypal Serivce linked service. + /// Paypal Service linked service. /// [Newtonsoft.Json.JsonObject("Paypal")] [Rest.Serialization.JsonTransformation] diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalObjectDataset.cs index f682ec12cd12..c5f05e0d4d9e 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalObjectDataset.cs @@ -10,15 +10,18 @@ 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; /// - /// Paypal Serivce dataset. + /// Paypal Service dataset. /// [Newtonsoft.Json.JsonObject("PaypalObject")] + [Rest.Serialization.JsonTransformation] public partial class PaypalObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public PaypalObjectDataset() /// 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. - public PaypalObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public PaypalObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public PaypalObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalSource.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalSource.cs index a9a3e18d42bd..8e683f6cb381 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalSource.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalSource.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// A copy activity Paypal Serivce source. + /// A copy activity Paypal Service source. /// public partial class PaypalSource : CopySource { diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PhoenixObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PhoenixObjectDataset.cs index 3648d1fbbbe0..6cd17a5d872d 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PhoenixObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PhoenixObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Phoenix server dataset. /// [Newtonsoft.Json.JsonObject("PhoenixObject")] + [Rest.Serialization.JsonTransformation] public partial class PhoenixObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public PhoenixObjectDataset() /// 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. - public PhoenixObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public PhoenixObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public PhoenixObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PostgreSqlLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PostgreSqlLinkedService.cs index 71c5c0e7c76d..ac3f9135f89c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PostgreSqlLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PostgreSqlLinkedService.cs @@ -43,14 +43,17 @@ public PostgreSqlLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. + /// 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 PostgreSqlLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) + public PostgreSqlLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Password = password; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -66,6 +69,13 @@ public PostgreSqlLinkedService() [JsonProperty(PropertyName = "typeProperties.connectionString")] public SecretBase ConnectionString { get; set; } + /// + /// Gets or sets the Azure key vault secret reference of password in + /// connection string. + /// + [JsonProperty(PropertyName = "typeProperties.password")] + public AzureKeyVaultSecretReference Password { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -87,6 +97,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); } + if (Password != null) + { + Password.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PrestoObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PrestoObjectDataset.cs index f40a29552fb1..5fefc5c98081 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PrestoObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PrestoObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Presto server dataset. /// [Newtonsoft.Json.JsonObject("PrestoObject")] + [Rest.Serialization.JsonTransformation] public partial class PrestoObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public PrestoObjectDataset() /// 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. - public PrestoObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public PrestoObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public PrestoObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/QuickBooksObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/QuickBooksObjectDataset.cs index 7de2019302a4..47b067b75c68 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/QuickBooksObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/QuickBooksObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// QuickBooks server dataset. /// [Newtonsoft.Json.JsonObject("QuickBooksObject")] + [Rest.Serialization.JsonTransformation] public partial class QuickBooksObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public QuickBooksObjectDataset() /// 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. - public QuickBooksObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public QuickBooksObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public QuickBooksObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RecurrenceScheduleOccurrence.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RecurrenceScheduleOccurrence.cs index 53c8b1491cae..600e4fc93716 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RecurrenceScheduleOccurrence.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RecurrenceScheduleOccurrence.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// The recurrence schedule occurence. + /// The recurrence schedule occurrence. /// public partial class RecurrenceScheduleOccurrence { diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RelationalTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RelationalTableDataset.cs index 7882c4cc101e..f0f29ae93746 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RelationalTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RelationalTableDataset.cs @@ -43,6 +43,9 @@ public RelationalTableDataset() /// 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. @@ -50,8 +53,8 @@ public RelationalTableDataset() /// specified, Dataset will appear at the root level. /// The relational table name. Type: string (or /// Expression with resultType string). - public RelationalTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object tableName = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public RelationalTableDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ResponsysObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ResponsysObjectDataset.cs index 3a517955c05e..cc9e1c1b5e8e 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ResponsysObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ResponsysObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Responsys dataset. /// [Newtonsoft.Json.JsonObject("ResponsysObject")] + [Rest.Serialization.JsonTransformation] public partial class ResponsysObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public ResponsysObjectDataset() /// 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. - public ResponsysObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public ResponsysObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public ResponsysObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SSISExecutionCredential.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SSISExecutionCredential.cs new file mode 100644 index 000000000000..044807c036bf --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SSISExecutionCredential.cs @@ -0,0 +1,93 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// SSIS package execution credential. + /// + public partial class SSISExecutionCredential + { + /// + /// Initializes a new instance of the SSISExecutionCredential class. + /// + public SSISExecutionCredential() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SSISExecutionCredential class. + /// + /// Domain for windows authentication. + /// UseName for windows authentication. + /// Password for windows authentication. + public SSISExecutionCredential(object domain, object userName, SecureString password) + { + Domain = domain; + UserName = userName; + Password = password; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets domain for windows authentication. + /// + [JsonProperty(PropertyName = "domain")] + public object Domain { get; set; } + + /// + /// Gets or sets useName for windows authentication. + /// + [JsonProperty(PropertyName = "userName")] + public object UserName { get; set; } + + /// + /// Gets or sets password for windows authentication. + /// + [JsonProperty(PropertyName = "password")] + public SecureString Password { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Domain == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Domain"); + } + if (UserName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "UserName"); + } + if (Password == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Password"); + } + if (Password != null) + { + Password.Validate(); + } + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceMarketingCloudObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceMarketingCloudObjectDataset.cs index 4f719b5bdee5..0755931cf14a 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceMarketingCloudObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceMarketingCloudObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Salesforce Marketing Cloud dataset. /// [Newtonsoft.Json.JsonObject("SalesforceMarketingCloudObject")] + [Rest.Serialization.JsonTransformation] public partial class SalesforceMarketingCloudObjectDataset : Dataset { /// @@ -42,14 +45,20 @@ public SalesforceMarketingCloudObjectDataset() /// 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. - public SalesforceMarketingCloudObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public SalesforceMarketingCloudObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -58,10 +67,17 @@ public SalesforceMarketingCloudObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceObjectDataset.cs index c6d610c093ec..6662eff3e4e9 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceObjectDataset.cs @@ -43,6 +43,9 @@ public SalesforceObjectDataset() /// 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. @@ -50,8 +53,8 @@ public SalesforceObjectDataset() /// specified, Dataset will appear at the root level. /// The Salesforce object API name. Type: /// string (or Expression with resultType string). - public SalesforceObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object objectApiName = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public SalesforceObjectDataset(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 objectApiName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { ObjectApiName = objectApiName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapCloudForCustomerResourceDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapCloudForCustomerResourceDataset.cs index 83d838f3cab5..94ba9933de04 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapCloudForCustomerResourceDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapCloudForCustomerResourceDataset.cs @@ -48,13 +48,16 @@ public SapCloudForCustomerResourceDataset() /// 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. - public SapCloudForCustomerResourceDataset(LinkedServiceReference linkedServiceName, object path, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public SapCloudForCustomerResourceDataset(LinkedServiceReference linkedServiceName, object path, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { Path = path; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapEccResourceDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapEccResourceDataset.cs index 1a9ee7d0f8a8..75ec0bb7cccb 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapEccResourceDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapEccResourceDataset.cs @@ -45,13 +45,16 @@ public SapEccResourceDataset() /// 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. - public SapEccResourceDataset(LinkedServiceReference linkedServiceName, string path, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public SapEccResourceDataset(LinkedServiceReference linkedServiceName, string path, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { Path = path; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ServiceNowObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ServiceNowObjectDataset.cs index 8ec7ad379e53..0cf32ca39d0a 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ServiceNowObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ServiceNowObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// ServiceNow server dataset. /// [Newtonsoft.Json.JsonObject("ServiceNowObject")] + [Rest.Serialization.JsonTransformation] public partial class ServiceNowObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public ServiceNowObjectDataset() /// 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. - public ServiceNowObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public ServiceNowObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public ServiceNowObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyLinkedService.cs index b0af322f064e..a5810cb004ec 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyLinkedService.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// Shopify Serivce linked service. + /// Shopify Service linked service. /// [Newtonsoft.Json.JsonObject("Shopify")] [Rest.Serialization.JsonTransformation] diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyObjectDataset.cs index 4a69c0054139..3e349a2ed443 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyObjectDataset.cs @@ -10,15 +10,18 @@ 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; /// - /// Shopify Serivce dataset. + /// Shopify Service dataset. /// [Newtonsoft.Json.JsonObject("ShopifyObject")] + [Rest.Serialization.JsonTransformation] public partial class ShopifyObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public ShopifyObjectDataset() /// 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. - public ShopifyObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public ShopifyObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public ShopifyObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifySource.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifySource.cs index 7248e5f4c18d..fac86031f967 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifySource.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifySource.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// A copy activity Shopify Serivce source. + /// A copy activity Shopify Service source. /// public partial class ShopifySource : CopySource { diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SparkObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SparkObjectDataset.cs index af8ab771d714..834cd7694a88 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SparkObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SparkObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Spark Server dataset. /// [Newtonsoft.Json.JsonObject("SparkObject")] + [Rest.Serialization.JsonTransformation] public partial class SparkObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public SparkObjectDataset() /// 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. - public SparkObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public SparkObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public SparkObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerStoredProcedureActivity.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerStoredProcedureActivity.cs index 92b7b64ec3ca..ddd80da8c3b4 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerStoredProcedureActivity.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerStoredProcedureActivity.cs @@ -90,16 +90,6 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "StoredProcedureName"); } - if (StoredProcedureParameters != null) - { - foreach (var valueElement in StoredProcedureParameters.Values) - { - if (valueElement != null) - { - valueElement.Validate(); - } - } - } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerTableDataset.cs index ae571416d38d..120ab628351c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerTableDataset.cs @@ -45,13 +45,16 @@ public SqlServerTableDataset() /// 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. - public SqlServerTableDataset(LinkedServiceReference linkedServiceName, object tableName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public SqlServerTableDataset(LinkedServiceReference linkedServiceName, object tableName, 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)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareLinkedService.cs index 9d835aa08c2e..698dc77ff323 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareLinkedService.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// Square Serivce linked service. + /// Square Service linked service. /// [Newtonsoft.Json.JsonObject("Square")] [Rest.Serialization.JsonTransformation] diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareObjectDataset.cs index 4dcef03be0bc..b367b0151bd7 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareObjectDataset.cs @@ -10,15 +10,18 @@ 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; /// - /// Square Serivce dataset. + /// Square Service dataset. /// [Newtonsoft.Json.JsonObject("SquareObject")] + [Rest.Serialization.JsonTransformation] public partial class SquareObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public SquareObjectDataset() /// 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. - public SquareObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public SquareObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public SquareObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareSource.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareSource.cs index b3277a4be48f..b603a762f918 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareSource.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareSource.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// A copy activity Square Serivce source. + /// A copy activity Square Service source. /// public partial class SquareSource : CopySource { diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadata.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadata.cs new file mode 100644 index 000000000000..83b77940a1c2 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadata.cs @@ -0,0 +1,67 @@ +// +// 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; + + /// + /// SSIS object metadata. + /// + public partial class SsisObjectMetadata + { + /// + /// Initializes a new instance of the SsisObjectMetadata class. + /// + public SsisObjectMetadata() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SsisObjectMetadata class. + /// + /// Metadata id. + /// Metadata name. + /// Metadata description. + public SsisObjectMetadata(long? id = default(long?), string name = default(string), string description = default(string)) + { + Id = id; + Name = name; + Description = description; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets metadata id. + /// + [JsonProperty(PropertyName = "id")] + public long? Id { get; set; } + + /// + /// Gets or sets metadata name. + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + /// + /// Gets or sets metadata description. + /// + [JsonProperty(PropertyName = "description")] + public string Description { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadataListResponse.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadataListResponse.cs new file mode 100644 index 000000000000..1d6150e15244 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadataListResponse.cs @@ -0,0 +1,65 @@ +// +// 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 list of SSIS object metadata. + /// + public partial class SsisObjectMetadataListResponse + { + /// + /// Initializes a new instance of the SsisObjectMetadataListResponse + /// class. + /// + public SsisObjectMetadataListResponse() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SsisObjectMetadataListResponse + /// class. + /// + /// List of SSIS object metadata. + /// The link to the next page of results, if any + /// remaining results exist. + public SsisObjectMetadataListResponse(IList value = default(IList), string nextLink = default(string)) + { + Value = value; + NextLink = nextLink; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets list of SSIS object metadata. + /// + [JsonProperty(PropertyName = "value")] + public IList Value { get; set; } + + /// + /// Gets or sets the link to the next page of results, if any remaining + /// results exist. + /// + [JsonProperty(PropertyName = "nextLink")] + public string NextLink { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadataStatusResponse.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadataStatusResponse.cs new file mode 100644 index 000000000000..3a60a7de4a9a --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadataStatusResponse.cs @@ -0,0 +1,77 @@ +// +// 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 status of the operation. + /// + public partial class SsisObjectMetadataStatusResponse + { + /// + /// Initializes a new instance of the SsisObjectMetadataStatusResponse + /// class. + /// + public SsisObjectMetadataStatusResponse() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SsisObjectMetadataStatusResponse + /// class. + /// + /// The status of the operation. + /// The operation name. + /// The operation properties. + /// The operation error message. + public SsisObjectMetadataStatusResponse(string status = default(string), string name = default(string), string properties = default(string), string error = default(string)) + { + Status = status; + Name = name; + Properties = properties; + Error = error; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the status of the operation. + /// + [JsonProperty(PropertyName = "status")] + public string Status { get; set; } + + /// + /// Gets or sets the operation name. + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + /// + /// Gets or sets the operation properties. + /// + [JsonProperty(PropertyName = "properties")] + public string Properties { get; set; } + + /// + /// Gets or sets the operation error message. + /// + [JsonProperty(PropertyName = "error")] + public string Error { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadataType.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadataType.cs new file mode 100644 index 000000000000..c5e556cd28e0 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisObjectMetadataType.cs @@ -0,0 +1,24 @@ +// +// 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 SsisObjectMetadataType. + /// + public static class SsisObjectMetadataType + { + public const string Folder = "Folder"; + public const string Project = "Project"; + public const string Package = "Package"; + public const string Environment = "Environment"; + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisPackageLocation.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisPackageLocation.cs index c1a63e44e45f..0ca3385efe22 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisPackageLocation.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SsisPackageLocation.cs @@ -30,8 +30,9 @@ public SSISPackageLocation() /// /// Initializes a new instance of the SSISPackageLocation class. /// - /// The SSIS package path. - public SSISPackageLocation(string packagePath) + /// The SSIS package path. Type: string (or + /// Expression with resultType string). + public SSISPackageLocation(object packagePath) { PackagePath = packagePath; CustomInit(); @@ -43,10 +44,11 @@ public SSISPackageLocation(string packagePath) partial void CustomInit(); /// - /// Gets or sets the SSIS package path. + /// Gets or sets the SSIS package path. Type: string (or Expression + /// with resultType string). /// [JsonProperty(PropertyName = "packagePath")] - public string PackagePath { get; set; } + public object PackagePath { get; set; } /// /// Validate the object. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/StoredProcedureParameter.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/StoredProcedureParameter.cs index f2714e0663f8..134bcf93a3de 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/StoredProcedureParameter.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/StoredProcedureParameter.cs @@ -10,7 +10,6 @@ namespace Microsoft.Azure.Management.DataFactory.Models { - using Microsoft.Rest; using Newtonsoft.Json; using System.Linq; @@ -35,7 +34,7 @@ public StoredProcedureParameter() /// Stored procedure parameter type. Possible values /// include: 'String', 'Int', 'Decimal', 'Guid', 'Boolean', /// 'Date' - public StoredProcedureParameter(object value, string type = default(string)) + public StoredProcedureParameter(object value = default(object), string type = default(string)) { Value = value; Type = type; @@ -61,18 +60,5 @@ public StoredProcedureParameter() [JsonProperty(PropertyName = "type")] public string Type { get; set; } - /// - /// Validate the object. - /// - /// - /// Thrown if validation fails - /// - public virtual void Validate() - { - if (Value == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Value"); - } - } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/UserAccessPolicy.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/UserAccessPolicy.cs new file mode 100644 index 000000000000..17748060ecd6 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/UserAccessPolicy.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 Newtonsoft.Json; + using System.Linq; + + /// + /// Get Data Plane read only token request definition. + /// + public partial class UserAccessPolicy + { + /// + /// Initializes a new instance of the UserAccessPolicy class. + /// + public UserAccessPolicy() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the UserAccessPolicy class. + /// + /// The string with permissions for Data + /// Plane access. Currently only 'r' is supported which grants read + /// only access. + /// The resource path to get access + /// relative to factory. Currently only empty string is supported which + /// corresponds to the factory resource. + /// The name of the profile. Currently only + /// the default is supported. The default value is + /// DefaultProfile. + /// Start time for the token. If not specified + /// the current time will be used. + /// Expiration time for the token. Maximum + /// duration for the token is eight hours and by default the token will + /// expire in eight hours. + public UserAccessPolicy(string permissions = default(string), string accessResourcePath = default(string), string profileName = default(string), string startTime = default(string), string expireTime = default(string)) + { + Permissions = permissions; + AccessResourcePath = accessResourcePath; + ProfileName = profileName; + StartTime = startTime; + ExpireTime = expireTime; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the string with permissions for Data Plane access. + /// Currently only 'r' is supported which grants read only access. + /// + [JsonProperty(PropertyName = "permissions")] + public string Permissions { get; set; } + + /// + /// Gets or sets the resource path to get access relative to factory. + /// Currently only empty string is supported which corresponds to the + /// factory resource. + /// + [JsonProperty(PropertyName = "accessResourcePath")] + public string AccessResourcePath { get; set; } + + /// + /// Gets or sets the name of the profile. Currently only the default is + /// supported. The default value is DefaultProfile. + /// + [JsonProperty(PropertyName = "profileName")] + public string ProfileName { get; set; } + + /// + /// Gets or sets start time for the token. If not specified the current + /// time will be used. + /// + [JsonProperty(PropertyName = "startTime")] + public string StartTime { get; set; } + + /// + /// Gets or sets expiration time for the token. Maximum duration for + /// the token is eight hours and by default the token will expire in + /// eight hours. + /// + [JsonProperty(PropertyName = "expireTime")] + public string ExpireTime { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/UserProperty.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/UserProperty.cs index 917ba066deec..fea6280e73a6 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/UserProperty.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/UserProperty.cs @@ -30,8 +30,8 @@ public UserProperty() /// /// Initializes a new instance of the UserProperty class. /// - /// User proprety name. - /// User proprety value. Type: string (or + /// User property name. + /// User property value. Type: string (or /// Expression with resultType string). public UserProperty(string name, object value) { @@ -46,13 +46,13 @@ public UserProperty(string name, object value) partial void CustomInit(); /// - /// Gets or sets user proprety name. + /// Gets or sets user property name. /// [JsonProperty(PropertyName = "name")] public string Name { get; set; } /// - /// Gets or sets user proprety value. Type: string (or Expression with + /// Gets or sets user property value. Type: string (or Expression with /// resultType string). /// [JsonProperty(PropertyName = "value")] diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ValidationActivity.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ValidationActivity.cs new file mode 100644 index 000000000000..2552c0dd025b --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ValidationActivity.cs @@ -0,0 +1,127 @@ +// +// 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; + + /// + /// This activity blocks execution until a file has been validated to + /// exist, with an optional minimum size, or the timeout is reached, + /// whichever is earlier. + /// + [Newtonsoft.Json.JsonObject("Validation")] + [Rest.Serialization.JsonTransformation] + public partial class ValidationActivity : ControlActivity + { + /// + /// Initializes a new instance of the ValidationActivity class. + /// + public ValidationActivity() + { + Dataset = new DatasetReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the ValidationActivity class. + /// + /// Activity name. + /// Validation activity dataset + /// reference. + /// Unmatched properties from the + /// message are deserialized this collection + /// Activity description. + /// Activity depends on condition. + /// Activity user properties. + /// Specifies the timeout for the activity to + /// run. If there is no value specified, it takes the value of + /// TimeSpan.FromDays(7) which is 1 week as default. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). Type: string + /// (or Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// A delay in seconds between validation attempts. + /// If no value is specified, 10 seconds will be used as the + /// default. + /// Minimum size of a file in byte. If no + /// value is specified, 0 byte will be used as the default. + public ValidationActivity(string name, DatasetReference dataset, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), object timeout = default(object), int? sleep = default(int?), int? minimumSize = default(int?)) + : base(name, additionalProperties, description, dependsOn, userProperties) + { + Timeout = timeout; + Sleep = sleep; + MinimumSize = minimumSize; + Dataset = dataset; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets specifies the timeout for the activity to run. If + /// there is no value specified, it takes the value of + /// TimeSpan.FromDays(7) which is 1 week as default. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). Type: string + /// (or Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// + [JsonProperty(PropertyName = "typeProperties.timeout")] + public object Timeout { get; set; } + + /// + /// Gets or sets a delay in seconds between validation attempts. If no + /// value is specified, 10 seconds will be used as the default. + /// + [JsonProperty(PropertyName = "typeProperties.sleep")] + public int? Sleep { get; set; } + + /// + /// Gets or sets minimum size of a file in byte. If no value is + /// specified, 0 byte will be used as the default. + /// + [JsonProperty(PropertyName = "typeProperties.minimumSize")] + public int? MinimumSize { get; set; } + + /// + /// Gets or sets validation activity dataset reference. + /// + [JsonProperty(PropertyName = "typeProperties.dataset")] + public DatasetReference Dataset { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (Dataset == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Dataset"); + } + if (Dataset != null) + { + Dataset.Validate(); + } + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs index 4bfba90c50ee..079f8884e96a 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs @@ -44,14 +44,17 @@ public VerticaLinkedService() /// describing the Dataset. /// An ODBC connection string. Type: /// string, SecureString or AzureKeyVaultSecretReference. + /// 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 VerticaLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) + public VerticaLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference pwd = default(AzureKeyVaultSecretReference), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; + Pwd = pwd; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -68,6 +71,13 @@ public VerticaLinkedService() [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.pwd")] + public AzureKeyVaultSecretReference Pwd { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -85,6 +95,10 @@ public VerticaLinkedService() public override void Validate() { base.Validate(); + if (Pwd != null) + { + Pwd.Validate(); + } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs index 7ad2b1b51183..2e37d2f58906 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Vertica dataset. /// [Newtonsoft.Json.JsonObject("VerticaTable")] + [Rest.Serialization.JsonTransformation] public partial class VerticaTableDataset : Dataset { /// @@ -40,14 +43,20 @@ public VerticaTableDataset() /// 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. - public VerticaTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public VerticaTableDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public VerticaTableDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebHookActivity.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebHookActivity.cs new file mode 100644 index 000000000000..e2bfeda9d2e1 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebHookActivity.cs @@ -0,0 +1,151 @@ +// +// 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; + + /// + /// WebHook activity. + /// + [Newtonsoft.Json.JsonObject("WebHook")] + [Rest.Serialization.JsonTransformation] + public partial class WebHookActivity : ControlActivity + { + /// + /// Initializes a new instance of the WebHookActivity class. + /// + public WebHookActivity() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the WebHookActivity class. + /// + /// Activity name. + /// WebHook activity target endpoint and path. Type: + /// string (or Expression with resultType string). + /// Unmatched properties from the + /// message are deserialized this collection + /// Activity description. + /// Activity depends on condition. + /// Activity user properties. + /// Specifies the timeout within which the + /// webhook should be called back. If there is no value specified, it + /// takes the value of TimeSpan.FromMinutes(10) which is 10 minutes as + /// default. Type: string (or Expression with resultType string), + /// pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Represents the headers that will be sent to + /// the request. For example, to set the language and type on a + /// request: "headers" : { "Accept-Language": "en-us", "Content-Type": + /// "application/json" }. Type: string (or Expression with resultType + /// string). + /// Represents the payload that will be sent to the + /// endpoint. Required for POST/PUT method, not allowed for GET method + /// Type: string (or Expression with resultType string). + /// Authentication method used for calling + /// the endpoint. + public WebHookActivity(string name, object url, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), object timeout = default(object), object headers = default(object), object body = default(object), WebActivityAuthentication authentication = default(WebActivityAuthentication)) + : base(name, additionalProperties, description, dependsOn, userProperties) + { + Url = url; + Timeout = timeout; + Headers = headers; + Body = body; + Authentication = authentication; + CustomInit(); + } + /// + /// Static constructor for WebHookActivity class. + /// + static WebHookActivity() + { + Method = "POST"; + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets webHook activity target endpoint and path. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.url")] + public object Url { get; set; } + + /// + /// Gets or sets specifies the timeout within which the webhook should + /// be called back. If there is no value specified, it takes the value + /// of TimeSpan.FromMinutes(10) which is 10 minutes as default. Type: + /// string (or Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// + [JsonProperty(PropertyName = "typeProperties.timeout")] + public object Timeout { get; set; } + + /// + /// Gets or sets represents the headers that will be sent to the + /// request. For example, to set the language and type on a request: + /// "headers" : { "Accept-Language": "en-us", "Content-Type": + /// "application/json" }. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.headers")] + public object Headers { get; set; } + + /// + /// Gets or sets represents the payload that will be sent to the + /// endpoint. Required for POST/PUT method, not allowed for GET method + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.body")] + public object Body { get; set; } + + /// + /// Gets or sets authentication method used for calling the endpoint. + /// + [JsonProperty(PropertyName = "typeProperties.authentication")] + public WebActivityAuthentication Authentication { get; set; } + + /// + /// Rest API method for target endpoint. + /// + [JsonProperty(PropertyName = "typeProperties.method")] + public static string Method { get; private set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (Url == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Url"); + } + if (Authentication != null) + { + Authentication.Validate(); + } + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SSISExecutionRuntime.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebHookActivityMethod.cs similarity index 72% rename from src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SSISExecutionRuntime.cs rename to src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebHookActivityMethod.cs index df18124204f4..877c76ec8db7 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SSISExecutionRuntime.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebHookActivityMethod.cs @@ -12,11 +12,10 @@ namespace Microsoft.Azure.Management.DataFactory.Models { /// - /// Defines values for SSISExecutionRuntime. + /// Defines values for WebHookActivityMethod. /// - public static class SSISExecutionRuntime + public static class WebHookActivityMethod { - public const string X64 = "x64"; - public const string X86 = "x86"; + public const string POST = "POST"; } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebTableDataset.cs index ca8fe1307e07..3ff522defefa 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebTableDataset.cs @@ -46,6 +46,9 @@ public WebTableDataset() /// 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. @@ -54,8 +57,8 @@ public WebTableDataset() /// The relative URL to the web page from the linked /// service URL. Type: string (or Expression with resultType /// string). - public WebTableDataset(LinkedServiceReference linkedServiceName, object index, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object path = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + public WebTableDataset(LinkedServiceReference linkedServiceName, object index, 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 path = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { Index = index; Path = path; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroLinkedService.cs index bb04bec20fe7..21911f115540 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroLinkedService.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// Xero Serivce linked service. + /// Xero Service linked service. /// [Newtonsoft.Json.JsonObject("Xero")] [Rest.Serialization.JsonTransformation] diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroObjectDataset.cs index 77c697c59bbc..afb6203af8b3 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroObjectDataset.cs @@ -10,15 +10,18 @@ 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; /// - /// Xero Serivce dataset. + /// Xero Service dataset. /// [Newtonsoft.Json.JsonObject("XeroObject")] + [Rest.Serialization.JsonTransformation] public partial class XeroObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public XeroObjectDataset() /// 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. - public XeroObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public XeroObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public XeroObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroSource.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroSource.cs index fbcf74114213..32f5f668cf92 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroSource.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroSource.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// A copy activity Xero Serivce source. + /// A copy activity Xero Service source. /// public partial class XeroSource : CopySource { diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ZohoObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ZohoObjectDataset.cs index 4a5b7a20cf22..adae9c6bec80 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ZohoObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ZohoObjectDataset.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -19,6 +21,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// Zoho server dataset. /// [Newtonsoft.Json.JsonObject("ZohoObject")] + [Rest.Serialization.JsonTransformation] public partial class ZohoObjectDataset : Dataset { /// @@ -40,14 +43,20 @@ public ZohoObjectDataset() /// 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. - public ZohoObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations, folder) + /// The table name. Type: string (or Expression + /// with resultType string). + public ZohoObjectDataset(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 tableName = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { + TableName = tableName; CustomInit(); } @@ -56,10 +65,17 @@ public ZohoObjectDataset() /// partial void CustomInit(); + /// + /// Gets or sets the table name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.tableName")] + public object TableName { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/PipelinesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/PipelinesOperations.cs index 8aad6976a67b..7ee0f05a73ae 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/PipelinesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/PipelinesOperations.cs @@ -1064,7 +1064,7 @@ internal PipelinesOperations(DataFactoryManagementClient client) /// /// /// The pipeline run identifier. If run ID is specified the parameters of the - /// the specified run will be used to create a new run. + /// specified run will be used to create a new run. /// /// /// Parameters of the pipeline run. These parameters will be used only if the diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/PipelinesOperationsExtensions.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/PipelinesOperationsExtensions.cs index 21133aad7162..f313d76a955e 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/PipelinesOperationsExtensions.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/PipelinesOperationsExtensions.cs @@ -239,7 +239,7 @@ public static void Delete(this IPipelinesOperations operations, string resourceG /// /// /// The pipeline run identifier. If run ID is specified the parameters of the - /// the specified run will be used to create a new run. + /// specified run will be used to create a new run. /// /// /// Parameters of the pipeline run. These parameters will be used only if the @@ -267,7 +267,7 @@ public static void Delete(this IPipelinesOperations operations, string resourceG /// /// /// The pipeline run identifier. If run ID is specified the parameters of the - /// the specified run will be used to create a new run. + /// specified run will be used to create a new run. /// /// /// Parameters of the pipeline run. These parameters will be used only if the diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/SdkInfo_DataFactoryManagementClient.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/SdkInfo_DataFactoryManagementClient.cs index 54ed8e44ec3a..afb3bebe6aa9 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/SdkInfo_DataFactoryManagementClient.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/SdkInfo_DataFactoryManagementClient.cs @@ -21,8 +21,10 @@ public static IEnumerable> ApiInfo_DataFactoryMana { new Tuple("DataFactory", "ActivityRuns", "2018-06-01"), new Tuple("DataFactory", "Datasets", "2018-06-01"), + new Tuple("DataFactory", "ExposureControl", "2018-06-01"), new Tuple("DataFactory", "Factories", "2018-06-01"), new Tuple("DataFactory", "IntegrationRuntimeNodes", "2018-06-01"), + new Tuple("DataFactory", "IntegrationRuntimeObjectMetadata", "2018-06-01"), new Tuple("DataFactory", "IntegrationRuntimes", "2018-06-01"), new Tuple("DataFactory", "LinkedServices", "2018-06-01"), new Tuple("DataFactory", "Operations", "2018-06-01"), @@ -34,16 +36,5 @@ public static IEnumerable> ApiInfo_DataFactoryMana }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "latest"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283"; - 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=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\VSO\\GitHub\\azure-sdk-for-net\\src\\SDKs"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "f3ae68e0ecf48f6fd9f71acd4138aaa8cf14d8f5"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } - diff --git a/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj b/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj index 1ff75e3671db..c04030e185a6 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj +++ b/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj @@ -6,10 +6,22 @@ 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. - 2.3.1 + 3.0.0 Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; - Taking dependency on 10.0.3 version of Newtonsoft nuget package. + net452;netstandard1.4 diff --git a/src/SDKs/DataFactory/Management.DataFactory/Properties/AssemblyInfo.cs b/src/SDKs/DataFactory/Management.DataFactory/Properties/AssemblyInfo.cs index ef6d5e92111e..1b42af159837 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Properties/AssemblyInfo.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/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("2.1.0.0")] -[assembly: AssemblyFileVersion("2.3.1.0")] +[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyFileVersion("3.0.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/src/SDKs/DataFactory/Management.DataFactory/changelog.md b/src/SDKs/DataFactory/Management.DataFactory/changelog.md index 110887774df0..5e55598aebb1 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/changelog.md +++ b/src/SDKs/DataFactory/Management.DataFactory/changelog.md @@ -1,6 +1,20 @@ # Changelog for the Azure Data Factory V2 .NET SDK ## Current version +## Version 3.0.0 + +### Feature Additions + - Added table name in dataset + - Added get Dataplane access API + - Refactored delete activity payload + - Added support for HDlingsight cluster with Enterprise Sercurity package + - Adeed refresh and get Integration Runtime Object Metadata API + - Changed type of Ssis activity property type to support expression + - Added Webhook Activity + - Added winauth support in SSIS Activity + - Supported schema property for dataset + - Added validation activity + - Added exposure control APIs ## Version 2.3.0 diff --git a/src/SDKs/_metadata/datafactory_resource-manager.txt b/src/SDKs/_metadata/datafactory_resource-manager.txt index 5da4bee1dfde..c3f6ff3cff5e 100644 --- a/src/SDKs/_metadata/datafactory_resource-manager.txt +++ b/src/SDKs/_metadata/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=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\VSO\GitHub\azure-sdk-for-net\src\SDKs -2018-10-06 00:04:57 UTC +cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\repros\code\azure-sdk-for-net\src\SDKs +2019-01-16 09:42:19 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: f3ae68e0ecf48f6fd9f71acd4138aaa8cf14d8f5 +Commit: 7be5890a21dc86d71ac1954a4d1ba5fd9a6ce8ec AutoRest information Requested version: latest Bootstrapper version: autorest@2.0.4283