diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs index bde22556c0bf..a3212c17b95b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs @@ -140,11 +140,6 @@ public partial class DataFactoryManagementClient : ServiceClient public virtual ITriggerRunsOperations TriggerRuns { get; private set; } - /// - /// Gets the IRerunTriggersOperations. - /// - public virtual IRerunTriggersOperations RerunTriggers { get; private set; } - /// /// Gets the IDataFlowsOperations. /// @@ -409,7 +404,6 @@ private void Initialize() ActivityRuns = new ActivityRunsOperations(this); Triggers = new TriggersOperations(this); TriggerRuns = new TriggerRunsOperations(this); - RerunTriggers = new RerunTriggersOperations(this); DataFlows = new DataFlowsOperations(this); DataFlowDebugSession = new DataFlowDebugSessionOperations(this); BaseUri = new System.Uri("https://management.azure.com"); @@ -461,8 +455,6 @@ 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("authenticationType")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("authenticationType")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); @@ -471,6 +463,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/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IDataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IDataFactoryManagementClient.cs index 1648e0af85c1..6b3e521ca6b1 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IDataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IDataFactoryManagementClient.cs @@ -135,11 +135,6 @@ public partial interface IDataFactoryManagementClient : System.IDisposable /// ITriggerRunsOperations TriggerRuns { get; } - /// - /// Gets the IRerunTriggersOperations. - /// - IRerunTriggersOperations RerunTriggers { get; } - /// /// Gets the IDataFlowsOperations. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IPipelinesOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IPipelinesOperations.cs index 48d598980f38..89211bd513d6 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IPipelinesOperations.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IPipelinesOperations.cs @@ -167,6 +167,11 @@ public partial interface IPipelinesOperations /// In recovery mode, the rerun will start from this activity. If not /// specified, all activities will run. /// + /// + /// In recovery mode, if set to true, the rerun will start from failed + /// activities. The property will be used only if startActivityName is + /// not specified. + /// /// /// Parameters of the pipeline run. These parameters will be used only /// if the runId is not specified. @@ -186,7 +191,7 @@ public partial interface IPipelinesOperations /// /// Thrown when a required parameter is null /// - Task> CreateRunWithHttpMessagesAsync(string resourceGroupName, string factoryName, string pipelineName, string referencePipelineRunId = default(string), bool? isRecovery = default(bool?), string startActivityName = default(string), IDictionary parameters = default(IDictionary), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> CreateRunWithHttpMessagesAsync(string resourceGroupName, string factoryName, string pipelineName, string referencePipelineRunId = default(string), bool? isRecovery = default(bool?), string startActivityName = default(string), bool? startFromFailure = default(bool?), IDictionary parameters = default(IDictionary), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Lists pipelines. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IRerunTriggersOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IRerunTriggersOperations.cs deleted file mode 100644 index 6bdfcfcbae66..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IRerunTriggersOperations.cs +++ /dev/null @@ -1,279 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.DataFactory -{ - using Microsoft.Rest; - using Microsoft.Rest.Azure; - using Models; - using System.Collections; - using System.Collections.Generic; - using System.Threading; - using System.Threading.Tasks; - - /// - /// RerunTriggersOperations operations. - /// - public partial interface IRerunTriggersOperations - { - /// - /// Creates a rerun trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// Rerun tumbling window trigger action parameters. - /// - /// - /// 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> CreateWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, RerunTumblingWindowTriggerActionParameters rerunTumblingWindowTriggerActionParameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Starts a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when a required parameter is null - /// - Task StartWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Stops a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when a required parameter is null - /// - Task StopWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Cancels a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when a required parameter is null - /// - Task CancelWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Lists rerun triggers by an original trigger name. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger 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>> ListByTriggerWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Starts a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when a required parameter is null - /// - Task BeginStartWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Stops a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when a required parameter is null - /// - Task BeginStopWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Cancels a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// Thrown when a required parameter is null - /// - Task BeginCancelWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// - /// Lists rerun triggers by an original trigger name. - /// - /// - /// The NextLink from the previous successful call to List operation. - /// - /// - /// 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>> ListByTriggerNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ITriggersOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ITriggersOperations.cs index 62dd32263d05..547a650d4356 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ITriggersOperations.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ITriggersOperations.cs @@ -49,6 +49,34 @@ public partial interface ITriggersOperations /// Task>> ListByFactoryWithHttpMessagesAsync(string resourceGroupName, string factoryName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// + /// Query triggers. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// Parameters to filter the triggers. + /// + /// + /// 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> QueryByFactoryWithHttpMessagesAsync(string resourceGroupName, string factoryName, TriggerFilterParameters filterParameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// /// Creates or updates a trigger. /// /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AdditionalColumns.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AdditionalColumns.cs new file mode 100644 index 000000000000..d4079785c195 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AdditionalColumns.cs @@ -0,0 +1,63 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Specify the column name and value of additional columns. + /// + public partial class AdditionalColumns + { + /// + /// Initializes a new instance of the AdditionalColumns class. + /// + public AdditionalColumns() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AdditionalColumns class. + /// + /// Additional column name. Type: string (or + /// Expression with resultType string). + /// Additional column value. Type: string (or + /// Expression with resultType string). + public AdditionalColumns(object name = default(object), object value = default(object)) + { + Name = name; + Value = value; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets additional column name. Type: string (or Expression + /// with resultType string). + /// + [JsonProperty(PropertyName = "name")] + public object Name { get; set; } + + /// + /// Gets or sets additional column value. Type: string (or Expression + /// with resultType string). + /// + [JsonProperty(PropertyName = "value")] + public object Value { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonMWSSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonMWSSource.cs index 1965de087366..80a37d728bf6 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonMWSSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonMWSSource.cs @@ -44,10 +44,13 @@ public AmazonMWSSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public AmazonMWSSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public AmazonMWSSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRedshiftSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRedshiftSource.cs index 317ba9ac9fbc..80ddc2c7b95f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRedshiftSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRedshiftSource.cs @@ -44,6 +44,9 @@ public AmazonRedshiftSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Database query. Type: string (or Expression /// with resultType string). /// The Amazon S3 settings needed @@ -51,8 +54,8 @@ public AmazonRedshiftSource() /// unload. With this, data from Amazon Redshift source will be /// unloaded into S3 first and then copied into the targeted sink from /// the interim S3. - public AmazonRedshiftSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object), RedshiftUnloadSettings redshiftUnloadSettings = default(RedshiftUnloadSettings)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public AmazonRedshiftSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), RedshiftUnloadSettings redshiftUnloadSettings = default(RedshiftUnloadSettings)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; RedshiftUnloadSettings = redshiftUnloadSettings; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3ReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3ReadSettings.cs index a94b20c1ebb6..4ce73036ecde 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3ReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3ReadSettings.cs @@ -45,6 +45,10 @@ public AmazonS3ReadSettings() /// string (or Expression with resultType string). /// The prefix filter for the S3 object name. /// Type: string (or Expression with resultType string). + /// Point to a text file that lists each + /// file (relative path to the path configured in the dataset) that you + /// want to copy. Type: string (or Expression with resultType + /// string). /// Indicates whether to enable /// partition discovery. /// The start of file's modified @@ -53,13 +57,14 @@ public AmazonS3ReadSettings() /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public AmazonS3ReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public AmazonS3ReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; Prefix = prefix; + FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; @@ -100,6 +105,14 @@ public AmazonS3ReadSettings() [JsonProperty(PropertyName = "prefix")] public object Prefix { get; set; } + /// + /// Gets or sets point to a text file that lists each file (relative + /// path to the path configured in the dataset) that you want to copy. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "fileListPath")] + public object FileListPath { get; set; } + /// /// Gets or sets indicates whether to enable partition discovery. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroSource.cs index a9db6543e6f3..f1d8804fbda2 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroSource.cs @@ -42,10 +42,14 @@ public AvroSource() /// connection count for the source data store. Type: integer (or /// Expression with resultType integer). /// Avro store settings. - public AvroSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public AvroSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { StoreSettings = storeSettings; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -60,5 +64,13 @@ public AvroSource() [JsonProperty(PropertyName = "storeSettings")] public StoreReadSettings StoreSettings { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSReadSettings.cs index 2afd1910a6a2..92c63e019061 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSReadSettings.cs @@ -43,6 +43,10 @@ public AzureBlobFSReadSettings() /// Type: string (or Expression with resultType string). /// Azure blobFS wildcardFileName. Type: /// string (or Expression with resultType string). + /// Point to a text file that lists each + /// file (relative path to the path configured in the dataset) that you + /// want to copy. Type: string (or Expression with resultType + /// string). /// Indicates whether to enable /// partition discovery. /// The start of file's modified @@ -51,12 +55,13 @@ public AzureBlobFSReadSettings() /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public AzureBlobFSReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public AzureBlobFSReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; + FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; @@ -90,6 +95,14 @@ public AzureBlobFSReadSettings() [JsonProperty(PropertyName = "wildcardFileName")] public object WildcardFileName { get; set; } + /// + /// Gets or sets point to a text file that lists each file (relative + /// path to the path configured in the dataset) that you want to copy. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "fileListPath")] + public object FileListPath { get; set; } + /// /// Gets or sets indicates whether to enable partition discovery. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageReadSettings.cs index 7ac7e7fb19f7..13cabe849e29 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageReadSettings.cs @@ -47,6 +47,10 @@ public AzureBlobStorageReadSettings() /// string (or Expression with resultType string). /// The prefix filter for the Azure Blob name. /// Type: string (or Expression with resultType string). + /// Point to a text file that lists each + /// file (relative path to the path configured in the dataset) that you + /// want to copy. Type: string (or Expression with resultType + /// string). /// Indicates whether to enable /// partition discovery. /// The start of file's modified @@ -55,13 +59,14 @@ public AzureBlobStorageReadSettings() /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public AzureBlobStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public AzureBlobStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; Prefix = prefix; + FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; @@ -102,6 +107,14 @@ public AzureBlobStorageReadSettings() [JsonProperty(PropertyName = "prefix")] public object Prefix { get; set; } + /// + /// Gets or sets point to a text file that lists each file (relative + /// path to the path configured in the dataset) that you want to copy. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "fileListPath")] + public object FileListPath { get; set; } + /// /// Gets or sets indicates whether to enable partition discovery. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerSource.cs index 4d9ba47e7811..7874791ec0ea 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerSource.cs @@ -51,12 +51,16 @@ public AzureDataExplorerSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).. - public AzureDataExplorerSource(object query, IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object noTruncation = default(object), object queryTimeout = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public AzureDataExplorerSource(object query, IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object noTruncation = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; NoTruncation = noTruncation; QueryTimeout = queryTimeout; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -88,6 +92,14 @@ public AzureDataExplorerSource() [JsonProperty(PropertyName = "queryTimeout")] public object QueryTimeout { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreReadSettings.cs index 05a02584370a..9fa96ee976cd 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreReadSettings.cs @@ -45,6 +45,10 @@ public AzureDataLakeStoreReadSettings() /// string (or Expression with resultType string). /// ADLS wildcardFileName. Type: string /// (or Expression with resultType string). + /// Point to a text file that lists each + /// file (relative path to the path configured in the dataset) that you + /// want to copy. Type: string (or Expression with resultType + /// string). /// Indicates whether to enable /// partition discovery. /// The start of file's modified @@ -53,12 +57,13 @@ public AzureDataLakeStoreReadSettings() /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public AzureDataLakeStoreReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public AzureDataLakeStoreReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; + FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; @@ -92,6 +97,14 @@ public AzureDataLakeStoreReadSettings() [JsonProperty(PropertyName = "wildcardFileName")] public object WildcardFileName { get; set; } + /// + /// Gets or sets point to a text file that lists each file (relative + /// path to the path configured in the dataset) that you want to copy. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "fileListPath")] + public object FileListPath { get; set; } + /// /// Gets or sets indicates whether to enable partition discovery. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs index 6a3e6a6958a7..8b187af31cc6 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreWriteSettings.cs @@ -10,6 +10,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -39,9 +40,14 @@ public AzureDataLakeStoreWriteSettings() /// Expression with resultType integer). /// The type of copy behavior for copy /// sink. - public AzureDataLakeStoreWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object)) + /// Specifies the expiry time of the + /// written files. The time is applied to the UTC time zone in the + /// format of "2018-12-01T05:00:00Z". Default value is NULL. Type: + /// integer (or Expression with resultType integer). + public AzureDataLakeStoreWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object expiryDateTime = default(object)) : base(additionalProperties, maxConcurrentConnections, copyBehavior) { + ExpiryDateTime = expiryDateTime; CustomInit(); } @@ -50,5 +56,14 @@ public AzureDataLakeStoreWriteSettings() /// partial void CustomInit(); + /// + /// Gets or sets specifies the expiry time of the written files. The + /// time is applied to the UTC time zone in the format of + /// "2018-12-01T05:00:00Z". Default value is NULL. Type: integer (or + /// Expression with resultType integer). + /// + [JsonProperty(PropertyName = "expiryDateTime")] + public object ExpiryDateTime { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageReadSettings.cs index 5387770f8ecf..7ac6d4991c95 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageReadSettings.cs @@ -46,6 +46,10 @@ public AzureFileStorageReadSettings() /// string). /// Azure File Storage wildcardFileName. /// Type: string (or Expression with resultType string). + /// Point to a text file that lists each + /// file (relative path to the path configured in the dataset) that you + /// want to copy. Type: string (or Expression with resultType + /// string). /// Indicates whether to enable /// partition discovery. /// The start of file's modified @@ -54,12 +58,13 @@ public AzureFileStorageReadSettings() /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public AzureFileStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public AzureFileStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; + FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; @@ -93,6 +98,14 @@ public AzureFileStorageReadSettings() [JsonProperty(PropertyName = "wildcardFileName")] public object WildcardFileName { get; set; } + /// + /// Gets or sets point to a text file that lists each file (relative + /// path to the path configured in the dataset) that you want to copy. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "fileListPath")] + public object FileListPath { get; set; } + /// /// Gets or sets indicates whether to enable partition discovery. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMariaDBSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMariaDBSource.cs index fab56117f776..40648531bb38 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMariaDBSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMariaDBSource.cs @@ -44,10 +44,13 @@ public AzureMariaDBSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public AzureMariaDBSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public AzureMariaDBSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMySqlSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMySqlSource.cs index 271b2ccf16c4..1eb1ed222b18 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMySqlSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMySqlSource.cs @@ -44,10 +44,13 @@ public AzureMySqlSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Database query. Type: string (or Expression /// with resultType string). - public AzureMySqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public AzureMySqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzurePostgreSqlSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzurePostgreSqlSource.cs index fb6c1e2b7766..97b8d0ecd64e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzurePostgreSqlSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzurePostgreSqlSource.cs @@ -44,10 +44,13 @@ public AzurePostgreSqlSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public AzurePostgreSqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public AzurePostgreSqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlSource.cs index a8fcccee6c6c..7efd3dd7e98a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlSource.cs @@ -44,6 +44,9 @@ public AzureSqlSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// SQL reader query. Type: string (or /// Expression with resultType string). /// Name of the stored @@ -55,8 +58,8 @@ public AzureSqlSource() /// type: "int"}}". /// Which additional types to /// produce. - public AzureSqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public AzureSqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { SqlReaderQuery = sqlReaderQuery; SqlReaderStoredProcedureName = sqlReaderStoredProcedureName; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureTableSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureTableSource.cs index 1c3c9b40087a..c7d9c98a7e1f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureTableSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureTableSource.cs @@ -44,13 +44,16 @@ public AzureTableSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Azure Table source query. Type: /// string (or Expression with resultType string). /// Azure Table /// source ignore table not found. Type: boolean (or Expression with /// resultType boolean). - public AzureTableSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object azureTableSourceQuery = default(object), object azureTableSourceIgnoreTableNotFound = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public AzureTableSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object azureTableSourceQuery = default(object), object azureTableSourceIgnoreTableNotFound = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { AzureTableSourceQuery = azureTableSourceQuery; AzureTableSourceIgnoreTableNotFound = azureTableSourceIgnoreTableNotFound; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CassandraSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CassandraSource.cs index 6a390c452568..facd12079d67 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CassandraSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CassandraSource.cs @@ -44,6 +44,9 @@ public CassandraSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Database query. Should be a SQL-92 query /// expression or Cassandra Query Language (CQL) command. Type: string /// (or Expression with resultType string). @@ -55,8 +58,8 @@ public CassandraSource() /// default value is 'ONE'. It is case-insensitive. Possible values /// include: 'ALL', 'EACH_QUORUM', 'QUORUM', 'LOCAL_QUORUM', 'ONE', /// 'TWO', 'THREE', 'LOCAL_ONE', 'SERIAL', 'LOCAL_SERIAL' - public CassandraSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object), string consistencyLevel = default(string)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public CassandraSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), string consistencyLevel = default(string)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; ConsistencyLevel = consistencyLevel; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CommonDataServiceForAppsSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CommonDataServiceForAppsSource.cs index 62918054e7ca..345946dc3feb 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CommonDataServiceForAppsSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CommonDataServiceForAppsSource.cs @@ -47,10 +47,14 @@ public CommonDataServiceForAppsSource() /// is used in Microsoft Common Data Service for Apps (online & /// on-premises). Type: string (or Expression with resultType /// string). - public CommonDataServiceForAppsSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public CommonDataServiceForAppsSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -67,5 +71,13 @@ public CommonDataServiceForAppsSource() [JsonProperty(PropertyName = "query")] public object Query { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ConcurSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ConcurSource.cs index a68413bd0f3f..8f66fe7350da 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ConcurSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ConcurSource.cs @@ -44,10 +44,13 @@ public ConcurSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public ConcurSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public ConcurSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivity.cs index a6a42760fc92..f65561ed3f87 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivity.cs @@ -65,11 +65,18 @@ public CopyActivity() /// Expression with resultType boolean). /// Redirect incompatible /// row settings when EnableSkipIncompatibleRow is true. + /// Log storage settings customer need + /// to provide when enabling session log. /// Preserve Rules. /// Preserve rules. + /// Whether to enable Data + /// Consistency validation. Type: boolean (or Expression with + /// resultType boolean). + /// Specify the fault tolerance for data + /// consistency. /// List of inputs for the activity. /// List of outputs for the activity. - public CopyActivity(string name, CopySource source, CopySink sink, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object translator = default(object), object enableStaging = default(object), StagingSettings stagingSettings = default(StagingSettings), object parallelCopies = default(object), object dataIntegrationUnits = default(object), object enableSkipIncompatibleRow = default(object), RedirectIncompatibleRowSettings redirectIncompatibleRowSettings = default(RedirectIncompatibleRowSettings), IList preserveRules = default(IList), IList preserve = default(IList), IList inputs = default(IList), IList outputs = default(IList)) + public CopyActivity(string name, CopySource source, CopySink sink, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object translator = default(object), object enableStaging = default(object), StagingSettings stagingSettings = default(StagingSettings), object parallelCopies = default(object), object dataIntegrationUnits = default(object), object enableSkipIncompatibleRow = default(object), RedirectIncompatibleRowSettings redirectIncompatibleRowSettings = default(RedirectIncompatibleRowSettings), LogStorageSettings logStorageSettings = default(LogStorageSettings), IList preserveRules = default(IList), IList preserve = default(IList), object validateDataConsistency = default(object), SkipErrorFile skipErrorFile = default(SkipErrorFile), IList inputs = default(IList), IList outputs = default(IList)) : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) { Source = source; @@ -81,8 +88,11 @@ public CopyActivity() DataIntegrationUnits = dataIntegrationUnits; EnableSkipIncompatibleRow = enableSkipIncompatibleRow; RedirectIncompatibleRowSettings = redirectIncompatibleRowSettings; + LogStorageSettings = logStorageSettings; PreserveRules = preserveRules; Preserve = preserve; + ValidateDataConsistency = validateDataConsistency; + SkipErrorFile = skipErrorFile; Inputs = inputs; Outputs = outputs; CustomInit(); @@ -157,6 +167,13 @@ public CopyActivity() [JsonProperty(PropertyName = "typeProperties.redirectIncompatibleRowSettings")] public RedirectIncompatibleRowSettings RedirectIncompatibleRowSettings { get; set; } + /// + /// Gets or sets log storage settings customer need to provide when + /// enabling session log. + /// + [JsonProperty(PropertyName = "typeProperties.logStorageSettings")] + public LogStorageSettings LogStorageSettings { get; set; } + /// /// Gets or sets preserve Rules. /// @@ -169,6 +186,19 @@ public CopyActivity() [JsonProperty(PropertyName = "typeProperties.preserve")] public IList Preserve { get; set; } + /// + /// Gets or sets whether to enable Data Consistency validation. Type: + /// boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "typeProperties.validateDataConsistency")] + public object ValidateDataConsistency { get; set; } + + /// + /// Gets or sets specify the fault tolerance for data consistency. + /// + [JsonProperty(PropertyName = "typeProperties.skipErrorFile")] + public SkipErrorFile SkipErrorFile { get; set; } + /// /// Gets or sets list of inputs for the activity. /// @@ -206,6 +236,10 @@ public override void Validate() { RedirectIncompatibleRowSettings.Validate(); } + if (LogStorageSettings != null) + { + LogStorageSettings.Validate(); + } if (Inputs != null) { foreach (var element in Inputs) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbMongoDbApiSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbMongoDbApiSource.cs index a7d888f3a776..ec910ea1d7f3 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbMongoDbApiSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbMongoDbApiSource.cs @@ -56,13 +56,17 @@ public CosmosDbMongoDbApiSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). - public CosmosDbMongoDbApiSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object filter = default(object), MongoDbCursorMethodsProperties cursorMethods = default(MongoDbCursorMethodsProperties), object batchSize = default(object), object queryTimeout = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public CosmosDbMongoDbApiSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object filter = default(object), MongoDbCursorMethodsProperties cursorMethods = default(MongoDbCursorMethodsProperties), object batchSize = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Filter = filter; CursorMethods = cursorMethods; BatchSize = batchSize; QueryTimeout = queryTimeout; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -105,5 +109,13 @@ public CosmosDbMongoDbApiSource() [JsonProperty(PropertyName = "queryTimeout")] public object QueryTimeout { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbSqlApiSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbSqlApiSource.cs index b51433059c56..19f4c02b6a24 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbSqlApiSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbSqlApiSource.cs @@ -47,12 +47,16 @@ public CosmosDbSqlApiSource() /// Expression with resultType integer). /// Preferred regions. Type: array of /// strings (or Expression with resultType array of strings). - public CosmosDbSqlApiSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), object pageSize = default(object), object preferredRegions = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public CosmosDbSqlApiSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), object pageSize = default(object), object preferredRegions = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; PageSize = pageSize; PreferredRegions = preferredRegions; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -82,5 +86,13 @@ public CosmosDbSqlApiSource() [JsonProperty(PropertyName = "preferredRegions")] public object PreferredRegions { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CouchbaseSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CouchbaseSource.cs index c99c151ca728..da869996583f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CouchbaseSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CouchbaseSource.cs @@ -44,10 +44,13 @@ public CouchbaseSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public CouchbaseSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public CouchbaseSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2LinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2LinkedService.cs index 382b0cb0468f..a7ee7e576d6b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2LinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2LinkedService.cs @@ -35,10 +35,6 @@ public Db2LinkedService() /// /// Initializes a new instance of the Db2LinkedService class. /// - /// Server name for connection. Type: string (or - /// Expression with resultType string). - /// Database name for connection. Type: string - /// (or Expression with resultType string). /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -46,24 +42,40 @@ public Db2LinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the linked service. + /// The connection string. It is + /// mutually exclusive with server, database, authenticationType, + /// userName, packageCollection and certificateCommonName property. + /// Type: string, SecureString or AzureKeyVaultSecretReference. + /// Server name for connection. It is mutually + /// exclusive with connectionString property. Type: string (or + /// Expression with resultType string). + /// Database name for connection. It is mutually + /// exclusive with connectionString property. Type: string (or + /// Expression with resultType string). /// AuthenticationType to be used for - /// connection. Possible values include: 'Basic' - /// Username for authentication. Type: string - /// (or Expression with resultType string). + /// connection. It is mutually exclusive with connectionString + /// property. Possible values include: 'Basic' + /// Username for authentication. It is mutually + /// exclusive with connectionString property. Type: string (or + /// Expression with resultType string). /// Password for authentication. /// Under where packages are created - /// when querying database. Type: string (or Expression with resultType - /// string). + /// when querying database. It is mutually exclusive with + /// connectionString property. Type: string (or Expression with + /// resultType string). /// Certificate Common Name when - /// TLS is enabled. Type: string (or Expression with resultType + /// TLS is enabled. It is mutually exclusive with connectionString + /// property. Type: string (or Expression with resultType /// string). /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration - /// runtime credential manager. Type: string (or Expression with + /// runtime credential manager. It is mutually exclusive with + /// connectionString property. Type: string (or Expression with /// resultType string). - public Db2LinkedService(object server, object database, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), string authenticationType = default(string), object username = default(object), SecretBase password = default(SecretBase), object packageCollection = default(object), object certificateCommonName = default(object), object encryptedCredential = default(object)) + public Db2LinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object server = default(object), object database = default(object), string authenticationType = default(string), object username = default(object), SecretBase password = default(SecretBase), object packageCollection = default(object), object certificateCommonName = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { + ConnectionString = connectionString; Server = server; Database = database; AuthenticationType = authenticationType; @@ -81,29 +93,42 @@ public Db2LinkedService() partial void CustomInit(); /// - /// Gets or sets server name for connection. Type: string (or - /// Expression with resultType string). + /// Gets or sets the connection string. It is mutually exclusive with + /// server, database, authenticationType, userName, packageCollection + /// and certificateCommonName property. Type: string, SecureString or + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.connectionString")] + public object ConnectionString { get; set; } + + /// + /// Gets or sets server name for connection. It is mutually exclusive + /// with connectionString property. Type: string (or Expression with + /// resultType string). /// [JsonProperty(PropertyName = "typeProperties.server")] public object Server { get; set; } /// - /// Gets or sets database name for connection. Type: string (or - /// Expression with resultType string). + /// Gets or sets database name for connection. It is mutually exclusive + /// with connectionString property. Type: string (or Expression with + /// resultType string). /// [JsonProperty(PropertyName = "typeProperties.database")] public object Database { get; set; } /// - /// Gets or sets authenticationType to be used for connection. Possible - /// values include: 'Basic' + /// Gets or sets authenticationType to be used for connection. It is + /// mutually exclusive with connectionString property. Possible values + /// include: 'Basic' /// [JsonProperty(PropertyName = "typeProperties.authenticationType")] public string AuthenticationType { get; set; } /// - /// Gets or sets username for authentication. Type: string (or - /// Expression with resultType string). + /// Gets or sets username for authentication. It is mutually exclusive + /// with connectionString property. Type: string (or Expression with + /// resultType string). /// [JsonProperty(PropertyName = "typeProperties.username")] public object Username { get; set; } @@ -116,14 +141,16 @@ public Db2LinkedService() /// /// Gets or sets under where packages are created when querying - /// database. Type: string (or Expression with resultType string). + /// database. It is mutually exclusive with connectionString property. + /// Type: string (or Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.packageCollection")] public object PackageCollection { get; set; } /// - /// Gets or sets certificate Common Name when TLS is enabled. Type: - /// string (or Expression with resultType string). + /// Gets or sets certificate Common Name when TLS is enabled. It is + /// mutually exclusive with connectionString property. Type: string (or + /// Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.certificateCommonName")] public object CertificateCommonName { get; set; } @@ -131,7 +158,8 @@ public Db2LinkedService() /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential - /// manager. Type: string (or Expression with resultType string). + /// manager. It is mutually exclusive with connectionString property. + /// Type: string (or Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } @@ -145,14 +173,6 @@ public Db2LinkedService() public override void Validate() { base.Validate(); - if (Server == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Server"); - } - if (Database == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Database"); - } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2Source.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2Source.cs index 31da677d4cf1..bbe1de583988 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2Source.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2Source.cs @@ -44,10 +44,13 @@ public Db2Source() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Database query. Type: string (or Expression /// with resultType string). - public Db2Source(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public Db2Source(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextSource.cs index fcad2fd74754..b178382f617c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DelimitedTextSource.cs @@ -43,11 +43,15 @@ public DelimitedTextSource() /// Expression with resultType integer). /// DelimitedText store settings. /// DelimitedText format settings. - public DelimitedTextSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), DelimitedTextReadSettings formatSettings = default(DelimitedTextReadSettings)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public DelimitedTextSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), DelimitedTextReadSettings formatSettings = default(DelimitedTextReadSettings), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { StoreSettings = storeSettings; FormatSettings = formatSettings; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -68,5 +72,13 @@ public DelimitedTextSource() [JsonProperty(PropertyName = "formatSettings")] public DelimitedTextReadSettings FormatSettings { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DocumentDbCollectionSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DocumentDbCollectionSource.cs index bb1e8829290b..250c63772c0c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DocumentDbCollectionSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DocumentDbCollectionSource.cs @@ -48,12 +48,16 @@ public DocumentDbCollectionSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). - public DocumentDbCollectionSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), object nestingSeparator = default(object), object queryTimeout = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public DocumentDbCollectionSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), object nestingSeparator = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; NestingSeparator = nestingSeparator; QueryTimeout = queryTimeout; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -84,5 +88,13 @@ public DocumentDbCollectionSource() [JsonProperty(PropertyName = "queryTimeout")] public object QueryTimeout { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DrillSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DrillSource.cs index 47ff594fc4c7..3753001f42d4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DrillSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DrillSource.cs @@ -44,10 +44,13 @@ public DrillSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public DrillSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public DrillSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsAXSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsAXSource.cs index c07f0ce1b6eb..eb1019ceba62 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsAXSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsAXSource.cs @@ -44,10 +44,13 @@ public DynamicsAXSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public DynamicsAXSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public DynamicsAXSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsCrmSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsCrmSource.cs index 0417c432bde7..280028f6a933 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsCrmSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsCrmSource.cs @@ -44,10 +44,14 @@ public DynamicsCrmSource() /// FetchXML is a proprietary query language that /// is used in Microsoft Dynamics CRM (online & on-premises). Type: /// string (or Expression with resultType string). - public DynamicsCrmSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public DynamicsCrmSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -64,5 +68,13 @@ public DynamicsCrmSource() [JsonProperty(PropertyName = "query")] public object Query { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsSource.cs index 144c7d46288b..9bf19334bda8 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsSource.cs @@ -44,10 +44,14 @@ public DynamicsSource() /// FetchXML is a proprietary query language that /// is used in Microsoft Dynamics (online & on-premises). Type: /// string (or Expression with resultType string). - public DynamicsSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public DynamicsSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -64,5 +68,13 @@ public DynamicsSource() [JsonProperty(PropertyName = "query")] public object Query { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EloquaSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EloquaSource.cs index 2a23ebed02f4..970569642b98 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EloquaSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EloquaSource.cs @@ -44,10 +44,13 @@ public EloquaSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public EloquaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public EloquaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerReadSettings.cs index b3b480f11053..6d2ff81c7e96 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileServerReadSettings.cs @@ -43,6 +43,10 @@ public FileServerReadSettings() /// Type: string (or Expression with resultType string). /// FileServer wildcardFileName. Type: /// string (or Expression with resultType string). + /// Point to a text file that lists each + /// file (relative path to the path configured in the dataset) that you + /// want to copy. Type: string (or Expression with resultType + /// string). /// Indicates whether to enable /// partition discovery. /// The start of file's modified @@ -51,12 +55,13 @@ public FileServerReadSettings() /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public FileServerReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public FileServerReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; + FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; @@ -90,6 +95,14 @@ public FileServerReadSettings() [JsonProperty(PropertyName = "wildcardFileName")] public object WildcardFileName { get; set; } + /// + /// Gets or sets point to a text file that lists each file (relative + /// path to the path configured in the dataset) that you want to copy. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "fileListPath")] + public object FileListPath { get; set; } + /// /// Gets or sets indicates whether to enable partition discovery. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileSystemSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileSystemSource.cs index 4d86535db851..012aeba12ebb 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileSystemSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FileSystemSource.cs @@ -44,10 +44,14 @@ public FileSystemSource() /// If true, files under the folder path will /// be read recursively. Default is true. Type: boolean (or Expression /// with resultType boolean). - public FileSystemSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object recursive = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public FileSystemSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object recursive = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Recursive = recursive; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -64,5 +68,13 @@ public FileSystemSource() [JsonProperty(PropertyName = "recursive")] public object Recursive { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FtpReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FtpReadSettings.cs index 2162168b9721..9dc77aed731e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FtpReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FtpReadSettings.cs @@ -43,14 +43,19 @@ public FtpReadSettings() /// string (or Expression with resultType string). /// Ftp wildcardFileName. Type: string /// (or Expression with resultType string). + /// Point to a text file that lists each + /// file (relative path to the path configured in the dataset) that you + /// want to copy. Type: string (or Expression with resultType + /// string). /// Specify whether to use binary /// transfer mode for FTP stores. - public FtpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? useBinaryTransfer = default(bool?)) + public FtpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? useBinaryTransfer = default(bool?)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; + FileListPath = fileListPath; UseBinaryTransfer = useBinaryTransfer; CustomInit(); } @@ -82,6 +87,14 @@ public FtpReadSettings() [JsonProperty(PropertyName = "wildcardFileName")] public object WildcardFileName { get; set; } + /// + /// Gets or sets point to a text file that lists each file (relative + /// path to the path configured in the dataset) that you want to copy. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "fileListPath")] + public object FileListPath { get; set; } + /// /// Gets or sets specify whether to use binary transfer mode for FTP /// stores. diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsSource.cs index 7fe4c0cb421b..1497bd1e95f8 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsSource.cs @@ -44,10 +44,13 @@ public GoogleAdWordsSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public GoogleAdWordsSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public GoogleAdWordsSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleBigQuerySource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleBigQuerySource.cs index 1911a116d8c7..ce6501c746d5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleBigQuerySource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleBigQuerySource.cs @@ -44,10 +44,13 @@ public GoogleBigQuerySource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public GoogleBigQuerySource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public GoogleBigQuerySource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleCloudStorageReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleCloudStorageReadSettings.cs index 8f764c1e9743..94c892946c0f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleCloudStorageReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleCloudStorageReadSettings.cs @@ -50,6 +50,10 @@ public GoogleCloudStorageReadSettings() /// The prefix filter for the Google Cloud Storage /// object name. Type: string (or Expression with resultType /// string). + /// Point to a text file that lists each + /// file (relative path to the path configured in the dataset) that you + /// want to copy. Type: string (or Expression with resultType + /// string). /// Indicates whether to enable /// partition discovery. /// The start of file's modified @@ -58,13 +62,14 @@ public GoogleCloudStorageReadSettings() /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public GoogleCloudStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public GoogleCloudStorageReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object prefix = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; Prefix = prefix; + FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; @@ -105,6 +110,14 @@ public GoogleCloudStorageReadSettings() [JsonProperty(PropertyName = "prefix")] public object Prefix { get; set; } + /// + /// Gets or sets point to a text file that lists each file (relative + /// path to the path configured in the dataset) that you want to copy. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "fileListPath")] + public object FileListPath { get; set; } + /// /// Gets or sets indicates whether to enable partition discovery. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GreenplumSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GreenplumSource.cs index c310d82cbe5d..1a37594fddb3 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GreenplumSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GreenplumSource.cs @@ -44,10 +44,13 @@ public GreenplumSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public GreenplumSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public GreenplumSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HBaseSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HBaseSource.cs index b77ad1ea0bee..c07b4d655cb9 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HBaseSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HBaseSource.cs @@ -44,10 +44,13 @@ public HBaseSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public HBaseSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public HBaseSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HdfsReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HdfsReadSettings.cs index bbbb5f4cbc32..6a4948313214 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HdfsReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HdfsReadSettings.cs @@ -43,6 +43,10 @@ public HdfsReadSettings() /// string (or Expression with resultType string). /// HDFS wildcardFileName. Type: string /// (or Expression with resultType string). + /// Point to a text file that lists each + /// file (relative path to the path configured in the dataset) that you + /// want to copy. Type: string (or Expression with resultType + /// string). /// Indicates whether to enable /// partition discovery. /// The start of file's modified @@ -53,12 +57,13 @@ public HdfsReadSettings() /// string). /// Specifies Distcp-related /// settings. - public HdfsReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object), DistcpSettings distcpSettings = default(DistcpSettings)) + public HdfsReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), bool? enablePartitionDiscovery = default(bool?), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object), DistcpSettings distcpSettings = default(DistcpSettings)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; + FileListPath = fileListPath; EnablePartitionDiscovery = enablePartitionDiscovery; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; @@ -93,6 +98,14 @@ public HdfsReadSettings() [JsonProperty(PropertyName = "wildcardFileName")] public object WildcardFileName { get; set; } + /// + /// Gets or sets point to a text file that lists each file (relative + /// path to the path configured in the dataset) that you want to copy. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "fileListPath")] + public object FileListPath { get; set; } + /// /// Gets or sets indicates whether to enable partition discovery. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HiveSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HiveSource.cs index 93e093a952a3..75fa771c2e17 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HiveSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HiveSource.cs @@ -44,10 +44,13 @@ public HiveSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public HiveSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public HiveSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HubspotSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HubspotSource.cs index 988cc5eca253..77827131a903 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HubspotSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HubspotSource.cs @@ -44,10 +44,13 @@ public HubspotSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public HubspotSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public HubspotSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ImpalaSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ImpalaSource.cs index 5f9fa1a753d3..8b4909c31a04 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ImpalaSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ImpalaSource.cs @@ -44,10 +44,13 @@ public ImpalaSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public ImpalaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public ImpalaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/InformixSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/InformixSource.cs index 63b7db26768c..75ab200055a0 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/InformixSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/InformixSource.cs @@ -44,10 +44,13 @@ public InformixSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Database query. Type: string (or Expression /// with resultType string). - public InformixSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public InformixSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JiraSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JiraSource.cs index cce27b358941..f2e3ac219869 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JiraSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JiraSource.cs @@ -44,10 +44,13 @@ public JiraSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public JiraSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public JiraSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JsonSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JsonSource.cs index d430d27269d4..8c56a3cd4dc9 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JsonSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/JsonSource.cs @@ -42,10 +42,14 @@ public JsonSource() /// connection count for the source data store. Type: integer (or /// Expression with resultType integer). /// Json store settings. - public JsonSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public JsonSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { StoreSettings = storeSettings; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -60,5 +64,13 @@ public JsonSource() [JsonProperty(PropertyName = "storeSettings")] public StoreReadSettings StoreSettings { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MagentoSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MagentoSource.cs index 83939a4e55e2..48727824427b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MagentoSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MagentoSource.cs @@ -44,10 +44,13 @@ public MagentoSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public MagentoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public MagentoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MariaDBSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MariaDBSource.cs index adcc5d9d1121..ff229779be43 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MariaDBSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MariaDBSource.cs @@ -44,10 +44,13 @@ public MariaDBSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public MariaDBSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public MariaDBSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MarketoSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MarketoSource.cs index e6cc7e252ded..28bef1db94de 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MarketoSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MarketoSource.cs @@ -44,10 +44,13 @@ public MarketoSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public MarketoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public MarketoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MicrosoftAccessSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MicrosoftAccessSource.cs index aaeb0e9efc35..6e7b633c1e82 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MicrosoftAccessSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MicrosoftAccessSource.cs @@ -43,10 +43,14 @@ public MicrosoftAccessSource() /// Expression with resultType integer). /// Database query. Type: string (or Expression /// with resultType string). - public MicrosoftAccessSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public MicrosoftAccessSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -62,5 +66,13 @@ public MicrosoftAccessSource() [JsonProperty(PropertyName = "query")] public object Query { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbSource.cs index 1798c585d123..0a52a0595a19 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbSource.cs @@ -44,10 +44,14 @@ public MongoDbSource() /// Database query. Should be a SQL-92 query /// expression. Type: string (or Expression with resultType /// string). - public MongoDbSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public MongoDbSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -63,5 +67,13 @@ public MongoDbSource() [JsonProperty(PropertyName = "query")] public object Query { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbV2Source.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbV2Source.cs index 4cf50d73abca..6a01c35f459e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbV2Source.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbV2Source.cs @@ -56,13 +56,17 @@ public MongoDbV2Source() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). - public MongoDbV2Source(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object filter = default(object), MongoDbCursorMethodsProperties cursorMethods = default(MongoDbCursorMethodsProperties), object batchSize = default(object), object queryTimeout = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public MongoDbV2Source(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object filter = default(object), MongoDbCursorMethodsProperties cursorMethods = default(MongoDbCursorMethodsProperties), object batchSize = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Filter = filter; CursorMethods = cursorMethods; BatchSize = batchSize; QueryTimeout = queryTimeout; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -105,5 +109,13 @@ public MongoDbV2Source() [JsonProperty(PropertyName = "queryTimeout")] public object QueryTimeout { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MySqlSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MySqlSource.cs index 66e3a42a28c9..fe2d6f2c8b49 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MySqlSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MySqlSource.cs @@ -44,10 +44,13 @@ public MySqlSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Database query. Type: string (or Expression /// with resultType string). - public MySqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public MySqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/NetezzaSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/NetezzaSource.cs index be64c206bdef..8fb594325c2f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/NetezzaSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/NetezzaSource.cs @@ -44,6 +44,9 @@ public NetezzaSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). /// The partition mechanism that will be @@ -51,8 +54,8 @@ public NetezzaSource() /// 'DataSlice', 'DynamicRange' /// The settings that will be leveraged /// for Netezza source partitioning. - public NetezzaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object), string partitionOption = default(string), NetezzaPartitionSettings partitionSettings = default(NetezzaPartitionSettings)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public NetezzaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), string partitionOption = default(string), NetezzaPartitionSettings partitionSettings = default(NetezzaPartitionSettings)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; PartitionOption = partitionOption; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataSource.cs index 809d174d7beb..21c50deb4be2 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataSource.cs @@ -43,10 +43,14 @@ public ODataSource() /// Expression with resultType integer). /// OData query. For example, "$top=1". Type: /// string (or Expression with resultType string). - public ODataSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public ODataSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -62,5 +66,13 @@ public ODataSource() [JsonProperty(PropertyName = "query")] public object Query { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OdbcSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OdbcSource.cs index 73bab2a33249..4b23e68dbc2c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OdbcSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OdbcSource.cs @@ -44,10 +44,13 @@ public OdbcSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Database query. Type: string (or Expression /// with resultType string). - public OdbcSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public OdbcSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OracleServiceCloudSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OracleServiceCloudSource.cs index 23801ca559ae..85bebc315189 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OracleServiceCloudSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OracleServiceCloudSource.cs @@ -44,10 +44,13 @@ public OracleServiceCloudSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public OracleServiceCloudSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public OracleServiceCloudSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OracleSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OracleSource.cs index 34b73c2d741f..059ee63e35f1 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OracleSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OracleSource.cs @@ -51,13 +51,17 @@ public OracleSource() /// 'PhysicalPartitionsOfTable', 'DynamicRange' /// The settings that will be leveraged /// for Oracle source partitioning. - public OracleSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object oracleReaderQuery = default(object), object queryTimeout = default(object), string partitionOption = default(string), OraclePartitionSettings partitionSettings = default(OraclePartitionSettings)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public OracleSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object oracleReaderQuery = default(object), object queryTimeout = default(object), string partitionOption = default(string), OraclePartitionSettings partitionSettings = default(OraclePartitionSettings), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { OracleReaderQuery = oracleReaderQuery; QueryTimeout = queryTimeout; PartitionOption = partitionOption; PartitionSettings = partitionSettings; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -96,5 +100,13 @@ public OracleSource() [JsonProperty(PropertyName = "partitionSettings")] public OraclePartitionSettings PartitionSettings { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcSource.cs index f79adc506a39..1ce24de451e3 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcSource.cs @@ -42,10 +42,14 @@ public OrcSource() /// connection count for the source data store. Type: integer (or /// Expression with resultType integer). /// ORC store settings. - public OrcSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public OrcSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { StoreSettings = storeSettings; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -60,5 +64,13 @@ public OrcSource() [JsonProperty(PropertyName = "storeSettings")] public StoreReadSettings StoreSettings { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetSource.cs index e3a4c881991a..a690fa20f007 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ParquetSource.cs @@ -42,10 +42,14 @@ public ParquetSource() /// connection count for the source data store. Type: integer (or /// Expression with resultType integer). /// Parquet store settings. - public ParquetSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public ParquetSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { StoreSettings = storeSettings; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -60,5 +64,13 @@ public ParquetSource() [JsonProperty(PropertyName = "storeSettings")] public StoreReadSettings StoreSettings { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PaypalSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PaypalSource.cs index 89fe55a447fa..2ba6aca82d47 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PaypalSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PaypalSource.cs @@ -44,10 +44,13 @@ public PaypalSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public PaypalSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public PaypalSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PhoenixSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PhoenixSource.cs index 35482d85007c..bffd002c777d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PhoenixSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PhoenixSource.cs @@ -44,10 +44,13 @@ public PhoenixSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public PhoenixSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public PhoenixSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PostgreSqlSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PostgreSqlSource.cs index da2d36abf5e4..c21c6e08b2b2 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PostgreSqlSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PostgreSqlSource.cs @@ -44,10 +44,13 @@ public PostgreSqlSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Database query. Type: string (or Expression /// with resultType string). - public PostgreSqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public PostgreSqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrestoSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrestoSource.cs index e36c4708f4b9..6b494ef52f01 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrestoSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PrestoSource.cs @@ -44,10 +44,13 @@ public PrestoSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public PrestoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public PrestoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/QuickBooksSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/QuickBooksSource.cs index 2c9ed0d1d459..d181a2809aa4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/QuickBooksSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/QuickBooksSource.cs @@ -44,10 +44,13 @@ public QuickBooksSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public QuickBooksSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public QuickBooksSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RelationalSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RelationalSource.cs index cdf8ee8115af..bb527e17836b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RelationalSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RelationalSource.cs @@ -43,10 +43,14 @@ public RelationalSource() /// Expression with resultType integer). /// Database query. Type: string (or Expression /// with resultType string). - public RelationalSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public RelationalSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -62,5 +66,13 @@ public RelationalSource() [JsonProperty(PropertyName = "query")] public object Query { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RerunTriggerResource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RerunTriggerResource.cs deleted file mode 100644 index ccf418370773..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RerunTriggerResource.cs +++ /dev/null @@ -1,74 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.DataFactory.Models -{ - using Microsoft.Rest; - using Newtonsoft.Json; - using System.Linq; - - /// - /// RerunTrigger resource type. - /// - public partial class RerunTriggerResource : SubResource - { - /// - /// Initializes a new instance of the RerunTriggerResource class. - /// - public RerunTriggerResource() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the RerunTriggerResource class. - /// - /// Properties of the rerun trigger. - /// The resource identifier. - /// The resource name. - /// The resource type. - /// Etag identifies change in the resource. - public RerunTriggerResource(RerunTumblingWindowTrigger properties, string id = default(string), string name = default(string), string type = default(string), string etag = default(string)) - : base(id, name, type, etag) - { - Properties = properties; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets properties of the rerun trigger. - /// - [JsonProperty(PropertyName = "properties")] - public RerunTumblingWindowTrigger Properties { get; set; } - - /// - /// Validate the object. - /// - /// - /// Thrown if validation fails - /// - public virtual void Validate() - { - if (Properties == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Properties"); - } - if (Properties != null) - { - Properties.Validate(); - } - } - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RerunTumblingWindowTrigger.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RerunTumblingWindowTrigger.cs index 72ee9d65ff13..c2a69f7c1acb 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RerunTumblingWindowTrigger.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RerunTumblingWindowTrigger.cs @@ -35,13 +35,14 @@ public RerunTumblingWindowTrigger() /// /// Initializes a new instance of the RerunTumblingWindowTrigger class. /// + /// The parent trigger reference. /// The start time for the time period /// for which restatement is initiated. Only UTC time is currently /// supported. /// The end time for the time period for /// which restatement is initiated. Only UTC time is currently /// supported. - /// The max number of parallel time + /// The max number of parallel time /// windows (ready for execution) for which a rerun is /// triggered. /// Unmatched properties from the @@ -52,14 +53,13 @@ public RerunTumblingWindowTrigger() /// values include: 'Started', 'Stopped', 'Disabled' /// List of tags that can be used for /// describing the trigger. - /// The parent trigger reference. - public RerunTumblingWindowTrigger(System.DateTime requestedStartTime, System.DateTime requestedEndTime, int maxConcurrency, IDictionary additionalProperties = default(IDictionary), string description = default(string), string runtimeState = default(string), IList annotations = default(IList), object parentTrigger = default(object)) + public RerunTumblingWindowTrigger(object parentTrigger, System.DateTime requestedStartTime, System.DateTime requestedEndTime, int rerunConcurrency, IDictionary additionalProperties = default(IDictionary), string description = default(string), string runtimeState = default(string), IList annotations = default(IList)) : base(additionalProperties, description, runtimeState, annotations) { ParentTrigger = parentTrigger; RequestedStartTime = requestedStartTime; RequestedEndTime = requestedEndTime; - MaxConcurrency = maxConcurrency; + RerunConcurrency = rerunConcurrency; CustomInit(); } @@ -92,8 +92,8 @@ public RerunTumblingWindowTrigger() /// Gets or sets the max number of parallel time windows (ready for /// execution) for which a rerun is triggered. /// - [JsonProperty(PropertyName = "typeProperties.maxConcurrency")] - public int MaxConcurrency { get; set; } + [JsonProperty(PropertyName = "typeProperties.rerunConcurrency")] + public int RerunConcurrency { get; set; } /// /// Validate the object. @@ -103,13 +103,17 @@ public RerunTumblingWindowTrigger() /// public virtual void Validate() { - if (MaxConcurrency > 50) + if (ParentTrigger == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ParentTrigger"); + } + if (RerunConcurrency > 50) { - throw new ValidationException(ValidationRules.InclusiveMaximum, "MaxConcurrency", 50); + throw new ValidationException(ValidationRules.InclusiveMaximum, "RerunConcurrency", 50); } - if (MaxConcurrency < 1) + if (RerunConcurrency < 1) { - throw new ValidationException(ValidationRules.InclusiveMinimum, "MaxConcurrency", 1); + throw new ValidationException(ValidationRules.InclusiveMinimum, "RerunConcurrency", 1); } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RerunTumblingWindowTriggerActionParameters.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RerunTumblingWindowTriggerActionParameters.cs deleted file mode 100644 index 504f977edee2..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RerunTumblingWindowTriggerActionParameters.cs +++ /dev/null @@ -1,96 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.DataFactory.Models -{ - using Microsoft.Rest; - using Newtonsoft.Json; - using System.Linq; - - /// - /// Rerun tumbling window trigger Parameters. - /// - public partial class RerunTumblingWindowTriggerActionParameters - { - /// - /// Initializes a new instance of the - /// RerunTumblingWindowTriggerActionParameters class. - /// - public RerunTumblingWindowTriggerActionParameters() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the - /// RerunTumblingWindowTriggerActionParameters class. - /// - /// The start time for the time period for - /// which restatement is initiated. Only UTC time is currently - /// supported. - /// The end time for the time period for which - /// restatement is initiated. Only UTC time is currently - /// supported. - /// The max number of parallel time - /// windows (ready for execution) for which a rerun is - /// triggered. - public RerunTumblingWindowTriggerActionParameters(System.DateTime startTime, System.DateTime endTime, int maxConcurrency) - { - StartTime = startTime; - EndTime = endTime; - MaxConcurrency = maxConcurrency; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets the start time for the time period for which - /// restatement is initiated. Only UTC time is currently supported. - /// - [JsonProperty(PropertyName = "startTime")] - public System.DateTime StartTime { get; set; } - - /// - /// Gets or sets the end time for the time period for which restatement - /// is initiated. Only UTC time is currently supported. - /// - [JsonProperty(PropertyName = "endTime")] - public System.DateTime EndTime { get; set; } - - /// - /// Gets or sets the max number of parallel time windows (ready for - /// execution) for which a rerun is triggered. - /// - [JsonProperty(PropertyName = "maxConcurrency")] - public int MaxConcurrency { get; set; } - - /// - /// Validate the object. - /// - /// - /// Thrown if validation fails - /// - public virtual void Validate() - { - if (MaxConcurrency > 50) - { - throw new ValidationException(ValidationRules.InclusiveMaximum, "MaxConcurrency", 50); - } - if (MaxConcurrency < 1) - { - throw new ValidationException(ValidationRules.InclusiveMinimum, "MaxConcurrency", 1); - } - } - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ResponsysSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ResponsysSource.cs index a162e53d26b4..86190174d63f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ResponsysSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ResponsysSource.cs @@ -44,10 +44,13 @@ public ResponsysSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public ResponsysSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public ResponsysSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestSource.cs index 8e740fd3bbb1..20cc801350b2 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestSource.cs @@ -60,7 +60,10 @@ public RestSource() /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). /// The time to await before sending next /// page request. - public RestSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object requestMethod = default(object), object requestBody = default(object), object additionalHeaders = default(object), object paginationRules = default(object), object httpRequestTimeout = default(object), object requestInterval = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public RestSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object requestMethod = default(object), object requestBody = default(object), object additionalHeaders = default(object), object paginationRules = default(object), object httpRequestTimeout = default(object), object requestInterval = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { RequestMethod = requestMethod; @@ -69,6 +72,7 @@ public RestSource() PaginationRules = paginationRules; HttpRequestTimeout = httpRequestTimeout; RequestInterval = requestInterval; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -123,5 +127,13 @@ public RestSource() [JsonProperty(PropertyName = "requestInterval")] public object RequestInterval { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs similarity index 100% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceLinkedService.cs index 085fbdb39fbc..83c15af5f98d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceLinkedService.cs @@ -53,19 +53,22 @@ public SalesforceLinkedService() /// string). /// The password for Basic authentication of the /// Salesforce instance. - /// The security token is required to + /// The security token is optional to /// remotely access Salesforce instance. + /// The Salesforce API version used in ADF. + /// Type: string (or Expression with resultType string). /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public SalesforceLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object environmentUrl = default(object), object username = default(object), SecretBase password = default(SecretBase), SecretBase securityToken = default(SecretBase), object encryptedCredential = default(object)) + public SalesforceLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object environmentUrl = default(object), object username = default(object), SecretBase password = default(SecretBase), SecretBase securityToken = default(SecretBase), object apiVersion = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { EnvironmentUrl = environmentUrl; Username = username; Password = password; SecurityToken = securityToken; + ApiVersion = apiVersion; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -101,12 +104,19 @@ public SalesforceLinkedService() public SecretBase Password { get; set; } /// - /// Gets or sets the security token is required to remotely access + /// Gets or sets the security token is optional to remotely access /// Salesforce instance. /// [JsonProperty(PropertyName = "typeProperties.securityToken")] public SecretBase SecurityToken { get; set; } + /// + /// Gets or sets the Salesforce API version used in ADF. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.apiVersion")] + public object ApiVersion { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceMarketingCloudSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceMarketingCloudSource.cs index 407b9647a882..846561716b67 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceMarketingCloudSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceMarketingCloudSource.cs @@ -46,10 +46,13 @@ public SalesforceMarketingCloudSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public SalesforceMarketingCloudSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SalesforceMarketingCloudSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceServiceCloudLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceServiceCloudLinkedService.cs index 6146660aedd0..9d3cab40dcd1 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceServiceCloudLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceServiceCloudLinkedService.cs @@ -55,8 +55,10 @@ public SalesforceServiceCloudLinkedService() /// string). /// The password for Basic authentication of the /// Salesforce instance. - /// The security token is required to + /// The security token is optional to /// remotely access Salesforce instance. + /// The Salesforce API version used in ADF. + /// Type: string (or Expression with resultType string). /// Extended properties appended to /// the connection string. Type: string (or Expression with resultType /// string). @@ -64,13 +66,14 @@ public SalesforceServiceCloudLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public SalesforceServiceCloudLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object environmentUrl = default(object), object username = default(object), SecretBase password = default(SecretBase), SecretBase securityToken = default(SecretBase), object extendedProperties = default(object), object encryptedCredential = default(object)) + public SalesforceServiceCloudLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object environmentUrl = default(object), object username = default(object), SecretBase password = default(SecretBase), SecretBase securityToken = default(SecretBase), object apiVersion = default(object), object extendedProperties = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { EnvironmentUrl = environmentUrl; Username = username; Password = password; SecurityToken = securityToken; + ApiVersion = apiVersion; ExtendedProperties = extendedProperties; EncryptedCredential = encryptedCredential; CustomInit(); @@ -107,12 +110,19 @@ public SalesforceServiceCloudLinkedService() public SecretBase Password { get; set; } /// - /// Gets or sets the security token is required to remotely access + /// Gets or sets the security token is optional to remotely access /// Salesforce instance. /// [JsonProperty(PropertyName = "typeProperties.securityToken")] public SecretBase SecurityToken { get; set; } + /// + /// Gets or sets the Salesforce API version used in ADF. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.apiVersion")] + public object ApiVersion { get; set; } + /// /// Gets or sets extended properties appended to the connection string. /// Type: string (or Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceServiceCloudSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceServiceCloudSource.cs index 5c5b32584e0a..a9789ac71e32 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceServiceCloudSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceServiceCloudSource.cs @@ -48,11 +48,15 @@ public SalesforceServiceCloudSource() /// The read behavior for the operation. /// Default is Query. Possible values include: 'Query', /// 'QueryAll' - public SalesforceServiceCloudSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), string readBehavior = default(string)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public SalesforceServiceCloudSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object query = default(object), string readBehavior = default(string), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { Query = query; ReadBehavior = readBehavior; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -75,5 +79,13 @@ public SalesforceServiceCloudSource() [JsonProperty(PropertyName = "readBehavior")] public string ReadBehavior { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceSource.cs index d08919ea3487..b340de99073c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SalesforceSource.cs @@ -44,13 +44,16 @@ public SalesforceSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Database query. Type: string (or Expression /// with resultType string). /// The read behavior for the operation. /// Default is Query. Possible values include: 'Query', /// 'QueryAll' - public SalesforceSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object), string readBehavior = default(string)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SalesforceSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), string readBehavior = default(string)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; ReadBehavior = readBehavior; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapBwSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapBwSource.cs index 98b6031e24fd..0b0864e91c28 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapBwSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapBwSource.cs @@ -44,10 +44,13 @@ public SapBwSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// MDX query. Type: string (or Expression with /// resultType string). - public SapBwSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SapBwSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapCloudForCustomerSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapCloudForCustomerSource.cs index 2624b68a269c..b0faa16f8ce5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapCloudForCustomerSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapCloudForCustomerSource.cs @@ -44,11 +44,14 @@ public SapCloudForCustomerSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// SAP Cloud for Customer OData query. For /// example, "$top=1". Type: string (or Expression with resultType /// string). - public SapCloudForCustomerSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SapCloudForCustomerSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapEccSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapEccSource.cs index 129b0aaca7af..f091daea1531 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapEccSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapEccSource.cs @@ -44,10 +44,13 @@ public SapEccSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// SAP ECC OData query. For example, "$top=1". /// Type: string (or Expression with resultType string). - public SapEccSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SapEccSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapHanaSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapHanaSource.cs index c264b7e6a23d..88592f71a5aa 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapHanaSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapHanaSource.cs @@ -44,6 +44,9 @@ public SapHanaSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// SAP HANA Sql query. Type: string (or Expression /// with resultType string). /// The packet size of data read from SAP @@ -53,8 +56,8 @@ public SapHanaSource() /// 'None', 'PhysicalPartitionsOfTable', 'SapHanaDynamicRange' /// The settings that will be leveraged /// for SAP HANA source partitioning. - public SapHanaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object), object packetSize = default(object), string partitionOption = default(string), SapHanaPartitionSettings partitionSettings = default(SapHanaPartitionSettings)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SapHanaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), object packetSize = default(object), string partitionOption = default(string), SapHanaPartitionSettings partitionSettings = default(SapHanaPartitionSettings)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; PacketSize = packetSize; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOpenHubSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOpenHubSource.cs index 33a065aece73..fdf89ffbc085 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOpenHubSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOpenHubSource.cs @@ -45,6 +45,9 @@ public SapOpenHubSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Whether to exclude the records of /// the last request. The default value is true. Type: boolean (or /// Expression with resultType boolean). @@ -52,8 +55,8 @@ public SapOpenHubSource() /// Once it is set, only data with requestId larger than the value of /// this property will be retrieved. The default value is 0. Type: /// integer (or Expression with resultType integer ). - public SapOpenHubSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object excludeLastRequest = default(object), object baseRequestId = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SapOpenHubSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object excludeLastRequest = default(object), object baseRequestId = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { ExcludeLastRequest = excludeLastRequest; BaseRequestId = baseRequestId; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapTableSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapTableSource.cs index 2a9425285467..bbf90efc064f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapTableSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapTableSource.cs @@ -44,6 +44,9 @@ public SapTableSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// The number of rows to be retrieved. Type: /// integer(or Expression with resultType integer). /// The number of rows that will be skipped. @@ -67,8 +70,8 @@ public SapTableSource() /// 'PartitionOnTime' /// The settings that will be leveraged /// for SAP table source partitioning. - public SapTableSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object rowCount = default(object), object rowSkips = default(object), object rfcTableFields = default(object), object rfcTableOptions = default(object), object batchSize = default(object), object customRfcReadTableFunctionModule = default(object), string partitionOption = default(string), SapTablePartitionSettings partitionSettings = default(SapTablePartitionSettings)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SapTableSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object rowCount = default(object), object rowSkips = default(object), object rfcTableFields = default(object), object rfcTableOptions = default(object), object batchSize = default(object), object customRfcReadTableFunctionModule = default(object), string partitionOption = default(string), SapTablePartitionSettings partitionSettings = default(SapTablePartitionSettings)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { RowCount = rowCount; RowSkips = rowSkips; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SelfDependencyTumblingWindowTriggerReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SelfDependencyTumblingWindowTriggerReference.cs index d4fb78fa80b5..71d386c8a657 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SelfDependencyTumblingWindowTriggerReference.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SelfDependencyTumblingWindowTriggerReference.cs @@ -85,9 +85,9 @@ public virtual void Validate() { 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]))")) + 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]))"); + throw new ValidationException(ValidationRules.Pattern, "Offset", "-((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))"); } } if (Size != null) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServiceNowSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServiceNowSource.cs index 10f6c44350f2..ebfe9aa1e1e4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServiceNowSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServiceNowSource.cs @@ -44,10 +44,13 @@ public ServiceNowSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public ServiceNowSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public ServiceNowSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpReadSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpReadSettings.cs index 01bb8282e9e1..fe7f87298f05 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpReadSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpReadSettings.cs @@ -43,18 +43,23 @@ public SftpReadSettings() /// string (or Expression with resultType string). /// Sftp wildcardFileName. Type: string /// (or Expression with resultType string). + /// Point to a text file that lists each + /// file (relative path to the path configured in the dataset) that you + /// want to copy. Type: string (or Expression with resultType + /// string). /// The start of file's modified /// datetime. Type: string (or Expression with resultType /// string). /// The end of file's modified /// datetime. Type: string (or Expression with resultType /// string). - public SftpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) + public SftpReadSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object recursive = default(object), object wildcardFolderPath = default(object), object wildcardFileName = default(object), object fileListPath = default(object), object modifiedDatetimeStart = default(object), object modifiedDatetimeEnd = default(object)) : base(additionalProperties, maxConcurrentConnections) { Recursive = recursive; WildcardFolderPath = wildcardFolderPath; WildcardFileName = wildcardFileName; + FileListPath = fileListPath; ModifiedDatetimeStart = modifiedDatetimeStart; ModifiedDatetimeEnd = modifiedDatetimeEnd; CustomInit(); @@ -87,6 +92,14 @@ public SftpReadSettings() [JsonProperty(PropertyName = "wildcardFileName")] public object WildcardFileName { get; set; } + /// + /// Gets or sets point to a text file that lists each file (relative + /// path to the path configured in the dataset) that you want to copy. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "fileListPath")] + public object FileListPath { get; set; } + /// /// Gets or sets the start of file's modified datetime. Type: string /// (or Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpWriteSettings.cs index b99aa58b910f..00727e5df994 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpWriteSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpWriteSettings.cs @@ -41,10 +41,15 @@ public SftpWriteSettings() /// Specifies the timeout for writing /// each chunk to SFTP server. Default value: 01:00:00 (one hour). /// Type: string (or Expression with resultType string). - public SftpWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object operationTimeout = default(object)) + /// Upload to temporary file(s) and + /// rename. Disable this option if your SFTP server doesn't support + /// rename operation. Type: boolean (or Expression with resultType + /// boolean). + public SftpWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object operationTimeout = default(object), object useTempFileRename = default(object)) : base(additionalProperties, maxConcurrentConnections, copyBehavior) { OperationTimeout = operationTimeout; + UseTempFileRename = useTempFileRename; CustomInit(); } @@ -61,5 +66,13 @@ public SftpWriteSettings() [JsonProperty(PropertyName = "operationTimeout")] public object OperationTimeout { get; set; } + /// + /// Gets or sets upload to temporary file(s) and rename. Disable this + /// option if your SFTP server doesn't support rename operation. Type: + /// boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "useTempFileRename")] + public object UseTempFileRename { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ShopifySource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ShopifySource.cs index 7de0a0d0d511..328c47524866 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ShopifySource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ShopifySource.cs @@ -44,10 +44,13 @@ public ShopifySource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public ShopifySource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public ShopifySource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SkipErrorFile.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SkipErrorFile.cs new file mode 100644 index 000000000000..15768887653d --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SkipErrorFile.cs @@ -0,0 +1,67 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Skip error file. + /// + public partial class SkipErrorFile + { + /// + /// Initializes a new instance of the SkipErrorFile class. + /// + public SkipErrorFile() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SkipErrorFile class. + /// + /// Skip if file is deleted by other client + /// during copy. Default is true. Type: boolean (or Expression with + /// resultType boolean). + /// Skip if source/sink file changed by + /// other concurrent write. Default is false. Type: boolean (or + /// Expression with resultType boolean). + public SkipErrorFile(object fileMissing = default(object), object dataInconsistency = default(object)) + { + FileMissing = fileMissing; + DataInconsistency = dataInconsistency; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets skip if file is deleted by other client during copy. + /// Default is true. Type: boolean (or Expression with resultType + /// boolean). + /// + [JsonProperty(PropertyName = "fileMissing")] + public object FileMissing { get; set; } + + /// + /// Gets or sets skip if source/sink file changed by other concurrent + /// write. Default is false. Type: boolean (or Expression with + /// resultType boolean). + /// + [JsonProperty(PropertyName = "dataInconsistency")] + public object DataInconsistency { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SparkSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SparkSource.cs index 89d06dedbc06..e89e16aa27c9 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SparkSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SparkSource.cs @@ -44,10 +44,13 @@ public SparkSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public SparkSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SparkSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWSource.cs index 90e6a8f79a68..2a3fd9dba735 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWSource.cs @@ -44,6 +44,9 @@ public SqlDWSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// SQL Data Warehouse reader query. Type: /// string (or Expression with resultType string). /// Name of the stored @@ -54,8 +57,8 @@ public SqlDWSource() /// stored procedure parameters. Example: "{Parameter1: {value: "1", /// type: "int"}}". Type: object (or Expression with resultType /// object), itemType: StoredProcedureParameter. - public SqlDWSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), object storedProcedureParameters = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SqlDWSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), object storedProcedureParameters = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { SqlReaderQuery = sqlReaderQuery; SqlReaderStoredProcedureName = sqlReaderStoredProcedureName; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlMISource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlMISource.cs index cab823162051..96d8c313fa39 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlMISource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlMISource.cs @@ -44,6 +44,9 @@ public SqlMISource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// SQL reader query. Type: string (or /// Expression with resultType string). /// Name of the stored @@ -55,8 +58,8 @@ public SqlMISource() /// type: "int"}}". /// Which additional types to /// produce. - public SqlMISource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SqlMISource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { SqlReaderQuery = sqlReaderQuery; SqlReaderStoredProcedureName = sqlReaderStoredProcedureName; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerSource.cs index c064dae1e70e..c1cbb89d9202 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerSource.cs @@ -44,6 +44,9 @@ public SqlServerSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// SQL reader query. Type: string (or /// Expression with resultType string). /// Name of the stored @@ -55,8 +58,8 @@ public SqlServerSource() /// type: "int"}}". /// Which additional types to /// produce. - public SqlServerSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SqlServerSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { SqlReaderQuery = sqlReaderQuery; SqlReaderStoredProcedureName = sqlReaderStoredProcedureName; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlSource.cs index 599eacbfe67e..7fab6677c3f0 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlSource.cs @@ -44,6 +44,9 @@ public SqlSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// SQL reader query. Type: string (or /// Expression with resultType string). /// Name of the stored @@ -53,12 +56,18 @@ public SqlSource() /// Value and type setting for /// stored procedure parameters. Example: "{Parameter1: {value: "1", /// type: "int"}}". - public SqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + /// Specifies the transaction locking + /// behavior for the SQL source. Allowed values: + /// ReadCommitted/ReadUncommitted/RepeatableRead/Serializable/Snapshot. + /// The default value is ReadCommitted. Type: string (or Expression + /// with resultType string). + public SqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object isolationLevel = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { SqlReaderQuery = sqlReaderQuery; SqlReaderStoredProcedureName = sqlReaderStoredProcedureName; StoredProcedureParameters = storedProcedureParameters; + IsolationLevel = isolationLevel; CustomInit(); } @@ -89,5 +98,15 @@ public SqlSource() [JsonProperty(PropertyName = "storedProcedureParameters")] public IDictionary StoredProcedureParameters { get; set; } + /// + /// Gets or sets specifies the transaction locking behavior for the SQL + /// source. Allowed values: + /// ReadCommitted/ReadUncommitted/RepeatableRead/Serializable/Snapshot. + /// The default value is ReadCommitted. Type: string (or Expression + /// with resultType string). + /// + [JsonProperty(PropertyName = "isolationLevel")] + public object IsolationLevel { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SquareSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SquareSource.cs index b64945e8a0b8..776789018a18 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SquareSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SquareSource.cs @@ -44,10 +44,13 @@ public SquareSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public SquareSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SquareSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SybaseSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SybaseSource.cs index 00080eae112a..554c210f05ec 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SybaseSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SybaseSource.cs @@ -44,10 +44,13 @@ public SybaseSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Database query. Type: string (or Expression /// with resultType string). - public SybaseSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public SybaseSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TabularSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TabularSource.cs index 1e9a2e846729..a93d25996034 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TabularSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TabularSource.cs @@ -44,10 +44,14 @@ public TabularSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). - public TabularSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public TabularSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { QueryTimeout = queryTimeout; + AdditionalColumns = additionalColumns; CustomInit(); } @@ -64,5 +68,13 @@ public TabularSource() [JsonProperty(PropertyName = "queryTimeout")] public object QueryTimeout { get; set; } + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeradataSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeradataSource.cs index aeb2158a33fb..515880a57348 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeradataSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TeradataSource.cs @@ -44,6 +44,9 @@ public TeradataSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// Teradata query. Type: string (or Expression /// with resultType string). /// The partition mechanism that will be @@ -51,8 +54,8 @@ public TeradataSource() /// 'None', 'Hash', 'DynamicRange' /// The settings that will be leveraged /// for teradata source partitioning. - public TeradataSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object), string partitionOption = default(string), TeradataPartitionSettings partitionSettings = default(TeradataPartitionSettings)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public TeradataSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), string partitionOption = default(string), TeradataPartitionSettings partitionSettings = default(TeradataPartitionSettings)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; PartitionOption = partitionOption; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TriggerFilterParameters.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TriggerFilterParameters.cs new file mode 100644 index 000000000000..96cd2858e1cd --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TriggerFilterParameters.cs @@ -0,0 +1,63 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Query parameters for triggers. + /// + public partial class TriggerFilterParameters + { + /// + /// Initializes a new instance of the TriggerFilterParameters class. + /// + public TriggerFilterParameters() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the TriggerFilterParameters class. + /// + /// The continuation token for getting + /// the next page of results. Null for first page. + /// The name of the parent + /// TumblingWindowTrigger to get the child rerun triggers + public TriggerFilterParameters(string continuationToken = default(string), string parentTriggerName = default(string)) + { + ContinuationToken = continuationToken; + ParentTriggerName = parentTriggerName; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the continuation token for getting the next page of + /// results. Null for first page. + /// + [JsonProperty(PropertyName = "continuationToken")] + public string ContinuationToken { get; set; } + + /// + /// Gets or sets the name of the parent TumblingWindowTrigger to get + /// the child rerun triggers + /// + [JsonProperty(PropertyName = "parentTriggerName")] + public string ParentTriggerName { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TriggerQueryResponse.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TriggerQueryResponse.cs new file mode 100644 index 000000000000..82615f3a500c --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TriggerQueryResponse.cs @@ -0,0 +1,88 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// A query of triggers. + /// + public partial class TriggerQueryResponse + { + /// + /// Initializes a new instance of the TriggerQueryResponse class. + /// + public TriggerQueryResponse() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the TriggerQueryResponse class. + /// + /// List of triggers. + /// The continuation token for getting + /// the next page of results, if any remaining results exist, null + /// otherwise. + public TriggerQueryResponse(IList value, string continuationToken = default(string)) + { + Value = value; + ContinuationToken = continuationToken; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets list of triggers. + /// + [JsonProperty(PropertyName = "value")] + public IList Value { get; set; } + + /// + /// Gets or sets the continuation token for getting the next page of + /// results, if any remaining results exist, null otherwise. + /// + [JsonProperty(PropertyName = "continuationToken")] + public string ContinuationToken { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Value == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Value"); + } + if (Value != null) + { + foreach (var element in Value) + { + if (element != null) + { + element.Validate(); + } + } + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowTriggerDependencyReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowTriggerDependencyReference.cs index 3c26484919d2..b274d37a7636 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowTriggerDependencyReference.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/TumblingWindowTriggerDependencyReference.cs @@ -85,9 +85,9 @@ public override void Validate() { 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]))")) + 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]))"); + throw new ValidationException(ValidationRules.Pattern, "Offset", "-?((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))"); } } if (Size != null) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/VerticaSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/VerticaSource.cs index 01c13268b5ae..47cb98354684 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/VerticaSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/VerticaSource.cs @@ -44,10 +44,13 @@ public VerticaSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public VerticaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public VerticaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebSource.cs index 94adcaeac67b..ab7df4ae873d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebSource.cs @@ -10,6 +10,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -40,9 +41,13 @@ public WebSource() /// The maximum concurrent /// connection count for the source data store. Type: integer (or /// Expression with resultType integer). - public WebSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object)) + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). + public WebSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), IList additionalColumns = default(IList)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections) { + AdditionalColumns = additionalColumns; CustomInit(); } @@ -51,5 +56,13 @@ public WebSource() /// partial void CustomInit(); + /// + /// Gets or sets specifies the additional columns to be added to source + /// data. Type: array of objects (or Expression with resultType array + /// of objects). + /// + [JsonProperty(PropertyName = "additionalColumns")] + public IList AdditionalColumns { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XeroSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XeroSource.cs index 0100f0cdc337..96a74f91375d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XeroSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XeroSource.cs @@ -44,10 +44,13 @@ public XeroSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public XeroSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public XeroSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZohoSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZohoSource.cs index 38761b25364f..6cc6a0b1f5d0 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZohoSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ZohoSource.cs @@ -44,10 +44,13 @@ public ZohoSource() /// Query timeout. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects (or Expression with + /// resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). - public ZohoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), object query = default(object)) - : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout) + public ZohoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { Query = query; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/PipelinesOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/PipelinesOperations.cs index 011c56eb99ea..8433a0986787 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/PipelinesOperations.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/PipelinesOperations.cs @@ -1075,6 +1075,11 @@ internal PipelinesOperations(DataFactoryManagementClient client) /// In recovery mode, the rerun will start from this activity. If not /// specified, all activities will run. /// + /// + /// In recovery mode, if set to true, the rerun will start from failed + /// activities. The property will be used only if startActivityName is not + /// specified. + /// /// /// Parameters of the pipeline run. These parameters will be used only if the /// runId is not specified. @@ -1100,7 +1105,7 @@ internal PipelinesOperations(DataFactoryManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> CreateRunWithHttpMessagesAsync(string resourceGroupName, string factoryName, string pipelineName, string referencePipelineRunId = default(string), bool? isRecovery = default(bool?), string startActivityName = default(string), IDictionary parameters = default(IDictionary), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> CreateRunWithHttpMessagesAsync(string resourceGroupName, string factoryName, string pipelineName, string referencePipelineRunId = default(string), bool? isRecovery = default(bool?), string startActivityName = default(string), bool? startFromFailure = default(bool?), IDictionary parameters = default(IDictionary), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -1180,6 +1185,7 @@ internal PipelinesOperations(DataFactoryManagementClient client) tracingParameters.Add("referencePipelineRunId", referencePipelineRunId); tracingParameters.Add("isRecovery", isRecovery); tracingParameters.Add("startActivityName", startActivityName); + tracingParameters.Add("startFromFailure", startFromFailure); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "CreateRun", tracingParameters); @@ -1208,6 +1214,10 @@ internal PipelinesOperations(DataFactoryManagementClient client) { _queryParameters.Add(string.Format("startActivityName={0}", System.Uri.EscapeDataString(startActivityName))); } + if (startFromFailure != null) + { + _queryParameters.Add(string.Format("startFromFailure={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(startFromFailure, Client.SerializationSettings).Trim('"')))); + } if (_queryParameters.Count > 0) { _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/PipelinesOperationsExtensions.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/PipelinesOperationsExtensions.cs index 3179cc730385..09978899849d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/PipelinesOperationsExtensions.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/PipelinesOperationsExtensions.cs @@ -250,13 +250,18 @@ public static void Delete(this IPipelinesOperations operations, string resourceG /// In recovery mode, the rerun will start from this activity. If not /// specified, all activities will run. /// + /// + /// In recovery mode, if set to true, the rerun will start from failed + /// activities. The property will be used only if startActivityName is not + /// specified. + /// /// /// Parameters of the pipeline run. These parameters will be used only if the /// runId is not specified. /// - public static CreateRunResponse CreateRun(this IPipelinesOperations operations, string resourceGroupName, string factoryName, string pipelineName, string referencePipelineRunId = default(string), bool? isRecovery = default(bool?), string startActivityName = default(string), IDictionary parameters = default(IDictionary)) + public static CreateRunResponse CreateRun(this IPipelinesOperations operations, string resourceGroupName, string factoryName, string pipelineName, string referencePipelineRunId = default(string), bool? isRecovery = default(bool?), string startActivityName = default(string), bool? startFromFailure = default(bool?), IDictionary parameters = default(IDictionary)) { - return operations.CreateRunAsync(resourceGroupName, factoryName, pipelineName, referencePipelineRunId, isRecovery, startActivityName, parameters).GetAwaiter().GetResult(); + return operations.CreateRunAsync(resourceGroupName, factoryName, pipelineName, referencePipelineRunId, isRecovery, startActivityName, startFromFailure, parameters).GetAwaiter().GetResult(); } /// @@ -287,6 +292,11 @@ public static void Delete(this IPipelinesOperations operations, string resourceG /// In recovery mode, the rerun will start from this activity. If not /// specified, all activities will run. /// + /// + /// In recovery mode, if set to true, the rerun will start from failed + /// activities. The property will be used only if startActivityName is not + /// specified. + /// /// /// Parameters of the pipeline run. These parameters will be used only if the /// runId is not specified. @@ -294,9 +304,9 @@ public static void Delete(this IPipelinesOperations operations, string resourceG /// /// The cancellation token. /// - public static async Task CreateRunAsync(this IPipelinesOperations operations, string resourceGroupName, string factoryName, string pipelineName, string referencePipelineRunId = default(string), bool? isRecovery = default(bool?), string startActivityName = default(string), IDictionary parameters = default(IDictionary), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateRunAsync(this IPipelinesOperations operations, string resourceGroupName, string factoryName, string pipelineName, string referencePipelineRunId = default(string), bool? isRecovery = default(bool?), string startActivityName = default(string), bool? startFromFailure = default(bool?), IDictionary parameters = default(IDictionary), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.CreateRunWithHttpMessagesAsync(resourceGroupName, factoryName, pipelineName, referencePipelineRunId, isRecovery, startActivityName, parameters, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.CreateRunWithHttpMessagesAsync(resourceGroupName, factoryName, pipelineName, referencePipelineRunId, isRecovery, startActivityName, startFromFailure, parameters, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/RerunTriggersOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/RerunTriggersOperations.cs deleted file mode 100644 index 540b16f0014d..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/RerunTriggersOperations.cs +++ /dev/null @@ -1,1612 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.DataFactory -{ - using Microsoft.Rest; - using Microsoft.Rest.Azure; - using Models; - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - using System.Net; - using System.Net.Http; - using System.Threading; - using System.Threading.Tasks; - - /// - /// RerunTriggersOperations operations. - /// - internal partial class RerunTriggersOperations : IServiceOperations, IRerunTriggersOperations - { - /// - /// Initializes a new instance of the RerunTriggersOperations class. - /// - /// - /// Reference to the service client. - /// - /// - /// Thrown when a required parameter is null - /// - internal RerunTriggersOperations(DataFactoryManagementClient client) - { - if (client == null) - { - throw new System.ArgumentNullException("client"); - } - Client = client; - } - - /// - /// Gets a reference to the DataFactoryManagementClient - /// - public DataFactoryManagementClient Client { get; private set; } - - /// - /// Creates a rerun trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// Rerun tumbling window trigger action parameters. - /// - /// - /// 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> CreateWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, RerunTumblingWindowTriggerActionParameters rerunTumblingWindowTriggerActionParameters, 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 (triggerName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "triggerName"); - } - if (triggerName != null) - { - if (triggerName.Length > 260) - { - throw new ValidationException(ValidationRules.MaxLength, "triggerName", 260); - } - if (triggerName.Length < 1) - { - throw new ValidationException(ValidationRules.MinLength, "triggerName", 1); - } - if (!System.Text.RegularExpressions.Regex.IsMatch(triggerName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) - { - throw new ValidationException(ValidationRules.Pattern, "triggerName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); - } - } - if (rerunTriggerName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "rerunTriggerName"); - } - if (rerunTriggerName != null) - { - if (rerunTriggerName.Length > 260) - { - throw new ValidationException(ValidationRules.MaxLength, "rerunTriggerName", 260); - } - if (rerunTriggerName.Length < 1) - { - throw new ValidationException(ValidationRules.MinLength, "rerunTriggerName", 1); - } - if (!System.Text.RegularExpressions.Regex.IsMatch(rerunTriggerName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) - { - throw new ValidationException(ValidationRules.Pattern, "rerunTriggerName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); - } - } - if (Client.ApiVersion == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); - } - if (rerunTumblingWindowTriggerActionParameters == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "rerunTumblingWindowTriggerActionParameters"); - } - if (rerunTumblingWindowTriggerActionParameters != null) - { - rerunTumblingWindowTriggerActionParameters.Validate(); - } - // Tracing - bool _shouldTrace = ServiceClientTracing.IsEnabled; - string _invocationId = null; - if (_shouldTrace) - { - _invocationId = ServiceClientTracing.NextInvocationId.ToString(); - Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("factoryName", factoryName); - tracingParameters.Add("triggerName", triggerName); - tracingParameters.Add("rerunTriggerName", rerunTriggerName); - tracingParameters.Add("rerunTumblingWindowTriggerActionParameters", rerunTumblingWindowTriggerActionParameters); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "Create", 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}/triggers/{triggerName}/rerunTriggers/{rerunTriggerName}").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("{triggerName}", System.Uri.EscapeDataString(triggerName)); - _url = _url.Replace("{rerunTriggerName}", System.Uri.EscapeDataString(rerunTriggerName)); - 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("PUT"); - _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(rerunTumblingWindowTriggerActionParameters != null) - { - _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(rerunTumblingWindowTriggerActionParameters, 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 trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - public async Task StartWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) - { - // Send request - AzureOperationResponse _response = await BeginStartWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, customHeaders, cancellationToken).ConfigureAwait(false); - return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); - } - - /// - /// Stops a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - public async Task StopWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) - { - // Send request - AzureOperationResponse _response = await BeginStopWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, customHeaders, cancellationToken).ConfigureAwait(false); - return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); - } - - /// - /// Cancels a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - public async Task CancelWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) - { - // Send request - AzureOperationResponse _response = await BeginCancelWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, customHeaders, cancellationToken).ConfigureAwait(false); - return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); - } - - /// - /// Lists rerun triggers by an original trigger name. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger 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>> ListByTriggerWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, 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 (triggerName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "triggerName"); - } - if (triggerName != null) - { - if (triggerName.Length > 260) - { - throw new ValidationException(ValidationRules.MaxLength, "triggerName", 260); - } - if (triggerName.Length < 1) - { - throw new ValidationException(ValidationRules.MinLength, "triggerName", 1); - } - if (!System.Text.RegularExpressions.Regex.IsMatch(triggerName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) - { - throw new ValidationException(ValidationRules.Pattern, "triggerName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); - } - } - if (Client.ApiVersion == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); - } - // Tracing - bool _shouldTrace = ServiceClientTracing.IsEnabled; - string _invocationId = null; - if (_shouldTrace) - { - _invocationId = ServiceClientTracing.NextInvocationId.ToString(); - Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("factoryName", factoryName); - tracingParameters.Add("triggerName", triggerName); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "ListByTrigger", 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}/triggers/{triggerName}/rerunTriggers").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("{triggerName}", System.Uri.EscapeDataString(triggerName)); - 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; - } - - /// - /// Starts a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// Headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// 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 BeginStartWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, 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 (triggerName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "triggerName"); - } - if (triggerName != null) - { - if (triggerName.Length > 260) - { - throw new ValidationException(ValidationRules.MaxLength, "triggerName", 260); - } - if (triggerName.Length < 1) - { - throw new ValidationException(ValidationRules.MinLength, "triggerName", 1); - } - if (!System.Text.RegularExpressions.Regex.IsMatch(triggerName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) - { - throw new ValidationException(ValidationRules.Pattern, "triggerName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); - } - } - if (rerunTriggerName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "rerunTriggerName"); - } - if (rerunTriggerName != null) - { - if (rerunTriggerName.Length > 260) - { - throw new ValidationException(ValidationRules.MaxLength, "rerunTriggerName", 260); - } - if (rerunTriggerName.Length < 1) - { - throw new ValidationException(ValidationRules.MinLength, "rerunTriggerName", 1); - } - if (!System.Text.RegularExpressions.Regex.IsMatch(rerunTriggerName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) - { - throw new ValidationException(ValidationRules.Pattern, "rerunTriggerName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); - } - } - if (Client.ApiVersion == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); - } - // Tracing - bool _shouldTrace = ServiceClientTracing.IsEnabled; - string _invocationId = null; - if (_shouldTrace) - { - _invocationId = ServiceClientTracing.NextInvocationId.ToString(); - Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("factoryName", factoryName); - tracingParameters.Add("triggerName", triggerName); - tracingParameters.Add("rerunTriggerName", rerunTriggerName); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "BeginStart", 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}/triggers/{triggerName}/rerunTriggers/{rerunTriggerName}/start").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("{triggerName}", System.Uri.EscapeDataString(triggerName)); - _url = _url.Replace("{rerunTriggerName}", System.Uri.EscapeDataString(rerunTriggerName)); - List _queryParameters = new List(); - if (Client.ApiVersion != null) - { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); - } - if (_queryParameters.Count > 0) - { - _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); - } - // Create HTTP transport objects - var _httpRequest = new HttpRequestMessage(); - HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("POST"); - _httpRequest.RequestUri = new System.Uri(_url); - // Set Headers - if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) - { - _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); - } - if (Client.AcceptLanguage != null) - { - if (_httpRequest.Headers.Contains("accept-language")) - { - _httpRequest.Headers.Remove("accept-language"); - } - _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); - } - - - if (customHeaders != null) - { - foreach(var _header in customHeaders) - { - if (_httpRequest.Headers.Contains(_header.Key)) - { - _httpRequest.Headers.Remove(_header.Key); - } - _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); - } - } - - // Serialize Request - string _requestContent = null; - // Set Credentials - if (Client.Credentials != null) - { - cancellationToken.ThrowIfCancellationRequested(); - await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - } - // Send Request - if (_shouldTrace) - { - ServiceClientTracing.SendRequest(_invocationId, _httpRequest); - } - cancellationToken.ThrowIfCancellationRequested(); - _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - if (_shouldTrace) - { - ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); - } - HttpStatusCode _statusCode = _httpResponse.StatusCode; - cancellationToken.ThrowIfCancellationRequested(); - string _responseContent = null; - if ((int)_statusCode != 200) - { - 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(); - } - if (_shouldTrace) - { - ServiceClientTracing.Exit(_invocationId, _result); - } - return _result; - } - - /// - /// Stops a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// Headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// 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 BeginStopWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, 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 (triggerName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "triggerName"); - } - if (triggerName != null) - { - if (triggerName.Length > 260) - { - throw new ValidationException(ValidationRules.MaxLength, "triggerName", 260); - } - if (triggerName.Length < 1) - { - throw new ValidationException(ValidationRules.MinLength, "triggerName", 1); - } - if (!System.Text.RegularExpressions.Regex.IsMatch(triggerName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) - { - throw new ValidationException(ValidationRules.Pattern, "triggerName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); - } - } - if (rerunTriggerName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "rerunTriggerName"); - } - if (rerunTriggerName != null) - { - if (rerunTriggerName.Length > 260) - { - throw new ValidationException(ValidationRules.MaxLength, "rerunTriggerName", 260); - } - if (rerunTriggerName.Length < 1) - { - throw new ValidationException(ValidationRules.MinLength, "rerunTriggerName", 1); - } - if (!System.Text.RegularExpressions.Regex.IsMatch(rerunTriggerName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) - { - throw new ValidationException(ValidationRules.Pattern, "rerunTriggerName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); - } - } - if (Client.ApiVersion == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); - } - // Tracing - bool _shouldTrace = ServiceClientTracing.IsEnabled; - string _invocationId = null; - if (_shouldTrace) - { - _invocationId = ServiceClientTracing.NextInvocationId.ToString(); - Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("factoryName", factoryName); - tracingParameters.Add("triggerName", triggerName); - tracingParameters.Add("rerunTriggerName", rerunTriggerName); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "BeginStop", 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}/triggers/{triggerName}/rerunTriggers/{rerunTriggerName}/stop").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("{triggerName}", System.Uri.EscapeDataString(triggerName)); - _url = _url.Replace("{rerunTriggerName}", System.Uri.EscapeDataString(rerunTriggerName)); - List _queryParameters = new List(); - if (Client.ApiVersion != null) - { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); - } - if (_queryParameters.Count > 0) - { - _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); - } - // Create HTTP transport objects - var _httpRequest = new HttpRequestMessage(); - HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("POST"); - _httpRequest.RequestUri = new System.Uri(_url); - // Set Headers - if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) - { - _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); - } - if (Client.AcceptLanguage != null) - { - if (_httpRequest.Headers.Contains("accept-language")) - { - _httpRequest.Headers.Remove("accept-language"); - } - _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); - } - - - if (customHeaders != null) - { - foreach(var _header in customHeaders) - { - if (_httpRequest.Headers.Contains(_header.Key)) - { - _httpRequest.Headers.Remove(_header.Key); - } - _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); - } - } - - // Serialize Request - string _requestContent = null; - // Set Credentials - if (Client.Credentials != null) - { - cancellationToken.ThrowIfCancellationRequested(); - await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - } - // Send Request - if (_shouldTrace) - { - ServiceClientTracing.SendRequest(_invocationId, _httpRequest); - } - cancellationToken.ThrowIfCancellationRequested(); - _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - if (_shouldTrace) - { - ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); - } - HttpStatusCode _statusCode = _httpResponse.StatusCode; - cancellationToken.ThrowIfCancellationRequested(); - string _responseContent = null; - if ((int)_statusCode != 200) - { - 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(); - } - if (_shouldTrace) - { - ServiceClientTracing.Exit(_invocationId, _result); - } - return _result; - } - - /// - /// Cancels a trigger. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// Headers that will be added to request. - /// - /// - /// The cancellation token. - /// - /// - /// Thrown when the operation returned an invalid status code - /// - /// - /// 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 BeginCancelWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, 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 (triggerName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "triggerName"); - } - if (triggerName != null) - { - if (triggerName.Length > 260) - { - throw new ValidationException(ValidationRules.MaxLength, "triggerName", 260); - } - if (triggerName.Length < 1) - { - throw new ValidationException(ValidationRules.MinLength, "triggerName", 1); - } - if (!System.Text.RegularExpressions.Regex.IsMatch(triggerName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) - { - throw new ValidationException(ValidationRules.Pattern, "triggerName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); - } - } - if (rerunTriggerName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "rerunTriggerName"); - } - if (rerunTriggerName != null) - { - if (rerunTriggerName.Length > 260) - { - throw new ValidationException(ValidationRules.MaxLength, "rerunTriggerName", 260); - } - if (rerunTriggerName.Length < 1) - { - throw new ValidationException(ValidationRules.MinLength, "rerunTriggerName", 1); - } - if (!System.Text.RegularExpressions.Regex.IsMatch(rerunTriggerName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) - { - throw new ValidationException(ValidationRules.Pattern, "rerunTriggerName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); - } - } - if (Client.ApiVersion == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); - } - // Tracing - bool _shouldTrace = ServiceClientTracing.IsEnabled; - string _invocationId = null; - if (_shouldTrace) - { - _invocationId = ServiceClientTracing.NextInvocationId.ToString(); - Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("factoryName", factoryName); - tracingParameters.Add("triggerName", triggerName); - tracingParameters.Add("rerunTriggerName", rerunTriggerName); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "BeginCancel", 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}/triggers/{triggerName}/rerunTriggers/{rerunTriggerName}/cancel").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("{triggerName}", System.Uri.EscapeDataString(triggerName)); - _url = _url.Replace("{rerunTriggerName}", System.Uri.EscapeDataString(rerunTriggerName)); - List _queryParameters = new List(); - if (Client.ApiVersion != null) - { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); - } - if (_queryParameters.Count > 0) - { - _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); - } - // Create HTTP transport objects - var _httpRequest = new HttpRequestMessage(); - HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("POST"); - _httpRequest.RequestUri = new System.Uri(_url); - // Set Headers - if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) - { - _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); - } - if (Client.AcceptLanguage != null) - { - if (_httpRequest.Headers.Contains("accept-language")) - { - _httpRequest.Headers.Remove("accept-language"); - } - _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); - } - - - if (customHeaders != null) - { - foreach(var _header in customHeaders) - { - if (_httpRequest.Headers.Contains(_header.Key)) - { - _httpRequest.Headers.Remove(_header.Key); - } - _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); - } - } - - // Serialize Request - string _requestContent = null; - // Set Credentials - if (Client.Credentials != null) - { - cancellationToken.ThrowIfCancellationRequested(); - await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - } - // Send Request - if (_shouldTrace) - { - ServiceClientTracing.SendRequest(_invocationId, _httpRequest); - } - cancellationToken.ThrowIfCancellationRequested(); - _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - if (_shouldTrace) - { - ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); - } - HttpStatusCode _statusCode = _httpResponse.StatusCode; - cancellationToken.ThrowIfCancellationRequested(); - string _responseContent = null; - if ((int)_statusCode != 200) - { - 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(); - } - if (_shouldTrace) - { - ServiceClientTracing.Exit(_invocationId, _result); - } - return _result; - } - - /// - /// Lists rerun triggers by an original trigger name. - /// - /// - /// The NextLink from the previous successful call to List operation. - /// - /// - /// 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>> ListByTriggerNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) - { - if (nextPageLink == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink"); - } - // Tracing - bool _shouldTrace = ServiceClientTracing.IsEnabled; - string _invocationId = null; - if (_shouldTrace) - { - _invocationId = ServiceClientTracing.NextInvocationId.ToString(); - Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("nextPageLink", nextPageLink); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "ListByTriggerNext", tracingParameters); - } - // Construct URL - string _url = "{nextLink}"; - _url = _url.Replace("{nextLink}", nextPageLink); - List _queryParameters = new List(); - 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; - } - - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/RerunTriggersOperationsExtensions.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/RerunTriggersOperationsExtensions.cs deleted file mode 100644 index cdd2b66de90e..000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/RerunTriggersOperationsExtensions.cs +++ /dev/null @@ -1,457 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.DataFactory -{ - using Microsoft.Rest; - using Microsoft.Rest.Azure; - using Models; - using System.Threading; - using System.Threading.Tasks; - - /// - /// Extension methods for RerunTriggersOperations. - /// - public static partial class RerunTriggersOperationsExtensions - { - /// - /// Creates a rerun trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// Rerun tumbling window trigger action parameters. - /// - public static TriggerResource Create(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, RerunTumblingWindowTriggerActionParameters rerunTumblingWindowTriggerActionParameters) - { - return operations.CreateAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, rerunTumblingWindowTriggerActionParameters).GetAwaiter().GetResult(); - } - - /// - /// Creates a rerun trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// Rerun tumbling window trigger action parameters. - /// - /// - /// The cancellation token. - /// - public static async Task CreateAsync(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, RerunTumblingWindowTriggerActionParameters rerunTumblingWindowTriggerActionParameters, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, rerunTumblingWindowTriggerActionParameters, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// Starts a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - public static void Start(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName) - { - operations.StartAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName).GetAwaiter().GetResult(); - } - - /// - /// Starts a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The cancellation token. - /// - public static async Task StartAsync(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, CancellationToken cancellationToken = default(CancellationToken)) - { - (await operations.StartWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, null, cancellationToken).ConfigureAwait(false)).Dispose(); - } - - /// - /// Stops a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - public static void Stop(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName) - { - operations.StopAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName).GetAwaiter().GetResult(); - } - - /// - /// Stops a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The cancellation token. - /// - public static async Task StopAsync(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, CancellationToken cancellationToken = default(CancellationToken)) - { - (await operations.StopWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, null, cancellationToken).ConfigureAwait(false)).Dispose(); - } - - /// - /// Cancels a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - public static void Cancel(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName) - { - operations.CancelAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName).GetAwaiter().GetResult(); - } - - /// - /// Cancels a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The cancellation token. - /// - public static async Task CancelAsync(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, CancellationToken cancellationToken = default(CancellationToken)) - { - (await operations.CancelWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, null, cancellationToken).ConfigureAwait(false)).Dispose(); - } - - /// - /// Lists rerun triggers by an original trigger name. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - public static IPage ListByTrigger(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName) - { - return operations.ListByTriggerAsync(resourceGroupName, factoryName, triggerName).GetAwaiter().GetResult(); - } - - /// - /// Lists rerun triggers by an original trigger name. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The cancellation token. - /// - public static async Task> ListByTriggerAsync(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.ListByTriggerWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - /// - /// Starts a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - public static void BeginStart(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName) - { - operations.BeginStartAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName).GetAwaiter().GetResult(); - } - - /// - /// Starts a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The cancellation token. - /// - public static async Task BeginStartAsync(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, CancellationToken cancellationToken = default(CancellationToken)) - { - (await operations.BeginStartWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, null, cancellationToken).ConfigureAwait(false)).Dispose(); - } - - /// - /// Stops a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - public static void BeginStop(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName) - { - operations.BeginStopAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName).GetAwaiter().GetResult(); - } - - /// - /// Stops a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The cancellation token. - /// - public static async Task BeginStopAsync(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, CancellationToken cancellationToken = default(CancellationToken)) - { - (await operations.BeginStopWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, null, cancellationToken).ConfigureAwait(false)).Dispose(); - } - - /// - /// Cancels a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - public static void BeginCancel(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName) - { - operations.BeginCancelAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName).GetAwaiter().GetResult(); - } - - /// - /// Cancels a trigger. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The resource group name. - /// - /// - /// The factory name. - /// - /// - /// The trigger name. - /// - /// - /// The rerun trigger name. - /// - /// - /// The cancellation token. - /// - public static async Task BeginCancelAsync(this IRerunTriggersOperations operations, string resourceGroupName, string factoryName, string triggerName, string rerunTriggerName, CancellationToken cancellationToken = default(CancellationToken)) - { - (await operations.BeginCancelWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, rerunTriggerName, null, cancellationToken).ConfigureAwait(false)).Dispose(); - } - - /// - /// Lists rerun triggers by an original trigger name. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The NextLink from the previous successful call to List operation. - /// - public static IPage ListByTriggerNext(this IRerunTriggersOperations operations, string nextPageLink) - { - return operations.ListByTriggerNextAsync(nextPageLink).GetAwaiter().GetResult(); - } - - /// - /// Lists rerun triggers by an original trigger name. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The NextLink from the previous successful call to List operation. - /// - /// - /// The cancellation token. - /// - public static async Task> ListByTriggerNextAsync(this IRerunTriggersOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.ListByTriggerNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - - } -} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs index 7c915a373c10..b31348b3961b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs @@ -32,22 +32,10 @@ public static IEnumerable> ApiInfo_DataFactoryMana new Tuple("DataFactory", "Operations", "2018-06-01"), new Tuple("DataFactory", "PipelineRuns", "2018-06-01"), new Tuple("DataFactory", "Pipelines", "2018-06-01"), - new Tuple("DataFactory", "RerunTriggers", "2018-06-01"), new Tuple("DataFactory", "TriggerRuns", "2018-06-01"), new Tuple("DataFactory", "Triggers", "2018-06-01"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "latest"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4407"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Git\\Azure\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "e6a133198d4bc7e0cc8a3e42f8e10c5353a1d4ed"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } - diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggersOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggersOperations.cs index 08657cb81ff2..24c8316dfff1 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggersOperations.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggersOperations.cs @@ -276,6 +276,246 @@ internal TriggersOperations(DataFactoryManagementClient client) return _result; } + /// + /// Query triggers. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// Parameters to filter the triggers. + /// + /// + /// 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> QueryByFactoryWithHttpMessagesAsync(string resourceGroupName, string factoryName, TriggerFilterParameters filterParameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (resourceGroupName != null) + { + if (resourceGroupName.Length > 90) + { + throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90); + } + if (resourceGroupName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+$")) + { + throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+$"); + } + } + if (factoryName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "factoryName"); + } + if (factoryName != null) + { + if (factoryName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "factoryName", 63); + } + if (factoryName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "factoryName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(factoryName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "factoryName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + if (filterParameters == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "filterParameters"); + } + // 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("filterParameters", filterParameters); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "QueryByFactory", 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}/querytriggers").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{factoryName}", System.Uri.EscapeDataString(factoryName)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("POST"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + if(filterParameters != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(filterParameters, 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; + } + /// /// Creates or updates a trigger. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggersOperationsExtensions.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggersOperationsExtensions.cs index 62ee3833a23c..a8037398ce7a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggersOperationsExtensions.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggersOperationsExtensions.cs @@ -61,6 +61,52 @@ public static IPage ListByFactory(this ITriggersOperations oper } } + /// + /// Query triggers. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// Parameters to filter the triggers. + /// + public static TriggerQueryResponse QueryByFactory(this ITriggersOperations operations, string resourceGroupName, string factoryName, TriggerFilterParameters filterParameters) + { + return operations.QueryByFactoryAsync(resourceGroupName, factoryName, filterParameters).GetAwaiter().GetResult(); + } + + /// + /// Query triggers. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// Parameters to filter the triggers. + /// + /// + /// The cancellation token. + /// + public static async Task QueryByFactoryAsync(this ITriggersOperations operations, string resourceGroupName, string factoryName, TriggerFilterParameters filterParameters, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.QueryByFactoryWithHttpMessagesAsync(resourceGroupName, factoryName, filterParameters, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Creates or updates a trigger. ///