diff --git a/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs b/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs index c5615a7d9854..ea7c8bca4b51 100644 --- a/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs +++ b/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs @@ -149,6 +149,62 @@ public class TriggerJsonSamples : JsonSampleCollection } } } +"; + + [JsonSample] + public const string TumblingWindowTriggerWithDependencySample = @" +{ + name: ""myDemoTWTriggerWithDependency"", + properties: { + type: ""TumblingWindowTrigger"", + typeProperties: { + frequency: ""Hour"", + interval: 24, + startTime: ""2017-04-14T13:00:00Z"", + endTime: ""2018-04-14T13:00:00Z"", + delay: ""00:00:01"", + retryPolicy: { + count: 3, + intervalInSeconds: 30 + }, + maxConcurrency: 10, + dependsOn: [{ + type: ""TumblingWindowTriggerDependencyReference"", + referenceTrigger: { + type: ""TriggerReference"", + referenceName: ""myDemoTWTrigger1"" + }, + offset: ""00:00:00"", + size: ""02:00:00"" + }, + { + type: ""TumblingWindowTriggerDependencyReference"", + referenceTrigger: { + type: ""TriggerReference"", + referenceName: ""myDemoTWTrigger2"" + }, + offset: ""-00:30:00"", + size: ""00:30:00"" + }] + }, + pipeline: { + pipelineReference: { + type: ""PipelineReference"", + referenceName: ""myPipeline"" + }, + parameters: { + windowStart: { + type: ""Expression"", + value: ""@{trigger().outputs.windowStartTime}"" + }, + windowEnd: { + type: ""Expression"", + value: ""@{trigger().outputs.windowEndTime}"" + }, + } + } + } +} "; } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/DataFactoryManagementClient.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/DataFactoryManagementClient.cs index 5b03a1a95d2f..b8f576cf7df2 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/DataFactoryManagementClient.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/DataFactoryManagementClient.cs @@ -130,6 +130,19 @@ public partial class DataFactoryManagementClient : ServiceClient public virtual ITriggerRunsOperations TriggerRuns { get; private set; } + /// + /// Initializes a new instance of the DataFactoryManagementClient class. + /// + /// + /// HttpClient to be used + /// + /// + /// True: will dispose the provided httpClient on calling DataFactoryManagementClient.Dispose(). False: will not dispose provided httpClient + protected DataFactoryManagementClient(HttpClient httpClient, bool disposeHttpClient) : base(httpClient, disposeHttpClient) + { + Initialize(); + } + /// /// Initializes a new instance of the DataFactoryManagementClient class. /// @@ -225,6 +238,33 @@ public DataFactoryManagementClient(ServiceClientCredentials credentials, params } } + /// + /// Initializes a new instance of the DataFactoryManagementClient class. + /// + /// + /// Required. Credentials needed for the client to connect to Azure. + /// + /// + /// HttpClient to be used + /// + /// + /// True: will dispose the provided httpClient on calling DataFactoryManagementClient.Dispose(). False: will not dispose provided httpClient + /// + /// Thrown when a required parameter is null + /// + public DataFactoryManagementClient(ServiceClientCredentials credentials, HttpClient httpClient, bool disposeHttpClient) : this(httpClient, disposeHttpClient) + { + if (credentials == null) + { + throw new System.ArgumentNullException("credentials"); + } + Credentials = credentials; + if (Credentials != null) + { + Credentials.InitializeServiceClient(this); + } + } + /// /// Initializes a new instance of the DataFactoryManagementClient class. /// @@ -395,6 +435,8 @@ private void Initialize() DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); + SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); + DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimeNodesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimeNodesOperations.cs index 7887182305ce..fe9cf09699ba 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimeNodesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimeNodesOperations.cs @@ -23,6 +23,37 @@ namespace Microsoft.Azure.Management.DataFactory /// public partial interface IIntegrationRuntimeNodesOperations { + /// + /// Gets a self-hosted integration runtime node. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The integration runtime node 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> GetWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, string nodeName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Deletes a self-hosted integration runtime node. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimesOperations.cs index 275af97e2334..f1b4ffe069bd 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IIntegrationRuntimesOperations.cs @@ -458,6 +458,38 @@ public partial interface IIntegrationRuntimesOperations /// Task RemoveLinksWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, LinkedIntegrationRuntimeRequest linkedIntegrationRuntimeRequest, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// + /// Create a linked integration runtime entry in a shared integration + /// runtime. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The linked integration runtime properties. + /// + /// + /// 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> CreateLinkedIntegrationRuntimeWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, CreateLinkedIntegrationRuntimeRequest createLinkedIntegrationRuntimeRequest, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// /// Starts a ManagedReserved type integration runtime. /// /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeNodesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeNodesOperations.cs index b7ae77717d7b..161abc83aedd 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeNodesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeNodesOperations.cs @@ -50,6 +50,280 @@ internal IntegrationRuntimeNodesOperations(DataFactoryManagementClient client) /// public DataFactoryManagementClient Client { get; private set; } + /// + /// Gets a self-hosted integration runtime node. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The integration runtime node 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> GetWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, string nodeName, 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 (nodeName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "nodeName"); + } + if (nodeName != null) + { + if (nodeName.Length > 150) + { + throw new ValidationException(ValidationRules.MaxLength, "nodeName", 150); + } + if (nodeName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "nodeName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(nodeName, "^[a-z0-9A-Z][a-z0-9A-Z_-]{0,149}$")) + { + throw new ValidationException(ValidationRules.Pattern, "nodeName", "^[a-z0-9A-Z][a-z0-9A-Z_-]{0,149}$"); + } + } + 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("nodeName", nodeName); + 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}/nodes/{nodeName}").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)); + _url = _url.Replace("{nodeName}", System.Uri.EscapeDataString(nodeName)); + 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("GET"); + _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) + { + 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; + } + /// /// Deletes a self-hosted integration runtime node. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeNodesOperationsExtensions.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeNodesOperationsExtensions.cs index 87bcce77bb5c..c24614fe7810 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeNodesOperationsExtensions.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimeNodesOperationsExtensions.cs @@ -21,6 +21,58 @@ namespace Microsoft.Azure.Management.DataFactory /// public static partial class IntegrationRuntimeNodesOperationsExtensions { + /// + /// Gets a self-hosted integration runtime node. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The integration runtime node name. + /// + public static SelfHostedIntegrationRuntimeNode Get(this IIntegrationRuntimeNodesOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName, string nodeName) + { + return operations.GetAsync(resourceGroupName, factoryName, integrationRuntimeName, nodeName).GetAwaiter().GetResult(); + } + + /// + /// Gets a self-hosted integration runtime node. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The integration runtime node name. + /// + /// + /// The cancellation token. + /// + public static async Task GetAsync(this IIntegrationRuntimeNodesOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName, string nodeName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, factoryName, integrationRuntimeName, nodeName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Deletes a self-hosted integration runtime node. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperations.cs index f502191c627e..c5892df9ebb6 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperations.cs @@ -3341,6 +3341,270 @@ internal IntegrationRuntimesOperations(DataFactoryManagementClient client) return _result; } + /// + /// Create a linked integration runtime entry in a shared integration runtime. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The linked integration runtime properties. + /// + /// + /// 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> CreateLinkedIntegrationRuntimeWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, CreateLinkedIntegrationRuntimeRequest createLinkedIntegrationRuntimeRequest, 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"); + } + if (createLinkedIntegrationRuntimeRequest == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "createLinkedIntegrationRuntimeRequest"); + } + // 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("createLinkedIntegrationRuntimeRequest", createLinkedIntegrationRuntimeRequest); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "CreateLinkedIntegrationRuntime", 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}/linkedIntegrationRuntime").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(createLinkedIntegrationRuntimeRequest != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(createLinkedIntegrationRuntimeRequest, 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; + } + /// /// Starts a ManagedReserved type integration runtime. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperationsExtensions.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperationsExtensions.cs index 53380c42c1b8..5a634f9c4d74 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperationsExtensions.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IntegrationRuntimesOperationsExtensions.cs @@ -748,6 +748,58 @@ public static void RemoveLinks(this IIntegrationRuntimesOperations operations, s (await operations.RemoveLinksWithHttpMessagesAsync(resourceGroupName, factoryName, integrationRuntimeName, linkedIntegrationRuntimeRequest, null, cancellationToken).ConfigureAwait(false)).Dispose(); } + /// + /// Create a linked integration runtime entry in a shared integration runtime. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The linked integration runtime properties. + /// + public static IntegrationRuntimeStatusResponse CreateLinkedIntegrationRuntime(this IIntegrationRuntimesOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName, CreateLinkedIntegrationRuntimeRequest createLinkedIntegrationRuntimeRequest) + { + return operations.CreateLinkedIntegrationRuntimeAsync(resourceGroupName, factoryName, integrationRuntimeName, createLinkedIntegrationRuntimeRequest).GetAwaiter().GetResult(); + } + + /// + /// Create a linked integration runtime entry in a shared integration runtime. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The linked integration runtime properties. + /// + /// + /// The cancellation token. + /// + public static async Task CreateLinkedIntegrationRuntimeAsync(this IIntegrationRuntimesOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName, CreateLinkedIntegrationRuntimeRequest createLinkedIntegrationRuntimeRequest, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.CreateLinkedIntegrationRuntimeWithHttpMessagesAsync(resourceGroupName, factoryName, integrationRuntimeName, createLinkedIntegrationRuntimeRequest, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Starts a ManagedReserved type integration runtime. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSObjectDataset.cs index fc5be280c6bc..990a33569393 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonMWSObjectDataset.cs @@ -43,8 +43,10 @@ public AmazonMWSObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public AmazonMWSObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonS3Dataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonS3Dataset.cs index ac6a51299d65..3b224a449772 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonS3Dataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AmazonS3Dataset.cs @@ -49,6 +49,8 @@ public AmazonS3Dataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The key of the Amazon S3 object. Type: string (or /// Expression with resultType string). /// The prefix filter for the S3 object name. @@ -58,8 +60,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), 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) + 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) { 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 033991a201be..50a9778c270a 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBlobDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBlobDataset.cs @@ -46,6 +46,8 @@ public AzureBlobDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The path of the Azure Blob storage. Type: /// string (or Expression with resultType string). /// The root of blob path. Type: string @@ -55,8 +57,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), 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) + 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) { FolderPath = folderPath; TableRootLocation = tableRootLocation; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeStoreDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeStoreDataset.cs index 4d03fb865e37..9aab0369f830 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeStoreDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeStoreDataset.cs @@ -48,13 +48,15 @@ public AzureDataLakeStoreDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The name of the file in the Azure Data Lake /// Store. Type: string (or Expression with resultType string). /// 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), object fileName = default(object), DatasetStorageFormat format = default(DatasetStorageFormat), DatasetCompression compression = default(DatasetCompression)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + 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) { FolderPath = folderPath; FileName = fileName; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlTableDataset.cs index a738d8cca9ed..79fdf2538d9c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlTableDataset.cs @@ -46,10 +46,12 @@ public AzureMySqlTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The 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), object tableName = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + 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) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlTableDataset.cs index 19e29e0e7ae7..e89ebb6b5d78 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlTableDataset.cs @@ -45,8 +45,10 @@ public AzurePostgreSqlTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public AzurePostgreSqlTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSearchIndexDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSearchIndexDataset.cs index 91a96035ebe5..9e0d6a2b9d44 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSearchIndexDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSearchIndexDataset.cs @@ -48,8 +48,10 @@ public AzureSearchIndexDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { IndexName = indexName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWTableDataset.cs index 64f7a2a9c200..1dc1ca624c19 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWTableDataset.cs @@ -49,8 +49,10 @@ public AzureSqlDWTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlTableDataset.cs index 344fab85fe59..c57670f63545 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlTableDataset.cs @@ -48,8 +48,10 @@ public AzureSqlTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableDataset.cs index a4a9053a8889..81c293e13e1a 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureTableDataset.cs @@ -48,8 +48,10 @@ public AzureTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CassandraTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CassandraTableDataset.cs index 9c2a6bbb9f18..feba6abf8906 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CassandraTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CassandraTableDataset.cs @@ -46,12 +46,14 @@ public CassandraTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The table name of the Cassandra database. /// 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), object tableName = default(object), object keyspace = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + 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) { TableName = tableName; Keyspace = keyspace; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurObjectDataset.cs index 71bc06d75a98..562726884bb3 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ConcurObjectDataset.cs @@ -43,8 +43,10 @@ public ConcurObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public ConcurObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseTableDataset.cs index 81af7544dde1..9df94a71a90b 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseTableDataset.cs @@ -43,8 +43,10 @@ public CouchbaseTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public CouchbaseTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CreateLinkedIntegrationRuntimeRequest.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CreateLinkedIntegrationRuntimeRequest.cs new file mode 100644 index 000000000000..6e981cc138ce --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CreateLinkedIntegrationRuntimeRequest.cs @@ -0,0 +1,84 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The linked integration runtime information. + /// + public partial class CreateLinkedIntegrationRuntimeRequest + { + /// + /// Initializes a new instance of the + /// CreateLinkedIntegrationRuntimeRequest class. + /// + public CreateLinkedIntegrationRuntimeRequest() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// CreateLinkedIntegrationRuntimeRequest class. + /// + /// The name of the linked integration + /// runtime. + /// The ID of the subscription that the + /// linked integration runtime belongs to. + /// The name of the data factory that the + /// linked integration runtime belongs to. + /// The location of the data factory + /// that the linked integration runtime belongs to. + public CreateLinkedIntegrationRuntimeRequest(string name = default(string), string subscriptionId = default(string), string dataFactoryName = default(string), string dataFactoryLocation = default(string)) + { + Name = name; + SubscriptionId = subscriptionId; + DataFactoryName = dataFactoryName; + DataFactoryLocation = dataFactoryLocation; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the name of the linked integration runtime. + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + /// + /// Gets or sets the ID of the subscription that the linked integration + /// runtime belongs to. + /// + [JsonProperty(PropertyName = "subscriptionId")] + public string SubscriptionId { get; set; } + + /// + /// Gets or sets the name of the data factory that the linked + /// integration runtime belongs to. + /// + [JsonProperty(PropertyName = "dataFactoryName")] + public string DataFactoryName { get; set; } + + /// + /// Gets or sets the location of the data factory that the linked + /// integration runtime belongs to. + /// + [JsonProperty(PropertyName = "dataFactoryLocation")] + public string DataFactoryLocation { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CustomDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CustomDataset.cs index 39a59cb4c258..bdff76a41e95 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CustomDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CustomDataset.cs @@ -44,8 +44,10 @@ public CustomDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { 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 ddbd367706ff..96b4a44b3145 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/Dataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/Dataset.cs @@ -44,7 +44,9 @@ public Dataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public Dataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) + /// 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)) { AdditionalProperties = additionalProperties; Description = description; @@ -52,6 +54,7 @@ public Dataset() LinkedServiceName = linkedServiceName; Parameters = parameters; Annotations = annotations; + Folder = folder; CustomInit(); } @@ -100,6 +103,13 @@ public Dataset() [JsonProperty(PropertyName = "annotations")] public IList Annotations { get; set; } + /// + /// Gets or sets the folder that this Dataset is in. If not specified, + /// Dataset will appear at the root level. + /// + [JsonProperty(PropertyName = "folder")] + public DatasetFolder Folder { get; set; } + /// /// Validate the object. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DatasetFolder.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DatasetFolder.cs new file mode 100644 index 000000000000..a12c472feaf5 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DatasetFolder.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 folder that this Dataset is in. If not specified, Dataset will + /// appear at the root level. + /// + public partial class DatasetFolder + { + /// + /// Initializes a new instance of the DatasetFolder class. + /// + public DatasetFolder() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the DatasetFolder class. + /// + /// The name of the folder that this Dataset is + /// in. + public DatasetFolder(string name = default(string)) + { + Name = name; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the name of the folder that this Dataset is in. + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DependencyReference.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DependencyReference.cs new file mode 100644 index 000000000000..60817bd12d4e --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DependencyReference.cs @@ -0,0 +1,35 @@ +// +// 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 System.Linq; + + /// + /// Referenced dependency. + /// + public partial class DependencyReference + { + /// + /// Initializes a new instance of the DependencyReference class. + /// + public DependencyReference() + { + CustomInit(); + } + + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DocumentDbCollectionDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DocumentDbCollectionDataset.cs index 36025f21cb5f..02ee35917e75 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DocumentDbCollectionDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DocumentDbCollectionDataset.cs @@ -50,8 +50,10 @@ public DocumentDbCollectionDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CollectionName = collectionName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillTableDataset.cs index 37fcfa81d3e5..03296e5a5977 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillTableDataset.cs @@ -43,8 +43,10 @@ public DrillTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public DrillTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DynamicsEntityDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DynamicsEntityDataset.cs index 3969f056c7ec..4c308e4d619a 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DynamicsEntityDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DynamicsEntityDataset.cs @@ -46,10 +46,12 @@ public DynamicsEntityDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The 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), object entityName = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + 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) { 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 92773773f2a3..ffcec7f05424 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/EloquaObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/EloquaObjectDataset.cs @@ -43,8 +43,10 @@ public EloquaObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public EloquaObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FileShareDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FileShareDataset.cs index 2656903da8bb..ee5eaecf09e4 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FileShareDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FileShareDataset.cs @@ -46,6 +46,8 @@ public FileShareDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The path of the on-premises file system. /// Type: string (or Expression with resultType string). /// The name of the on-premises file system. @@ -56,8 +58,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), 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) + 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) { FolderPath = folderPath; FileName = fileName; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryObjectDataset.cs index 76ee62f75f67..a3c5f87e0a07 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryObjectDataset.cs @@ -45,8 +45,10 @@ public GoogleBigQueryObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public GoogleBigQueryObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumTableDataset.cs index bb1e86124470..e3d3a8e21129 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumTableDataset.cs @@ -43,8 +43,10 @@ public GreenplumTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public GreenplumTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HBaseObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HBaseObjectDataset.cs index 42c5b5fc7b83..cc1e811fcea6 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HBaseObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HBaseObjectDataset.cs @@ -43,8 +43,10 @@ public HBaseObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public HBaseObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveObjectDataset.cs index 9e0947c6222d..d85d29af3dea 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveObjectDataset.cs @@ -43,8 +43,10 @@ public HiveObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public HiveObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HttpDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HttpDataset.cs index 7cad00c74876..5777569b0d3f 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HttpDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HttpDataset.cs @@ -46,6 +46,8 @@ public HttpDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The relative URL based on the URL in the /// HttpLinkedService refers to an HTTP file Type: string (or /// Expression with resultType string). @@ -61,8 +63,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), 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) + 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) { RelativeUrl = relativeUrl; RequestMethod = requestMethod; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotObjectDataset.cs index 0d52610a9e87..d995f7f44998 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HubspotObjectDataset.cs @@ -43,8 +43,10 @@ public HubspotObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public HubspotObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ImpalaObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ImpalaObjectDataset.cs index 68b001392ee6..9a6c39b4f606 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ImpalaObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ImpalaObjectDataset.cs @@ -43,8 +43,10 @@ public ImpalaObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public ImpalaObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/IntegrationRuntimeUpdateResult.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/IntegrationRuntimeUpdateResult.cs index 98337e35529f..86c22f539002 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/IntegrationRuntimeUpdateResult.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/IntegrationRuntimeUpdateResult.cs @@ -16,6 +16,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// public static class IntegrationRuntimeUpdateResult { + public const string None = "None"; public const string Succeed = "Succeed"; public const string Fail = "Fail"; } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraObjectDataset.cs index 9a21f93eeff1..4e250dc99e71 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/JiraObjectDataset.cs @@ -43,8 +43,10 @@ public JiraObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public JiraObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MagentoObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MagentoObjectDataset.cs index d96522285f0f..9748f13a0d8c 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MagentoObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MagentoObjectDataset.cs @@ -43,8 +43,10 @@ public MagentoObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public MagentoObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBTableDataset.cs index c800f68bff17..0cef244385e7 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBTableDataset.cs @@ -43,8 +43,10 @@ public MariaDBTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public MariaDBTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MarketoObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MarketoObjectDataset.cs index d2ceed3fe713..fc7f7f0ed223 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MarketoObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MarketoObjectDataset.cs @@ -43,8 +43,10 @@ public MarketoObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public MarketoObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MongoDbCollectionDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MongoDbCollectionDataset.cs index 016c959f5fa9..3ae532bd5689 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MongoDbCollectionDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MongoDbCollectionDataset.cs @@ -49,8 +49,10 @@ public MongoDbCollectionDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CollectionName = collectionName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs index ececa25bb365..1f809cf1a91b 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs @@ -43,8 +43,10 @@ public NetezzaTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public NetezzaTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ODataResourceDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ODataResourceDataset.cs index cec1a54a1c42..88f02665c80f 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ODataResourceDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ODataResourceDataset.cs @@ -46,10 +46,12 @@ public ODataResourceDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The 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), object path = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + 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) { Path = path; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleTableDataset.cs index 3e597cdf77fd..d8589c335175 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleTableDataset.cs @@ -49,8 +49,10 @@ public OracleTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalObjectDataset.cs index 4258a67ff960..f682ec12cd12 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PaypalObjectDataset.cs @@ -43,8 +43,10 @@ public PaypalObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public PaypalObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PhoenixObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PhoenixObjectDataset.cs index 84772708422c..3648d1fbbbe0 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PhoenixObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PhoenixObjectDataset.cs @@ -43,8 +43,10 @@ public PhoenixObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public PhoenixObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PipelineFolder.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PipelineFolder.cs new file mode 100644 index 000000000000..7a2b303ef8a5 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PipelineFolder.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 folder that this Pipeline is in. If not specified, Pipeline will + /// appear at the root level. + /// + public partial class PipelineFolder + { + /// + /// Initializes a new instance of the PipelineFolder class. + /// + public PipelineFolder() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the PipelineFolder class. + /// + /// The name of the folder that this Pipeline is + /// in. + public PipelineFolder(string name = default(string)) + { + Name = name; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the name of the folder that this Pipeline is in. + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PipelineResource.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PipelineResource.cs index 5134a9bdabd8..525593e97988 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PipelineResource.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PipelineResource.cs @@ -47,7 +47,9 @@ public PipelineResource() /// pipeline. /// List of tags that can be used for /// describing the Pipeline. - public PipelineResource(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), IDictionary additionalProperties = default(IDictionary), string description = default(string), IList activities = default(IList), IDictionary parameters = default(IDictionary), int? concurrency = default(int?), IList annotations = default(IList)) + /// The folder that this Pipeline is in. If not + /// specified, Pipeline will appear at the root level. + public PipelineResource(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), IDictionary additionalProperties = default(IDictionary), string description = default(string), IList activities = default(IList), IDictionary parameters = default(IDictionary), int? concurrency = default(int?), IList annotations = default(IList), PipelineFolder folder = default(PipelineFolder)) : base(id, name, type, etag) { AdditionalProperties = additionalProperties; @@ -56,6 +58,7 @@ public PipelineResource() Parameters = parameters; Concurrency = concurrency; Annotations = annotations; + Folder = folder; CustomInit(); } @@ -102,6 +105,13 @@ public PipelineResource() [JsonProperty(PropertyName = "properties.annotations")] public IList Annotations { get; set; } + /// + /// Gets or sets the folder that this Pipeline is in. If not specified, + /// Pipeline will appear at the root level. + /// + [JsonProperty(PropertyName = "properties.folder")] + public PipelineFolder Folder { get; set; } + /// /// Validate the object. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PrestoObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PrestoObjectDataset.cs index a550bafb2ab4..f40a29552fb1 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PrestoObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/PrestoObjectDataset.cs @@ -43,8 +43,10 @@ public PrestoObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public PrestoObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/QuickBooksObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/QuickBooksObjectDataset.cs index c2e0603b607f..7de2019302a4 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/QuickBooksObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/QuickBooksObjectDataset.cs @@ -43,8 +43,10 @@ public QuickBooksObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public QuickBooksObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RelationalTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RelationalTableDataset.cs index a9ec4a983559..7882c4cc101e 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RelationalTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/RelationalTableDataset.cs @@ -46,10 +46,12 @@ public RelationalTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The 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), object tableName = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + 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) { 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 0d03e124d44d..3a517955c05e 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ResponsysObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ResponsysObjectDataset.cs @@ -43,8 +43,10 @@ public ResponsysObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public ResponsysObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceMarketingCloudObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceMarketingCloudObjectDataset.cs index 706aaaa27512..4f719b5bdee5 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceMarketingCloudObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceMarketingCloudObjectDataset.cs @@ -45,8 +45,10 @@ public SalesforceMarketingCloudObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public SalesforceMarketingCloudObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceObjectDataset.cs index ea3fff9a976a..c6d610c093ec 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SalesforceObjectDataset.cs @@ -46,10 +46,12 @@ public SalesforceObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The 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), object objectApiName = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + 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) { 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 e78fd17c796e..83d838f3cab5 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapCloudForCustomerResourceDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapCloudForCustomerResourceDataset.cs @@ -51,8 +51,10 @@ public SapCloudForCustomerResourceDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { 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 9149ae79cef1..1a9ee7d0f8a8 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapEccResourceDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SapEccResourceDataset.cs @@ -48,8 +48,10 @@ public SapEccResourceDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { Path = path; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfDependencyTumblingWindowTriggerReference.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfDependencyTumblingWindowTriggerReference.cs new file mode 100644 index 000000000000..d4fb78fa80b5 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfDependencyTumblingWindowTriggerReference.cs @@ -0,0 +1,110 @@ +// +// 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; + + /// + /// Self referenced tumbling window trigger dependency. + /// + public partial class SelfDependencyTumblingWindowTriggerReference : DependencyReference + { + /// + /// Initializes a new instance of the + /// SelfDependencyTumblingWindowTriggerReference class. + /// + public SelfDependencyTumblingWindowTriggerReference() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// SelfDependencyTumblingWindowTriggerReference class. + /// + /// Timespan applied to the start time of a + /// tumbling window when evaluating dependency. + /// The size of the window when evaluating the + /// dependency. If undefined the frequency of the tumbling window will + /// be used. + public SelfDependencyTumblingWindowTriggerReference(string offset, string size = default(string)) + { + Offset = offset; + Size = size; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets timespan applied to the start time of a tumbling + /// window when evaluating dependency. + /// + [JsonProperty(PropertyName = "offset")] + public string Offset { get; set; } + + /// + /// Gets or sets the size of the window when evaluating the dependency. + /// If undefined the frequency of the tumbling window will be used. + /// + [JsonProperty(PropertyName = "size")] + public string Size { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Offset == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Offset"); + } + if (Offset != null) + { + if (Offset.Length > 15) + { + throw new ValidationException(ValidationRules.MaxLength, "Offset", 15); + } + if (Offset.Length < 8) + { + throw new ValidationException(ValidationRules.MinLength, "Offset", 8); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(Offset, "((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))")) + { + throw new ValidationException(ValidationRules.Pattern, "Offset", "((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))"); + } + } + if (Size != null) + { + if (Size.Length > 15) + { + throw new ValidationException(ValidationRules.MaxLength, "Size", 15); + } + if (Size.Length < 8) + { + throw new ValidationException(ValidationRules.MinLength, "Size", 8); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(Size, "((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))")) + { + throw new ValidationException(ValidationRules.Pattern, "Size", "((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))"); + } + } + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfHostedIntegrationRuntimeNode.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfHostedIntegrationRuntimeNode.cs index 4a39549668ae..51c0fac30b2f 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfHostedIntegrationRuntimeNode.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfHostedIntegrationRuntimeNode.cs @@ -61,7 +61,7 @@ public SelfHostedIntegrationRuntimeNode() /// The integration runtime node last stop /// time. /// The result of the last integration - /// runtime node update. Possible values include: 'Succeed', + /// runtime node update. Possible values include: 'None', 'Succeed', /// 'Fail' /// The last time for the integration /// runtime node update start. @@ -188,7 +188,7 @@ public SelfHostedIntegrationRuntimeNode() /// /// Gets the result of the last integration runtime node update. - /// Possible values include: 'Succeed', 'Fail' + /// Possible values include: 'None', 'Succeed', 'Fail' /// [JsonProperty(PropertyName = "lastUpdateResult")] public string LastUpdateResult { get; private set; } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs index 0f03588c2b06..8a25db7afa95 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs @@ -78,7 +78,9 @@ public SelfHostedIntegrationRuntimeStatus() /// runtime is going to update to. /// The latest version on download /// center. - public SelfHostedIntegrationRuntimeStatus(IDictionary additionalProperties = default(IDictionary), string dataFactoryName = default(string), string state = default(string), System.DateTime? createTime = default(System.DateTime?), string taskQueueId = default(string), string internalChannelEncryption = default(string), string version = default(string), IList nodes = default(IList), System.DateTime? scheduledUpdateDate = default(System.DateTime?), string updateDelayOffset = default(string), string localTimeZoneOffset = default(string), IDictionary capabilities = default(IDictionary), IList serviceUrls = default(IList), string autoUpdate = default(string), string versionStatus = default(string), IList links = default(IList), string pushedVersion = default(string), string latestVersion = default(string)) + /// The estimated time when the self-hosted + /// integration runtime will be updated. + public SelfHostedIntegrationRuntimeStatus(IDictionary additionalProperties = default(IDictionary), string dataFactoryName = default(string), string state = default(string), System.DateTime? createTime = default(System.DateTime?), string taskQueueId = default(string), string internalChannelEncryption = default(string), string version = default(string), IList nodes = default(IList), System.DateTime? scheduledUpdateDate = default(System.DateTime?), string updateDelayOffset = default(string), string localTimeZoneOffset = default(string), IDictionary capabilities = default(IDictionary), IList serviceUrls = default(IList), string autoUpdate = default(string), string versionStatus = default(string), IList links = default(IList), string pushedVersion = default(string), string latestVersion = default(string), System.DateTime? autoUpdateETA = default(System.DateTime?)) : base(additionalProperties, dataFactoryName, state) { CreateTime = createTime; @@ -96,6 +98,7 @@ public SelfHostedIntegrationRuntimeStatus() Links = links; PushedVersion = pushedVersion; LatestVersion = latestVersion; + AutoUpdateETA = autoUpdateETA; CustomInit(); } @@ -205,5 +208,12 @@ public SelfHostedIntegrationRuntimeStatus() [JsonProperty(PropertyName = "typeProperties.latestVersion")] public string LatestVersion { get; private set; } + /// + /// Gets the estimated time when the self-hosted integration runtime + /// will be updated. + /// + [JsonProperty(PropertyName = "typeProperties.autoUpdateETA")] + public System.DateTime? AutoUpdateETA { get; private set; } + } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ServiceNowObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ServiceNowObjectDataset.cs index 2117ae8e6bcb..8ec7ad379e53 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ServiceNowObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ServiceNowObjectDataset.cs @@ -43,8 +43,10 @@ public ServiceNowObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public ServiceNowObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyObjectDataset.cs index 106f2b64bd15..4a69c0054139 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ShopifyObjectDataset.cs @@ -43,8 +43,10 @@ public ShopifyObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public ShopifyObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SparkObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SparkObjectDataset.cs index 3856874cbf8c..af8ab771d714 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SparkObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SparkObjectDataset.cs @@ -43,8 +43,10 @@ public SparkObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public SparkObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerTableDataset.cs index b157cd2cfb21..ae571416d38d 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerTableDataset.cs @@ -48,8 +48,10 @@ public SqlServerTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - 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)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { TableName = tableName; CustomInit(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareObjectDataset.cs index d9ae4ba8fc9c..4dcef03be0bc 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SquareObjectDataset.cs @@ -43,8 +43,10 @@ public SquareObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public SquareObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TriggerDependencyReference.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TriggerDependencyReference.cs new file mode 100644 index 000000000000..0081378e4e2b --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TriggerDependencyReference.cs @@ -0,0 +1,70 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// Trigger referenced dependency. + /// + public partial class TriggerDependencyReference : DependencyReference + { + /// + /// Initializes a new instance of the TriggerDependencyReference class. + /// + public TriggerDependencyReference() + { + ReferenceTrigger = new TriggerReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the TriggerDependencyReference class. + /// + /// Referenced trigger. + public TriggerDependencyReference(TriggerReference referenceTrigger) + { + ReferenceTrigger = referenceTrigger; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets referenced trigger. + /// + [JsonProperty(PropertyName = "referenceTrigger")] + public TriggerReference ReferenceTrigger { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (ReferenceTrigger == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ReferenceTrigger"); + } + if (ReferenceTrigger != null) + { + ReferenceTrigger.Validate(); + } + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TriggerReference.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TriggerReference.cs new file mode 100644 index 000000000000..2314904b1626 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TriggerReference.cs @@ -0,0 +1,78 @@ +// +// 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; + + /// + /// Trigger reference type. + /// + public partial class TriggerReference + { + /// + /// Initializes a new instance of the TriggerReference class. + /// + public TriggerReference() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the TriggerReference class. + /// + /// Reference trigger name. + public TriggerReference(string referenceName) + { + ReferenceName = referenceName; + CustomInit(); + } + /// + /// Static constructor for TriggerReference class. + /// + static TriggerReference() + { + Type = "TriggerReference"; + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets reference trigger name. + /// + [JsonProperty(PropertyName = "referenceName")] + public string ReferenceName { get; set; } + + /// + /// Trigger reference type. + /// + [JsonProperty(PropertyName = "type")] + public static string Type { get; private set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (ReferenceName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ReferenceName"); + } + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TumblingWindowTrigger.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TumblingWindowTrigger.cs index d06396b82776..43950e331cd0 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TumblingWindowTrigger.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TumblingWindowTrigger.cs @@ -65,7 +65,9 @@ public TumblingWindowTrigger() /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). /// Retry policy that will be applied for /// failed pipeline runs. - public TumblingWindowTrigger(TriggerPipelineReference pipeline, string frequency, int interval, System.DateTime startTime, int maxConcurrency, IDictionary additionalProperties = default(IDictionary), string description = default(string), string runtimeState = default(string), System.DateTime? endTime = default(System.DateTime?), object delay = default(object), RetryPolicy retryPolicy = default(RetryPolicy)) + /// Triggers that this trigger depends on. Only + /// tumbling window triggers are supported. + public TumblingWindowTrigger(TriggerPipelineReference pipeline, string frequency, int interval, System.DateTime startTime, int maxConcurrency, IDictionary additionalProperties = default(IDictionary), string description = default(string), string runtimeState = default(string), System.DateTime? endTime = default(System.DateTime?), object delay = default(object), RetryPolicy retryPolicy = default(RetryPolicy), IList dependsOn = default(IList)) : base(additionalProperties, description, runtimeState) { Pipeline = pipeline; @@ -76,6 +78,7 @@ public TumblingWindowTrigger() Delay = delay; MaxConcurrency = maxConcurrency; RetryPolicy = retryPolicy; + DependsOn = dependsOn; CustomInit(); } @@ -145,6 +148,13 @@ public TumblingWindowTrigger() [JsonProperty(PropertyName = "typeProperties.retryPolicy")] public RetryPolicy RetryPolicy { get; set; } + /// + /// Gets or sets triggers that this trigger depends on. Only tumbling + /// window triggers are supported. + /// + [JsonProperty(PropertyName = "typeProperties.dependsOn")] + public IList DependsOn { get; set; } + /// /// Validate the object. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TumblingWindowTriggerDependencyReference.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TumblingWindowTriggerDependencyReference.cs new file mode 100644 index 000000000000..3c26484919d2 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TumblingWindowTriggerDependencyReference.cs @@ -0,0 +1,110 @@ +// +// 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; + + /// + /// Referenced tumbling window trigger dependency. + /// + public partial class TumblingWindowTriggerDependencyReference : TriggerDependencyReference + { + /// + /// Initializes a new instance of the + /// TumblingWindowTriggerDependencyReference class. + /// + public TumblingWindowTriggerDependencyReference() + { + ReferenceTrigger = new TriggerReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// TumblingWindowTriggerDependencyReference class. + /// + /// Referenced trigger. + /// Timespan applied to the start time of a + /// tumbling window when evaluating dependency. + /// The size of the window when evaluating the + /// dependency. If undefined the frequency of the tumbling window will + /// be used. + public TumblingWindowTriggerDependencyReference(TriggerReference referenceTrigger, string offset = default(string), string size = default(string)) + : base(referenceTrigger) + { + Offset = offset; + Size = size; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets timespan applied to the start time of a tumbling + /// window when evaluating dependency. + /// + [JsonProperty(PropertyName = "offset")] + public string Offset { get; set; } + + /// + /// Gets or sets the size of the window when evaluating the dependency. + /// If undefined the frequency of the tumbling window will be used. + /// + [JsonProperty(PropertyName = "size")] + public string Size { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (Offset != null) + { + if (Offset.Length > 15) + { + throw new ValidationException(ValidationRules.MaxLength, "Offset", 15); + } + if (Offset.Length < 8) + { + throw new ValidationException(ValidationRules.MinLength, "Offset", 8); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(Offset, "((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))")) + { + throw new ValidationException(ValidationRules.Pattern, "Offset", "((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))"); + } + } + if (Size != null) + { + if (Size.Length > 15) + { + throw new ValidationException(ValidationRules.MaxLength, "Size", 15); + } + if (Size.Length < 8) + { + throw new ValidationException(ValidationRules.MinLength, "Size", 8); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(Size, "((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))")) + { + throw new ValidationException(ValidationRules.Pattern, "Size", "((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))"); + } + } + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs index 95499b17d26e..7ad2b1b51183 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs @@ -43,8 +43,10 @@ public VerticaTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public VerticaTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebTableDataset.cs index 7b7d8db81629..ca8fe1307e07 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebTableDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebTableDataset.cs @@ -49,11 +49,13 @@ public WebTableDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. /// The 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), object path = default(object)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + 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) { Index = index; Path = path; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroObjectDataset.cs index c42dde5a197a..77c697c59bbc 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/XeroObjectDataset.cs @@ -43,8 +43,10 @@ public XeroObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public XeroObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ZohoObjectDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ZohoObjectDataset.cs index 29f76445e8e8..4a5b7a20cf22 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ZohoObjectDataset.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/ZohoObjectDataset.cs @@ -43,8 +43,10 @@ public ZohoObjectDataset() /// Parameters for dataset. /// List of tags that can be used for /// describing the Dataset. - public ZohoObjectDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) - : base(linkedServiceName, additionalProperties, description, structure, parameters, annotations) + /// 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) { CustomInit(); } 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 d9b48c878feb..a5adddc66159 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj +++ b/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj @@ -11,8 +11,8 @@ Microsoft Azure resource management;Data Factory;ADF; diff --git a/src/SDKs/_metadata/datafactory_resource-manager.txt b/src/SDKs/_metadata/datafactory_resource-manager.txt index e8da1dbb9113..e9090fa2bc03 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:\github\azure-sdk-for-net\src\SDKs -2018-08-06 02:14:44 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:\VSO\GitHub\azure-sdk-for-net\src\SDKs +2018-08-30 22:26:02 UTC 1) azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: b310c2c2fb6b303a29d5273b757bbcd1f6f9befa +Commit: 7174e9631ec243b626c768f81187a0877cefab4f 2) AutoRest information Requested version: latest