From b330d7afddb1a8adb3a78e3c560fd2e68dcfa820 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 13 Jul 2021 13:23:36 +0800 Subject: [PATCH 1/5] [DataFactory]Added new features into 4.21.0 --- .../datafactory_resource-manager.txt | 6 +++--- .../src/CHANGELOG.md | 5 +++++ .../src/Generated/Models/AvroDataset.cs | 12 +++++------ .../src/Generated/Models/OrcDataset.cs | 12 +++++------ .../Generated/Models/PipelineRunInvokedBy.cs | 20 ++++++++++++++++++- .../SdkInfo_DataFactoryManagementClient.cs | 7 +++++-- ...rosoft.Azure.Management.DataFactory.csproj | 5 +++-- .../src/Properties/AssemblyInfo.cs | 4 ++-- .../tests/TestData/PipelineRuns_Get.json | 4 +++- 9 files changed, 52 insertions(+), 23 deletions(-) diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index e08a8b87808d0..cd850a47056c1 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -3,12 +3,12 @@ AutoRest installed successfully. Commencing code generation Generating CSharp code Executing AutoRest command -cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk -2021-06-09 05:49:23 UTC +cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net-1\sdk +2021-07-13 04:55:38 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 50eae85eb163a45c70a516cb3ca1225605ca381b +Commit: 2a8a9a79b23c72c6092d5b1212acf6d69b1b3850 AutoRest information Requested version: v2 Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 8430358e5ce8d..4a47c3bfb082b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 4.21.0 +### Feature Additions +- Added properties pipelineName and pipelineRunId to PipelineRunInvokedBy definition +- Updated avroCompressionCodec and orcCompressionCodec from string to object + ## Version 4.20.0 ### Feature Additions - Added disableMetricsCollection in read/wirte properties diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroDataset.cs index c655b1c4b9b9b..a1f7615cf8cf4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroDataset.cs @@ -52,9 +52,9 @@ public AvroDataset() /// describing the Dataset. /// The folder that this Dataset is in. If not /// specified, Dataset will appear at the root level. - /// Possible values include: 'none', - /// 'deflate', 'snappy', 'xz', 'bzip2' - public AvroDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), string avroCompressionCodec = default(string), int? avroCompressionLevel = default(int?)) + /// The data avroCompressionCodec. + /// Type: string (or Expression with resultType string). + public AvroDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object avroCompressionCodec = default(object), int? avroCompressionLevel = default(int?)) : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { Location = location; @@ -75,11 +75,11 @@ public AvroDataset() public DatasetLocation Location { get; set; } /// - /// Gets or sets possible values include: 'none', 'deflate', 'snappy', - /// 'xz', 'bzip2' + /// Gets or sets the data avroCompressionCodec. Type: string (or + /// Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.avroCompressionCodec")] - public string AvroCompressionCodec { get; set; } + public object AvroCompressionCodec { get; set; } /// /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs index 8a368a17b3529..05b8c537a2ba8 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs @@ -53,9 +53,9 @@ public OrcDataset() /// describing the Dataset. /// The folder that this Dataset is in. If not /// specified, Dataset will appear at the root level. - /// Possible values include: 'none', - /// 'zlib', 'snappy', 'lzo' - public OrcDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), string orcCompressionCodec = default(string)) + /// The data orcCompressionCodec. + /// Type: string (or Expression with resultType string). + public OrcDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object orcCompressionCodec = default(object)) : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { Location = location; @@ -75,11 +75,11 @@ public OrcDataset() public DatasetLocation Location { get; set; } /// - /// Gets or sets possible values include: 'none', 'zlib', 'snappy', - /// 'lzo' + /// Gets or sets the data orcCompressionCodec. Type: string (or + /// Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.orcCompressionCodec")] - public string OrcCompressionCodec { get; set; } + public object OrcCompressionCodec { get; set; } /// /// Validate the object. diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRunInvokedBy.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRunInvokedBy.cs index 2f94c1e336c7e..7c34f61710639 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRunInvokedBy.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRunInvokedBy.cs @@ -34,11 +34,17 @@ public PipelineRunInvokedBy() /// The ID of the entity that started the run. /// The type of the entity that started the /// run. - public PipelineRunInvokedBy(string name = default(string), string id = default(string), string invokedByType = default(string)) + /// The name of the pipeline that triggered + /// the run, if any. + /// The run id of the pipeline that + /// triggered the run, if any. + public PipelineRunInvokedBy(string name = default(string), string id = default(string), string invokedByType = default(string), string pipelineName = default(string), string pipelineRunId = default(string)) { Name = name; Id = id; InvokedByType = invokedByType; + PipelineName = pipelineName; + PipelineRunId = pipelineRunId; CustomInit(); } @@ -65,5 +71,17 @@ public PipelineRunInvokedBy() [JsonProperty(PropertyName = "invokedByType")] public string InvokedByType { get; private set; } + /// + /// Gets the name of the pipeline that triggered the run, if any. + /// + [JsonProperty(PropertyName = "pipelineName")] + public string PipelineName { get; private set; } + + /// + /// Gets the run id of the pipeline that triggered the run, if any. + /// + [JsonProperty(PropertyName = "pipelineRunId")] + public string PipelineRunId { get; private set; } + } } 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 2011a9871690d..fcaa64287cb32 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 @@ -34,19 +34,22 @@ 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", "PrivateEndpointConnection", "2018-06-01"), new Tuple("DataFactory", "TriggerRuns", "2018-06-01"), new Tuple("DataFactory", "Triggers", "2018-06-01"), new Tuple("DataFactory", "managedPrivateEndpoints", "2018-06-01"), + new Tuple("DataFactory", "privateEndPointConnections", "2018-06-01"), + new Tuple("DataFactory", "privateLinkResources", "2018-06-01"), }.AsEnumerable(); } } // BEGIN: Code Generation Metadata Section public static readonly String AutoRestVersion = "v2"; public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Projects\\azure-sdk-for-net\\sdk"; + public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Projects\\azure-sdk-for-net-1\\sdk"; public static readonly String GithubForkName = "Azure"; public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "fce3400431eff281bddd04bed9727e63765b8da0"; + public static readonly String GithubCommidId = "2a8a9a79b23c72c6092d5b1212acf6d69b1b3850"; public static readonly String CodeGenerationErrors = ""; public static readonly String GithubRepoName = "azure-rest-api-specs"; // END: Code Generation Metadata Section diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index b2ab3797afe38..e396304f9140a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -5,12 +5,13 @@ Microsoft.Azure.Management.DataFactory Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms. - 4.20.0 + 4.21.0 Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs index ccfe7a42a4303..a67de1d2171db 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("4.20.0.0")] -[assembly: AssemblyFileVersion("4.20.0.0")] +[assembly: AssemblyVersion("4.21.0.0")] +[assembly: AssemblyFileVersion("4.21.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/TestData/PipelineRuns_Get.json b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/TestData/PipelineRuns_Get.json index 657ed25eed2f7..615600a92fbcb 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/TestData/PipelineRuns_Get.json +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/TestData/PipelineRuns_Get.json @@ -23,7 +23,9 @@ }, "invokedBy": { "id": "80a01654a9d34ad18b3fcac5d5d76b67", - "name": "Manual" + "name": "Manual", + "pipelineName": "examplePipelineName", + "pipelineRunId": "examplePipelineRunId" }, "runStart": "2018-06-16T00:37:44.6257014Z", "runEnd": "2018-06-16T00:38:12.7314495Z", From edd263dd4e3381b7dce6ff955401ee6f9fa5a47e Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Fri, 16 Jul 2021 14:46:25 +0800 Subject: [PATCH 2/5] update --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 1 + .../Generated/DataFactoryManagementClient.cs | 2 + .../Models/AzureBatchLinkedService.cs | 16 ++- .../Models/AzureBlobFSLinkedService.cs | 16 ++- .../Models/AzureBlobStorageLinkedService.cs | 16 ++- .../Models/AzureDataExplorerLinkedService.cs | 16 ++- .../Models/AzureDataLakeStoreLinkedService.cs | 16 ++- .../Models/AzureDatabricksLinkedService.cs | 16 ++- .../Models/AzureFunctionLinkedService.cs | 37 ++++++- .../Models/AzureKeyVaultLinkedService.cs | 16 ++- .../Generated/Models/AzureMLLinkedService.cs | 14 ++- .../Models/AzureSqlDWLinkedService.cs | 16 ++- .../Models/AzureSqlDatabaseLinkedService.cs | 16 ++- .../Models/AzureSqlMILinkedService.cs | 16 ++- .../src/Generated/Models/Credential.cs | 75 ++++++++++++++ .../Generated/Models/CredentialReference.cs | 90 +++++++++++++++++ .../Generated/Models/CredentialResource.cs | 70 +++++++++++++ .../src/Generated/Models/EntityReference.cs | 5 +- .../Models/GitHubAccessTokenRequest.cs | 11 ++- .../Generated/Models/GitHubClientSecret.cs | 62 ++++++++++++ .../Models/HDInsightOnDemandLinkedService.cs | 16 ++- .../IntegrationRuntimeEntityReferenceType.cs | 1 - .../IntegrationRuntimeSsisProperties.cs | 19 ++-- .../Models/ManagedIdentityCredential.cs | 64 ++++++++++++ .../Models/RestServiceLinkedService.cs | 16 ++- .../Models/ServicePrincipalCredential.cs | 97 +++++++++++++++++++ .../Models/WebActivityAuthentication.cs | 19 +++- ...rosoft.Azure.Management.DataFactory.csproj | 1 + .../JsonSamples/LinkedServiceJsonSamples.cs | 32 ++++++ .../IntegrationRuntimeScenarioTests.cs | 4 +- 31 files changed, 764 insertions(+), 36 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Credential.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialReference.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialResource.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubClientSecret.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIdentityCredential.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServicePrincipalCredential.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index cd850a47056c1..8e82d2b5abc9c 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,11 +4,11 @@ Commencing code generation Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net-1\sdk -2021-07-13 04:55:38 UTC +2021-07-16 06:45:57 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 2a8a9a79b23c72c6092d5b1212acf6d69b1b3850 +Commit: 86b65a6f0e0b637a774b177b3206155d990242d4 AutoRest information Requested version: v2 Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 4a47c3bfb082b..9e9a215e17ce5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -4,6 +4,7 @@ ### Feature Additions - Added properties pipelineName and pipelineRunId to PipelineRunInvokedBy definition - Updated avroCompressionCodec and orcCompressionCodec from string to object +- Supported UAMI in ADF IR/LS/Activity ## Version 4.20.0 ### Feature Additions 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 e43dae9a69086..19ce57683f0c4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs @@ -485,6 +485,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("authenticationType")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("authenticationType")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBatchLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBatchLinkedService.cs index 0eb3ded5e205b..da4ca8acbe699 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBatchLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBatchLinkedService.cs @@ -56,7 +56,9 @@ public AzureBatchLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureBatchLinkedService(object accountName, object batchUri, object poolName, LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessKey = default(SecretBase), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public AzureBatchLinkedService(object accountName, object batchUri, object poolName, LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessKey = default(SecretBase), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { AccountName = accountName; @@ -65,6 +67,7 @@ public AzureBatchLinkedService() PoolName = poolName; LinkedServiceName = linkedServiceName; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -114,6 +117,13 @@ public AzureBatchLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -143,6 +153,10 @@ public override void Validate() { LinkedServiceName.Validate(); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs index 53371190e54d4..ec81f0322ca53 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs @@ -66,7 +66,9 @@ public AzureBlobFSLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -76,6 +78,7 @@ public AzureBlobFSLinkedService() Tenant = tenant; AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -139,6 +142,13 @@ public AzureBlobFSLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -152,6 +162,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Url"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs index ac5982e173693..a6c32f5a87bf1 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs @@ -79,7 +79,9 @@ public AzureBlobStorageLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string accountKind = default(string), string encryptedCredential = default(string)) + /// The credential reference containing + /// authentication information. + public AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string accountKind = default(string), string encryptedCredential = default(string), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -93,6 +95,7 @@ public AzureBlobStorageLinkedService() AzureCloudType = azureCloudType; AccountKind = accountKind; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -189,6 +192,13 @@ public AzureBlobStorageLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public string EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -206,6 +216,10 @@ public override void Validate() { SasToken.Validate(); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerLinkedService.cs index bdfc0334dcca3..b18eb9b3bc0d7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerLinkedService.cs @@ -58,7 +58,9 @@ public AzureDataExplorerLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). - public AzureDataExplorerLinkedService(object endpoint, object database, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object)) + /// The credential reference containing + /// authentication information. + public AzureDataExplorerLinkedService(object endpoint, object database, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { Endpoint = endpoint; @@ -66,6 +68,7 @@ public AzureDataExplorerLinkedService() ServicePrincipalKey = servicePrincipalKey; Database = database; Tenant = tenant; + Credential = credential; CustomInit(); } @@ -113,6 +116,13 @@ public AzureDataExplorerLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -130,6 +140,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Database"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs index 007781598e447..a4c863d530469 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs @@ -71,7 +71,9 @@ public AzureDataLakeStoreLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureDataLakeStoreLinkedService(object dataLakeStoreUri, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object accountName = default(object), object subscriptionId = default(object), object resourceGroupName = default(object), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public AzureDataLakeStoreLinkedService(object dataLakeStoreUri, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object accountName = default(object), object subscriptionId = default(object), object resourceGroupName = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { DataLakeStoreUri = dataLakeStoreUri; @@ -83,6 +85,7 @@ public AzureDataLakeStoreLinkedService() SubscriptionId = subscriptionId; ResourceGroupName = resourceGroupName; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -162,6 +165,13 @@ public AzureDataLakeStoreLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -175,6 +185,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "DataLakeStoreUri"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs index 1a9b875cf53a3..d174e7000c08f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs @@ -111,7 +111,9 @@ public AzureDatabricksLinkedService() /// The policy id for limiting the ability to /// configure clusters based on a user defined set of rules. Type: /// string (or Expression with resultType string). - public AzureDatabricksLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object authentication = default(object), object workspaceResourceId = default(object), object existingClusterId = default(object), object instancePoolId = default(object), object newClusterVersion = default(object), object newClusterNumOfWorker = default(object), object newClusterNodeType = default(object), IDictionary newClusterSparkConf = default(IDictionary), IDictionary newClusterSparkEnvVars = default(IDictionary), IDictionary newClusterCustomTags = default(IDictionary), object newClusterLogDestination = default(object), object newClusterDriverNodeType = default(object), object newClusterInitScripts = default(object), object newClusterEnableElasticDisk = default(object), object encryptedCredential = default(object), object policyId = default(object)) + /// The credential reference containing + /// authentication information. + public AzureDatabricksLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object authentication = default(object), object workspaceResourceId = default(object), object existingClusterId = default(object), object instancePoolId = default(object), object newClusterVersion = default(object), object newClusterNumOfWorker = default(object), object newClusterNodeType = default(object), IDictionary newClusterSparkConf = default(IDictionary), IDictionary newClusterSparkEnvVars = default(IDictionary), IDictionary newClusterCustomTags = default(IDictionary), object newClusterLogDestination = default(object), object newClusterDriverNodeType = default(object), object newClusterInitScripts = default(object), object newClusterEnableElasticDisk = default(object), object encryptedCredential = default(object), object policyId = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { Domain = domain; @@ -132,6 +134,7 @@ public AzureDatabricksLinkedService() NewClusterEnableElasticDisk = newClusterEnableElasticDisk; EncryptedCredential = encryptedCredential; PolicyId = policyId; + Credential = credential; CustomInit(); } @@ -289,6 +292,13 @@ public AzureDatabricksLinkedService() [JsonProperty(PropertyName = "typeProperties.policyId")] public object PolicyId { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -302,6 +312,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Domain"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFunctionLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFunctionLinkedService.cs index 9ba0ba409246d..628961278213b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFunctionLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFunctionLinkedService.cs @@ -51,12 +51,22 @@ public AzureFunctionLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureFunctionLinkedService(object functionAppUrl, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase functionKey = default(SecretBase), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + /// Allowed token audiences for azure + /// function. + /// Type of authentication (Required to + /// specify MSI) used to connect to AzureFunction. Type: string (or + /// Expression with resultType string). + public AzureFunctionLinkedService(object functionAppUrl, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase functionKey = default(SecretBase), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object resourceId = default(object), object authentication = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { FunctionAppUrl = functionAppUrl; FunctionKey = functionKey; EncryptedCredential = encryptedCredential; + Credential = credential; + ResourceId = resourceId; + Authentication = authentication; CustomInit(); } @@ -86,6 +96,27 @@ public AzureFunctionLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + + /// + /// Gets or sets allowed token audiences for azure function. + /// + [JsonProperty(PropertyName = "typeProperties.resourceId")] + public object ResourceId { get; set; } + + /// + /// Gets or sets type of authentication (Required to specify MSI) used + /// to connect to AzureFunction. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.authentication")] + public object Authentication { get; set; } + /// /// Validate the object. /// @@ -99,6 +130,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "FunctionAppUrl"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureKeyVaultLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureKeyVaultLinkedService.cs index 9ce4d1bc50226..a30434c8b84a2 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureKeyVaultLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureKeyVaultLinkedService.cs @@ -45,10 +45,13 @@ public AzureKeyVaultLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the linked service. - public AzureKeyVaultLinkedService(object baseUrl, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) + /// The credential reference containing + /// authentication information. + public AzureKeyVaultLinkedService(object baseUrl, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { BaseUrl = baseUrl; + Credential = credential; CustomInit(); } @@ -65,6 +68,13 @@ public AzureKeyVaultLinkedService() [JsonProperty(PropertyName = "typeProperties.baseUrl")] public object BaseUrl { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -78,6 +88,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "BaseUrl"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLLinkedService.cs index 0d0c1692f44d2..dac69b8977bc7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLLinkedService.cs @@ -64,7 +64,10 @@ public AzureMLLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureMLLinkedService(object mlEndpoint, SecretBase apiKey, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object updateResourceEndpoint = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + /// Type of authentication (Required to + /// specify MSI) used to connect to AzureML. Type: string (or + /// Expression with resultType string). + public AzureMLLinkedService(object mlEndpoint, SecretBase apiKey, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object updateResourceEndpoint = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object), object authentication = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { MlEndpoint = mlEndpoint; @@ -74,6 +77,7 @@ public AzureMLLinkedService() ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; EncryptedCredential = encryptedCredential; + Authentication = authentication; CustomInit(); } @@ -136,6 +140,14 @@ public AzureMLLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets type of authentication (Required to specify MSI) used + /// to connect to AzureML. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.authentication")] + public object Authentication { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs index b6a653a0227c2..13cf4706b5857 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs @@ -64,7 +64,9 @@ public AzureSqlDWLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureSqlDWLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public AzureSqlDWLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -74,6 +76,7 @@ public AzureSqlDWLinkedService() Tenant = tenant; AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -138,6 +141,13 @@ public AzureSqlDWLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -155,6 +165,10 @@ public override void Validate() { Password.Validate(); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs index 61cd7f5fc6a47..69095f6ca690e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs @@ -67,7 +67,9 @@ public AzureSqlDatabaseLinkedService() /// resultType string). /// Sql always encrypted /// properties. - public AzureSqlDatabaseLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties)) + /// The credential reference containing + /// authentication information. + public AzureSqlDatabaseLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -78,6 +80,7 @@ public AzureSqlDatabaseLinkedService() AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; AlwaysEncryptedSettings = alwaysEncryptedSettings; + Credential = credential; CustomInit(); } @@ -147,6 +150,13 @@ public AzureSqlDatabaseLinkedService() [JsonProperty(PropertyName = "typeProperties.alwaysEncryptedSettings")] public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -168,6 +178,10 @@ public override void Validate() { AlwaysEncryptedSettings.Validate(); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs index 9363409a926aa..6e5de14250857 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs @@ -65,7 +65,9 @@ public AzureSqlMILinkedService() /// resultType string). /// Sql always encrypted /// properties. - public AzureSqlMILinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties)) + /// The credential reference containing + /// authentication information. + public AzureSqlMILinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -76,6 +78,7 @@ public AzureSqlMILinkedService() AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; AlwaysEncryptedSettings = alwaysEncryptedSettings; + Credential = credential; CustomInit(); } @@ -145,6 +148,13 @@ public AzureSqlMILinkedService() [JsonProperty(PropertyName = "typeProperties.alwaysEncryptedSettings")] public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -166,6 +176,10 @@ public override void Validate() { AlwaysEncryptedSettings.Validate(); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Credential.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Credential.cs new file mode 100644 index 0000000000000..b29d0d3c46d2e --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Credential.cs @@ -0,0 +1,75 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The Azure Data Factory nested object which contains the information and + /// credential which can be used to connect with related store or compute + /// resource. + /// + public partial class Credential + { + /// + /// Initializes a new instance of the Credential class. + /// + public Credential() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the Credential class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Credential description. + /// List of tags that can be used for + /// describing the Credential. + public Credential(IDictionary additionalProperties = default(IDictionary), string description = default(string), IList annotations = default(IList)) + { + AdditionalProperties = additionalProperties; + Description = description; + Annotations = annotations; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets unmatched properties from the message are deserialized + /// this collection + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Gets or sets credential description. + /// + [JsonProperty(PropertyName = "description")] + public string Description { get; set; } + + /// + /// Gets or sets list of tags that can be used for describing the + /// Credential. + /// + [JsonProperty(PropertyName = "annotations")] + public IList Annotations { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialReference.cs new file mode 100644 index 0000000000000..297507c3b4c5a --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialReference.cs @@ -0,0 +1,90 @@ +// +// 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; + + /// + /// Credential reference type. + /// + public partial class CredentialReference + { + /// + /// Initializes a new instance of the CredentialReference class. + /// + public CredentialReference() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the CredentialReference class. + /// + /// Reference credential name. + /// Unmatched properties from the + /// message are deserialized this collection + public CredentialReference(string referenceName, IDictionary additionalProperties = default(IDictionary)) + { + AdditionalProperties = additionalProperties; + ReferenceName = referenceName; + CustomInit(); + } + /// + /// Static constructor for CredentialReference class. + /// + static CredentialReference() + { + Type = "CredentialReference"; + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets unmatched properties from the message are deserialized + /// this collection + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Gets or sets reference credential name. + /// + [JsonProperty(PropertyName = "referenceName")] + public string ReferenceName { get; set; } + + /// + /// Credential reference type. + /// + [JsonProperty(PropertyName = "type")] + public static string Type { get; private set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (ReferenceName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ReferenceName"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialResource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialResource.cs new file mode 100644 index 0000000000000..68aed210eb0e8 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialResource.cs @@ -0,0 +1,70 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// Credential resource type. + /// + public partial class CredentialResource : SubResource + { + /// + /// Initializes a new instance of the CredentialResource class. + /// + public CredentialResource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the CredentialResource class. + /// + /// Properties of credentials. + /// The resource identifier. + /// The resource name. + /// The resource type. + /// Etag identifies change in the resource. + public CredentialResource(Credential 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 credentials. + /// + [JsonProperty(PropertyName = "properties")] + public Credential Properties { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Properties == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Properties"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs index 11c52c9cad139..426eaad1140a7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs @@ -31,7 +31,7 @@ public EntityReference() /// /// The type of this referenced entity. Possible /// values include: 'IntegrationRuntimeReference', - /// 'LinkedServiceReference', 'CredentialReference' + /// 'LinkedServiceReference' /// The name of this referenced /// entity. public EntityReference(string type = default(string), string referenceName = default(string)) @@ -48,8 +48,7 @@ public EntityReference() /// /// Gets or sets the type of this referenced entity. Possible values - /// include: 'IntegrationRuntimeReference', 'LinkedServiceReference', - /// 'CredentialReference' + /// include: 'IntegrationRuntimeReference', 'LinkedServiceReference' /// [JsonProperty(PropertyName = "type")] public string Type { get; set; } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubAccessTokenRequest.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubAccessTokenRequest.cs index 0a1426b0be174..3a198ef6ce349 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubAccessTokenRequest.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubAccessTokenRequest.cs @@ -34,10 +34,13 @@ public GitHubAccessTokenRequest() /// GitHub access token base /// URL. /// GitHub application client ID. - public GitHubAccessTokenRequest(string gitHubAccessCode, string gitHubAccessTokenBaseUrl, string gitHubClientId = default(string)) + /// GitHub bring your own app client + /// secret information. + public GitHubAccessTokenRequest(string gitHubAccessCode, string gitHubAccessTokenBaseUrl, string gitHubClientId = default(string), GitHubClientSecret gitHubClientSecret = default(GitHubClientSecret)) { GitHubAccessCode = gitHubAccessCode; GitHubClientId = gitHubClientId; + GitHubClientSecret = gitHubClientSecret; GitHubAccessTokenBaseUrl = gitHubAccessTokenBaseUrl; CustomInit(); } @@ -59,6 +62,12 @@ public GitHubAccessTokenRequest() [JsonProperty(PropertyName = "gitHubClientId")] public string GitHubClientId { get; set; } + /// + /// Gets or sets gitHub bring your own app client secret information. + /// + [JsonProperty(PropertyName = "gitHubClientSecret")] + public GitHubClientSecret GitHubClientSecret { get; set; } + /// /// Gets or sets gitHub access token base URL. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubClientSecret.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubClientSecret.cs new file mode 100644 index 0000000000000..5704f0e681a2a --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubClientSecret.cs @@ -0,0 +1,62 @@ +// +// 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; + + /// + /// Client secret information for factory's bring your own app repository + /// configuration. + /// + public partial class GitHubClientSecret + { + /// + /// Initializes a new instance of the GitHubClientSecret class. + /// + public GitHubClientSecret() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the GitHubClientSecret class. + /// + /// Bring your own app client secret AKV + /// URL. + /// Bring your own app client secret name + /// in AKV. + public GitHubClientSecret(string byoaSecretAkvUrl = default(string), string byoaSecretName = default(string)) + { + ByoaSecretAkvUrl = byoaSecretAkvUrl; + ByoaSecretName = byoaSecretName; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets bring your own app client secret AKV URL. + /// + [JsonProperty(PropertyName = "byoaSecretAkvUrl")] + public string ByoaSecretAkvUrl { get; set; } + + /// + /// Gets or sets bring your own app client secret name in AKV. + /// + [JsonProperty(PropertyName = "byoaSecretName")] + public string ByoaSecretName { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HDInsightOnDemandLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HDInsightOnDemandLinkedService.cs index 1ad9874197fa3..7608b8dc35a52 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HDInsightOnDemandLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HDInsightOnDemandLinkedService.cs @@ -134,7 +134,9 @@ public HDInsightOnDemandLinkedService() /// vNet. If virtualNetworkId was specified, then this property is /// required. Type: string (or Expression with resultType /// string). - public HDInsightOnDemandLinkedService(object clusterSize, object timeToLive, object version, LinkedServiceReference linkedServiceName, object hostSubscriptionId, object tenant, object clusterResourceGroup, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object clusterNamePrefix = default(object), object clusterUserName = default(object), SecretBase clusterPassword = default(SecretBase), object clusterSshUserName = default(object), SecretBase clusterSshPassword = default(SecretBase), IList additionalLinkedServiceNames = default(IList), LinkedServiceReference hcatalogLinkedServiceName = default(LinkedServiceReference), object clusterType = default(object), object sparkVersion = default(object), object coreConfiguration = default(object), object hBaseConfiguration = default(object), object hdfsConfiguration = default(object), object hiveConfiguration = default(object), object mapReduceConfiguration = default(object), object oozieConfiguration = default(object), object stormConfiguration = default(object), object yarnConfiguration = default(object), object encryptedCredential = default(object), object headNodeSize = default(object), object dataNodeSize = default(object), object zookeeperNodeSize = default(object), IList scriptActions = default(IList), object virtualNetworkId = default(object), object subnetName = default(object)) + /// The credential reference containing + /// authentication information. + public HDInsightOnDemandLinkedService(object clusterSize, object timeToLive, object version, LinkedServiceReference linkedServiceName, object hostSubscriptionId, object tenant, object clusterResourceGroup, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object clusterNamePrefix = default(object), object clusterUserName = default(object), SecretBase clusterPassword = default(SecretBase), object clusterSshUserName = default(object), SecretBase clusterSshPassword = default(SecretBase), IList additionalLinkedServiceNames = default(IList), LinkedServiceReference hcatalogLinkedServiceName = default(LinkedServiceReference), object clusterType = default(object), object sparkVersion = default(object), object coreConfiguration = default(object), object hBaseConfiguration = default(object), object hdfsConfiguration = default(object), object hiveConfiguration = default(object), object mapReduceConfiguration = default(object), object oozieConfiguration = default(object), object stormConfiguration = default(object), object yarnConfiguration = default(object), object encryptedCredential = default(object), object headNodeSize = default(object), object dataNodeSize = default(object), object zookeeperNodeSize = default(object), IList scriptActions = default(IList), object virtualNetworkId = default(object), object subnetName = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ClusterSize = clusterSize; @@ -170,6 +172,7 @@ public HDInsightOnDemandLinkedService() ScriptActions = scriptActions; VirtualNetworkId = virtualNetworkId; SubnetName = subnetName; + Credential = credential; CustomInit(); } @@ -417,6 +420,13 @@ public HDInsightOnDemandLinkedService() [JsonProperty(PropertyName = "typeProperties.subnetName")] public object SubnetName { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -482,6 +492,10 @@ public override void Validate() } } } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs index 5651c1f48d6e8..590bfe94be081 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs @@ -18,6 +18,5 @@ public static class IntegrationRuntimeEntityReferenceType { public const string IntegrationRuntimeReference = "IntegrationRuntimeReference"; public const string LinkedServiceReference = "LinkedServiceReference"; - public const string CredentialReference = "CredentialReference"; } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs index b423a31426969..a59d25d20f924 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs @@ -50,9 +50,9 @@ public IntegrationRuntimeSsisProperties() /// script properties for a SSIS integration runtime. /// Package stores for the SSIS Integration /// Runtime. - /// The user-assigned managed identity - /// reference. - public IntegrationRuntimeSsisProperties(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeSsisCatalogInfo catalogInfo = default(IntegrationRuntimeSsisCatalogInfo), string licenseType = default(string), IntegrationRuntimeCustomSetupScriptProperties customSetupScriptProperties = default(IntegrationRuntimeCustomSetupScriptProperties), IntegrationRuntimeDataProxyProperties dataProxyProperties = default(IntegrationRuntimeDataProxyProperties), string edition = default(string), IList expressCustomSetupProperties = default(IList), IList packageStores = default(IList), EntityReference managedCredential = default(EntityReference)) + /// The credential reference containing + /// authentication information. + public IntegrationRuntimeSsisProperties(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeSsisCatalogInfo catalogInfo = default(IntegrationRuntimeSsisCatalogInfo), string licenseType = default(string), IntegrationRuntimeCustomSetupScriptProperties customSetupScriptProperties = default(IntegrationRuntimeCustomSetupScriptProperties), IntegrationRuntimeDataProxyProperties dataProxyProperties = default(IntegrationRuntimeDataProxyProperties), string edition = default(string), IList expressCustomSetupProperties = default(IList), IList packageStores = default(IList), CredentialReference credential = default(CredentialReference)) { AdditionalProperties = additionalProperties; CatalogInfo = catalogInfo; @@ -62,7 +62,7 @@ public IntegrationRuntimeSsisProperties() Edition = edition; ExpressCustomSetupProperties = expressCustomSetupProperties; PackageStores = packageStores; - ManagedCredential = managedCredential; + Credential = credential; CustomInit(); } @@ -127,10 +127,11 @@ public IntegrationRuntimeSsisProperties() public IList PackageStores { get; set; } /// - /// Gets or sets the user-assigned managed identity reference. + /// Gets or sets the credential reference containing authentication + /// information. /// - [JsonProperty(PropertyName = "managedCredential")] - public EntityReference ManagedCredential { get; set; } + [JsonProperty(PropertyName = "credential")] + public CredentialReference Credential { get; set; } /// /// Validate the object. @@ -158,6 +159,10 @@ public virtual void Validate() } } } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIdentityCredential.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIdentityCredential.cs new file mode 100644 index 0000000000000..d926ee473306a --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIdentityCredential.cs @@ -0,0 +1,64 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Managed identity credential. + /// + [Newtonsoft.Json.JsonObject("ManagedIdentity")] + [Rest.Serialization.JsonTransformation] + public partial class ManagedIdentityCredential : Credential + { + /// + /// Initializes a new instance of the ManagedIdentityCredential class. + /// + public ManagedIdentityCredential() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ManagedIdentityCredential class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Credential description. + /// List of tags that can be used for + /// describing the Credential. + /// The resource id of user assigned managed + /// identity + public ManagedIdentityCredential(IDictionary additionalProperties = default(IDictionary), string description = default(string), IList annotations = default(IList), string resourceId = default(string)) + : base(additionalProperties, description, annotations) + { + ResourceId = resourceId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the resource id of user assigned managed identity + /// + [JsonProperty(PropertyName = "typeProperties.resourceId")] + public string ResourceId { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs index 9d01c779f3fb7..189c59e656fbd 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs @@ -75,7 +75,9 @@ public RestServiceLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public RestServiceLinkedService(object url, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object enableServerCertificateValidation = default(object), object userName = default(object), SecretBase password = default(SecretBase), object authHeaders = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object aadResourceId = default(object), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public RestServiceLinkedService(object url, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object enableServerCertificateValidation = default(object), object userName = default(object), SecretBase password = default(SecretBase), object authHeaders = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object aadResourceId = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -90,6 +92,7 @@ public RestServiceLinkedService() AzureCloudType = azureCloudType; AadResourceId = aadResourceId; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -186,6 +189,13 @@ public RestServiceLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -203,6 +213,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServicePrincipalCredential.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServicePrincipalCredential.cs new file mode 100644 index 0000000000000..82099cf020a8e --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServicePrincipalCredential.cs @@ -0,0 +1,97 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Service principal credential. + /// + [Newtonsoft.Json.JsonObject("ServicePrincipal")] + [Rest.Serialization.JsonTransformation] + public partial class ServicePrincipalCredential : Credential + { + /// + /// Initializes a new instance of the ServicePrincipalCredential class. + /// + public ServicePrincipalCredential() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ServicePrincipalCredential class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Credential description. + /// List of tags that can be used for + /// describing the Credential. + /// The app ID of the service + /// principal used to authenticate + /// The key of the service principal + /// used to authenticate. + /// The ID of the tenant to which the service + /// principal belongs + public ServicePrincipalCredential(IDictionary additionalProperties = default(IDictionary), string description = default(string), IList annotations = default(IList), object servicePrincipalId = default(object), AzureKeyVaultSecretReference servicePrincipalKey = default(AzureKeyVaultSecretReference), object tenant = default(object)) + : base(additionalProperties, description, annotations) + { + ServicePrincipalId = servicePrincipalId; + ServicePrincipalKey = servicePrincipalKey; + Tenant = tenant; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the app ID of the service principal used to + /// authenticate + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalId")] + public object ServicePrincipalId { get; set; } + + /// + /// Gets or sets the key of the service principal used to authenticate. + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalKey")] + public AzureKeyVaultSecretReference ServicePrincipalKey { get; set; } + + /// + /// Gets or sets the ID of the tenant to which the service principal + /// belongs + /// + [JsonProperty(PropertyName = "typeProperties.tenant")] + public object Tenant { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (ServicePrincipalKey != null) + { + ServicePrincipalKey.Validate(); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs index 1d2537faa65ff..9b2b951350d0e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs @@ -10,7 +10,6 @@ namespace Microsoft.Azure.Management.DataFactory.Models { - using Microsoft.Rest; using Newtonsoft.Json; using System.Linq; @@ -45,7 +44,9 @@ public WebActivityAuthentication() /// TenantId for which Azure Auth token will /// be requested when using ServicePrincipal Authentication. Type: /// string (or Expression with resultType string). - public WebActivityAuthentication(string type, SecretBase pfx = default(SecretBase), object username = default(object), SecretBase password = default(SecretBase), object resource = default(object), object userTenant = default(object)) + /// The credential reference containing + /// authentication information. + public WebActivityAuthentication(string type = default(string), SecretBase pfx = default(SecretBase), object username = default(object), SecretBase password = default(SecretBase), object resource = default(object), object userTenant = default(object), CredentialReference credential = default(CredentialReference)) { Type = type; Pfx = pfx; @@ -53,6 +54,7 @@ public WebActivityAuthentication() Password = password; Resource = resource; UserTenant = userTenant; + Credential = credential; CustomInit(); } @@ -106,17 +108,24 @@ public WebActivityAuthentication() [JsonProperty(PropertyName = "userTenant")] public object UserTenant { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public virtual void Validate() { - if (Type == null) + if (Credential != null) { - throw new ValidationException(ValidationRules.CannotBeNull, "Type"); + Credential.Validate(); } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index e396304f9140a..bb5620a71ded9 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -12,6 +12,7 @@ diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs index 106182ada0aa2..0802e111f0d5b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -31,6 +31,38 @@ public class LinkedServiceJsonSamples : JsonSampleCollection Date: Fri, 16 Jul 2021 14:53:53 +0800 Subject: [PATCH 3/5] update --- .../Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md | 1 + .../src/Microsoft.Azure.Management.DataFactory.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 9e9a215e17ce5..35c5f7376ee50 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -5,6 +5,7 @@ - Added properties pipelineName and pipelineRunId to PipelineRunInvokedBy definition - Updated avroCompressionCodec and orcCompressionCodec from string to object - Supported UAMI in ADF IR/LS/Activity +- GitHub bring your own app swagger update for ADF/Synapse Dataplane only ## Version 4.20.0 ### Feature Additions diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index bb5620a71ded9..b770177806e76 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -13,6 +13,7 @@ - Added properties pipelineName and pipelineRunId to PipelineRunInvokedBy definition - Updated avroCompressionCodec and orcCompressionCodec from string to object - Supported UAMI in ADF IR/LS/Activity +- GitHub bring your own app swagger update for ADF/Synapse Dataplane only ]]> From 67d3bf0bfffd61f0fbfdfef5c3d4e725a53b46c9 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 4 Aug 2021 09:54:16 +0800 Subject: [PATCH 4/5] (Do Not Merge)[DataFactory]Added new features into 4.22.0 --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 7 + .../IIntegrationRuntimesOperations.cs | 29 ++ .../IntegrationRuntimesOperations.cs | 251 ++++++++++++++++++ ...IntegrationRuntimesOperationsExtensions.cs | 48 ++++ .../src/Generated/Models/AmazonMWSSource.cs | 6 +- .../Generated/Models/AmazonRedshiftSource.cs | 6 +- .../src/Generated/Models/AvroSource.cs | 12 +- .../Models/AzureDataExplorerSource.cs | 12 +- .../Generated/Models/AzureMariaDBSource.cs | 6 +- .../src/Generated/Models/AzureMySqlSource.cs | 6 +- .../Generated/Models/AzurePostgreSqlSource.cs | 6 +- .../src/Generated/Models/AzureSqlSink.cs | 33 ++- .../src/Generated/Models/AzureSqlSource.cs | 6 +- .../src/Generated/Models/AzureTableSource.cs | 6 +- .../src/Generated/Models/CassandraSource.cs | 6 +- .../Models/CommonDataServiceForAppsSource.cs | 12 +- .../src/Generated/Models/ConcurSource.cs | 6 +- .../Models/CosmosDbMongoDbApiSource.cs | 12 +- .../Generated/Models/CosmosDbSqlApiSource.cs | 12 +- .../src/Generated/Models/CouchbaseSource.cs | 6 +- .../src/Generated/Models/Db2Source.cs | 6 +- .../Generated/Models/DelimitedTextSource.cs | 12 +- .../Models/DocumentDbCollectionSource.cs | 12 +- .../src/Generated/Models/DrillSource.cs | 6 +- .../src/Generated/Models/DynamicsAXSource.cs | 6 +- .../src/Generated/Models/DynamicsCrmSource.cs | 12 +- .../src/Generated/Models/DynamicsSource.cs | 12 +- .../src/Generated/Models/EloquaSource.cs | 6 +- .../src/Generated/Models/ExcelSource.cs | 12 +- .../Models/FactoryGitHubConfiguration.cs | 19 +- .../src/Generated/Models/FileSystemSource.cs | 12 +- .../Generated/Models/GoogleAdWordsSource.cs | 6 +- .../Generated/Models/GoogleBigQuerySource.cs | 6 +- .../src/Generated/Models/GreenplumSource.cs | 6 +- .../src/Generated/Models/HBaseSource.cs | 6 +- .../src/Generated/Models/HiveSource.cs | 6 +- .../src/Generated/Models/HubspotSource.cs | 6 +- .../src/Generated/Models/ImpalaSource.cs | 6 +- .../src/Generated/Models/InformixSource.cs | 6 +- .../IntegrationRuntimeDataFlowProperties.cs | 14 +- ...oundNetworkDependenciesCategoryEndpoint.cs | 68 +++++ ...timeOutboundNetworkDependenciesEndpoint.cs | 64 +++++ ...boundNetworkDependenciesEndpointDetails.cs | 54 ++++ ...undNetworkDependenciesEndpointsResponse.cs | 58 ++++ .../IntegrationRuntimeVNetProperties.cs | 12 +- .../src/Generated/Models/JiraSource.cs | 6 +- .../src/Generated/Models/JsonSource.cs | 12 +- .../src/Generated/Models/MagentoSource.cs | 6 +- .../src/Generated/Models/MariaDBSource.cs | 6 +- .../src/Generated/Models/MarketoSource.cs | 6 +- .../Generated/Models/MicrosoftAccessSource.cs | 12 +- .../Generated/Models/MongoDbAtlasSource.cs | 12 +- .../src/Generated/Models/MongoDbSource.cs | 12 +- .../src/Generated/Models/MongoDbV2Source.cs | 12 +- .../src/Generated/Models/MySqlSource.cs | 6 +- .../src/Generated/Models/NetezzaSource.cs | 6 +- .../src/Generated/Models/ODataSource.cs | 12 +- .../src/Generated/Models/OdbcSource.cs | 6 +- .../Models/OracleServiceCloudSource.cs | 6 +- .../src/Generated/Models/OracleSource.cs | 12 +- .../src/Generated/Models/OrcSource.cs | 12 +- .../src/Generated/Models/ParquetSource.cs | 12 +- .../src/Generated/Models/PaypalSource.cs | 6 +- .../src/Generated/Models/PhoenixSource.cs | 6 +- .../src/Generated/Models/PostgreSqlSource.cs | 6 +- .../src/Generated/Models/PrestoSource.cs | 6 +- .../src/Generated/Models/QuickBooksSource.cs | 6 +- .../src/Generated/Models/RelationalSource.cs | 12 +- .../src/Generated/Models/ResponsysSource.cs | 6 +- .../src/Generated/Models/RestSource.cs | 12 +- .../Models/SalesforceMarketingCloudSource.cs | 6 +- .../Models/SalesforceServiceCloudSource.cs | 12 +- .../src/Generated/Models/SalesforceSource.cs | 6 +- .../src/Generated/Models/SapBwSource.cs | 6 +- .../Models/SapCloudForCustomerSource.cs | 6 +- .../src/Generated/Models/SapEccSource.cs | 6 +- .../src/Generated/Models/SapHanaSource.cs | 6 +- .../src/Generated/Models/SapOpenHubSource.cs | 6 +- .../src/Generated/Models/SapTableSource.cs | 6 +- .../src/Generated/Models/ServiceNowSource.cs | 6 +- .../src/Generated/Models/ShopifySource.cs | 6 +- .../src/Generated/Models/SparkSource.cs | 6 +- .../src/Generated/Models/SqlDWSink.cs | 33 ++- .../src/Generated/Models/SqlDWSource.cs | 6 +- .../Generated/Models/SqlDWUpsertSettings.cs | 64 +++++ .../Models/SqlDWWriteBehaviorEnum.cs | 22 ++ .../src/Generated/Models/SqlMISink.cs | 33 ++- .../src/Generated/Models/SqlMISource.cs | 6 +- .../src/Generated/Models/SqlServerSink.cs | 33 ++- .../src/Generated/Models/SqlServerSource.cs | 6 +- .../src/Generated/Models/SqlSink.cs | 33 ++- .../src/Generated/Models/SqlSource.cs | 6 +- .../src/Generated/Models/SqlUpsertSettings.cs | 75 ++++++ .../Generated/Models/SqlWriteBehaviorEnum.cs | 23 ++ .../src/Generated/Models/SquareSource.cs | 6 +- .../src/Generated/Models/SybaseSource.cs | 6 +- .../src/Generated/Models/TabularSource.cs | 12 +- .../src/Generated/Models/TeradataSource.cs | 6 +- .../src/Generated/Models/VerticaSource.cs | 6 +- .../src/Generated/Models/WebSource.cs | 12 +- .../src/Generated/Models/XeroSource.cs | 6 +- .../src/Generated/Models/XmlSource.cs | 12 +- .../src/Generated/Models/ZohoSource.cs | 6 +- ...rosoft.Azure.Management.DataFactory.csproj | 10 +- .../src/Properties/AssemblyInfo.cs | 4 +- .../IntegrationRuntimeJsonSamples.cs | 35 +++ .../tests/JsonSamples/PipelineJsonSamples.cs | 67 +++++ .../IntegrationRuntimeScenarioTests.cs | 11 +- ...isAzureIntegrationRuntimeScenarioTest.json | 67 +++++ .../UnitTests/IntegrationRuntimeTests.cs | 33 +++ 111 files changed, 1513 insertions(+), 345 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesCategoryEndpoint.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpoint.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpointDetails.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWUpsertSettings.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWWriteBehaviorEnum.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlUpsertSettings.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlWriteBehaviorEnum.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/IntegrationRuntimeTests.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 8e82d2b5abc9c..d7f690389c3a2 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,11 +4,11 @@ Commencing code generation Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net-1\sdk -2021-07-16 06:45:57 UTC +2021-08-03 08:05:41 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 86b65a6f0e0b637a774b177b3206155d990242d4 +Commit: c25e3a8c81feb4e965d65e8584262fea42b5da0a AutoRest information Requested version: v2 Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 35c5f7376ee50..f174f05869331 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 4.22.0 +### Feature Additions +- Added Sql table lock and upsert properties +- Changed additionalColumns/compressionType to type of object +- Support cleanup property for integration runtime resource from DataFactory +- Unify IR vNet injection experience + ## Version 4.21.0 ### Feature Additions - Added properties pipelineName and pipelineRunId to PipelineRunInvokedBy definition diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IIntegrationRuntimesOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IIntegrationRuntimesOperations.cs index 83f48ae643bd9..3ae4712bc24e4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IIntegrationRuntimesOperations.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IIntegrationRuntimesOperations.cs @@ -202,6 +202,35 @@ public partial interface IIntegrationRuntimesOperations /// Task> GetStatusWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// + /// Gets the list of outbound network dependencies for a given + /// Azure-SSIS integration runtime. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task> ListOutboundNetworkDependenciesEndpointsWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// /// Gets the on-premises integration runtime connection information for /// encrypting the on-premises data source credentials. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IntegrationRuntimesOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IntegrationRuntimesOperations.cs index f43f5420807be..6fb0bcadaf1ae 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IntegrationRuntimesOperations.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IntegrationRuntimesOperations.cs @@ -1565,6 +1565,257 @@ internal IntegrationRuntimesOperations(DataFactoryManagementClient client) return _result; } + /// + /// Gets the list of outbound network dependencies for a given Azure-SSIS + /// integration runtime. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task> ListOutboundNetworkDependenciesEndpointsWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (resourceGroupName != null) + { + if (resourceGroupName.Length > 90) + { + throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90); + } + if (resourceGroupName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+$")) + { + throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+$"); + } + } + if (factoryName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "factoryName"); + } + if (factoryName != null) + { + if (factoryName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "factoryName", 63); + } + if (factoryName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "factoryName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(factoryName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "factoryName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (integrationRuntimeName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "integrationRuntimeName"); + } + if (integrationRuntimeName != null) + { + if (integrationRuntimeName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "integrationRuntimeName", 63); + } + if (integrationRuntimeName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "integrationRuntimeName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(integrationRuntimeName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "integrationRuntimeName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("factoryName", factoryName); + tracingParameters.Add("integrationRuntimeName", integrationRuntimeName); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ListOutboundNetworkDependenciesEndpoints", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/outboundNetworkDependenciesEndpoints").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{factoryName}", System.Uri.EscapeDataString(factoryName)); + _url = _url.Replace("{integrationRuntimeName}", System.Uri.EscapeDataString(integrationRuntimeName)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("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; + } + /// /// Gets the on-premises integration runtime connection information for /// encrypting the on-premises data source credentials. diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IntegrationRuntimesOperationsExtensions.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IntegrationRuntimesOperationsExtensions.cs index d202bc13d4acb..1eb078ad8bbe1 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IntegrationRuntimesOperationsExtensions.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IntegrationRuntimesOperationsExtensions.cs @@ -320,6 +320,54 @@ public static IntegrationRuntimeStatusResponse GetStatus(this IIntegrationRuntim } } + /// + /// Gets the list of outbound network dependencies for a given Azure-SSIS + /// integration runtime. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + public static IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse ListOutboundNetworkDependenciesEndpoints(this IIntegrationRuntimesOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName) + { + return operations.ListOutboundNetworkDependenciesEndpointsAsync(resourceGroupName, factoryName, integrationRuntimeName).GetAwaiter().GetResult(); + } + + /// + /// Gets the list of outbound network dependencies for a given Azure-SSIS + /// integration runtime. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The integration runtime name. + /// + /// + /// The cancellation token. + /// + public static async Task ListOutboundNetworkDependenciesEndpointsAsync(this IIntegrationRuntimesOperations operations, string resourceGroupName, string factoryName, string integrationRuntimeName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListOutboundNetworkDependenciesEndpointsWithHttpMessagesAsync(resourceGroupName, factoryName, integrationRuntimeName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Gets the on-premises integration runtime connection information for /// encrypting the on-premises data source credentials. 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 e54ae64a901c2..fc973b29c0214 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 @@ -48,11 +48,11 @@ public AmazonMWSSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public AmazonMWSSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 ef8a73ee58c60..461d14d892a8e 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 @@ -48,8 +48,8 @@ public AmazonRedshiftSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). /// Database query. Type: string (or Expression /// with resultType string). /// The Amazon S3 settings needed @@ -57,7 +57,7 @@ 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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), RedshiftUnloadSettings redshiftUnloadSettings = default(RedshiftUnloadSettings)) + public AmazonRedshiftSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object), RedshiftUnloadSettings redshiftUnloadSettings = default(RedshiftUnloadSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 14f60dd06b26f..b56299662746b 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 @@ -46,9 +46,9 @@ public AvroSource() /// with resultType boolean). /// Avro store settings. /// 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), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { StoreSettings = storeSettings; @@ -69,11 +69,11 @@ public AvroSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object AdditionalColumns { get; set; } } } 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 4b939a6be9faa..61153bb1446df 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 @@ -55,9 +55,9 @@ public AzureDataExplorerSource() /// 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). - public AzureDataExplorerSource(object query, IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object noTruncation = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object noTruncation = default(object), object queryTimeout = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -97,11 +97,11 @@ public AzureDataExplorerSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object AdditionalColumns { get; set; } /// /// Validate the object. 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 d1636de8dfcd8..ab1ec46fec084 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 @@ -48,11 +48,11 @@ public AzureMariaDBSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public AzureMariaDBSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 4c793486ec465..3e2f11f303633 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 @@ -48,11 +48,11 @@ public AzureMySqlSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public AzureMySqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 bd87ecaed30e1..a95dd58377cc4 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 @@ -48,11 +48,11 @@ public AzurePostgreSqlSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public AzurePostgreSqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlSink.cs index 0a8bc9813a758..692f7bcfbd1b5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlSink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlSink.cs @@ -64,7 +64,14 @@ public AzureSqlSink() /// The option to handle sink table, such as /// autoCreate. For now only 'autoCreate' value is supported. Type: /// string (or Expression with resultType string). - public AzureSqlSink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object sqlWriterStoredProcedureName = default(object), object sqlWriterTableType = default(object), object preCopyScript = default(object), IDictionary storedProcedureParameters = default(IDictionary), object storedProcedureTableTypeParameterName = default(object), object tableOption = default(object)) + /// Whether to use table lock + /// during bulk copy. Type: boolean (or Expression with resultType + /// boolean). + /// Write behavior when copying data into + /// Azure SQL. Type: SqlWriteBehaviorEnum (or Expression with + /// resultType SqlWriteBehaviorEnum) + /// SQL upsert settings. + public AzureSqlSink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object sqlWriterStoredProcedureName = default(object), object sqlWriterTableType = default(object), object preCopyScript = default(object), IDictionary storedProcedureParameters = default(IDictionary), object storedProcedureTableTypeParameterName = default(object), object tableOption = default(object), object sqlWriterUseTableLock = default(object), object writeBehavior = default(object), SqlUpsertSettings upsertSettings = default(SqlUpsertSettings)) : base(additionalProperties, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection) { SqlWriterStoredProcedureName = sqlWriterStoredProcedureName; @@ -73,6 +80,9 @@ public AzureSqlSink() StoredProcedureParameters = storedProcedureParameters; StoredProcedureTableTypeParameterName = storedProcedureTableTypeParameterName; TableOption = tableOption; + SqlWriterUseTableLock = sqlWriterUseTableLock; + WriteBehavior = writeBehavior; + UpsertSettings = upsertSettings; CustomInit(); } @@ -123,5 +133,26 @@ public AzureSqlSink() [JsonProperty(PropertyName = "tableOption")] public object TableOption { get; set; } + /// + /// Gets or sets whether to use table lock during bulk copy. Type: + /// boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "sqlWriterUseTableLock")] + public object SqlWriterUseTableLock { get; set; } + + /// + /// Gets or sets write behavior when copying data into Azure SQL. Type: + /// SqlWriteBehaviorEnum (or Expression with resultType + /// SqlWriteBehaviorEnum) + /// + [JsonProperty(PropertyName = "writeBehavior")] + public object WriteBehavior { get; set; } + + /// + /// Gets or sets SQL upsert settings. + /// + [JsonProperty(PropertyName = "upsertSettings")] + public SqlUpsertSettings UpsertSettings { get; set; } + } } 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 36b761878b9cd..c2afb532fbfd2 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 @@ -48,8 +48,8 @@ public AzureSqlSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). /// SQL reader query. Type: string (or /// Expression with resultType string). /// Name of the stored @@ -66,7 +66,7 @@ public AzureSqlSource() /// "PhysicalPartitionsOfTable", "DynamicRange". /// The settings that will be leveraged /// for Sql source partitioning. - public AzureSqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = 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), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) + public AzureSqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { SqlReaderQuery = sqlReaderQuery; 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 1c49ec1e354bc..48541d68fa691 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 @@ -48,14 +48,14 @@ public AzureTableSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object azureTableSourceQuery = default(object), object azureTableSourceIgnoreTableNotFound = default(object)) + public AzureTableSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object azureTableSourceQuery = default(object), object azureTableSourceIgnoreTableNotFound = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { AzureTableSourceQuery = azureTableSourceQuery; 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 f12ac4229fce5..6d1bcb6df0dbf 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 @@ -48,8 +48,8 @@ public CassandraSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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). @@ -61,7 +61,7 @@ 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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), string consistencyLevel = default(string)) + public CassandraSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object), string consistencyLevel = default(string)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 2b1be9cd0862f..99097ecc73823 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 @@ -51,9 +51,9 @@ public CommonDataServiceForAppsSource() /// on-premises). Type: string (or Expression with resultType /// string). /// 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 disableMetricsCollection = default(object), object query = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object query = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -76,11 +76,11 @@ public CommonDataServiceForAppsSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 b26dbe9e7ffc3..a4e7a8ca55000 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 @@ -48,11 +48,11 @@ public ConcurSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public ConcurSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 a43cc4640813a..762ea01faf441 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 @@ -60,9 +60,9 @@ public CosmosDbMongoDbApiSource() /// 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). - public CosmosDbMongoDbApiSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object filter = default(object), MongoDbCursorMethodsProperties cursorMethods = default(MongoDbCursorMethodsProperties), object batchSize = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object filter = default(object), MongoDbCursorMethodsProperties cursorMethods = default(MongoDbCursorMethodsProperties), object batchSize = default(object), object queryTimeout = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Filter = filter; @@ -114,11 +114,11 @@ public CosmosDbMongoDbApiSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 eba548a043437..10051e10beb49 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 @@ -54,9 +54,9 @@ public CosmosDbSqlApiSource() /// datetime values. Type: boolean (or Expression with resultType /// boolean). /// 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 disableMetricsCollection = default(object), object query = default(object), object pageSize = default(object), object preferredRegions = default(object), object detectDatetime = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object query = default(object), object pageSize = default(object), object preferredRegions = default(object), object detectDatetime = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -102,11 +102,11 @@ public CosmosDbSqlApiSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 94b04c9917ce0..1c348b748a62a 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 @@ -48,11 +48,11 @@ public CouchbaseSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public CouchbaseSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 96e3350e31849..d740916793b55 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 @@ -48,11 +48,11 @@ public Db2Source() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public Db2Source(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 c64b2f7c18c4c..7b0563570e9aa 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 @@ -47,9 +47,9 @@ public DelimitedTextSource() /// DelimitedText store settings. /// DelimitedText format settings. /// 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), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), DelimitedTextReadSettings formatSettings = default(DelimitedTextReadSettings), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), DelimitedTextReadSettings formatSettings = default(DelimitedTextReadSettings), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { StoreSettings = storeSettings; @@ -77,11 +77,11 @@ public DelimitedTextSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 bdc1fcdb04dca..e5e476d2621ef 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 @@ -52,9 +52,9 @@ public DocumentDbCollectionSource() /// 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). - public DocumentDbCollectionSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object query = default(object), object nestingSeparator = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object query = default(object), object nestingSeparator = default(object), object queryTimeout = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -93,11 +93,11 @@ public DocumentDbCollectionSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 cc07e68af32b8..ef5393ad38e75 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 @@ -48,11 +48,11 @@ public DrillSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public DrillSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 a62404bd88572..447debe89246b 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 @@ -48,8 +48,8 @@ public DynamicsAXSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). /// A query to retrieve data from source. Type: /// string (or Expression with resultType string). /// The timeout (TimeSpan) to get an @@ -57,7 +57,7 @@ public DynamicsAXSource() /// to read response data. Default value: 00:05:00. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). - public DynamicsAXSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), object httpRequestTimeout = default(object)) + public DynamicsAXSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object), object httpRequestTimeout = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 9ccb97290339d..c75215b73aab6 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 @@ -48,9 +48,9 @@ public DynamicsCrmSource() /// is used in Microsoft Dynamics CRM (online & on-premises). Type: /// string (or Expression with resultType string). /// 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 disableMetricsCollection = default(object), object query = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object query = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -73,11 +73,11 @@ public DynamicsCrmSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 aba8eae8eec88..72fdacfaf2943 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 @@ -48,9 +48,9 @@ public DynamicsSource() /// is used in Microsoft Dynamics (online & on-premises). Type: /// string (or Expression with resultType string). /// 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 disableMetricsCollection = default(object), object query = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object query = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -73,11 +73,11 @@ public DynamicsSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 2ded7aaa8e734..ca4607f95a797 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 @@ -48,11 +48,11 @@ public EloquaSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public EloquaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelSource.cs index 0fe87d20d9a20..b34bb69c3fd15 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelSource.cs @@ -46,9 +46,9 @@ public ExcelSource() /// with resultType boolean). /// Excel store settings. /// Specifies the additional columns to - /// be added to source data. Type: array of objects (or Expression with - /// resultType array of objects). - public ExcelSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). + public ExcelSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { StoreSettings = storeSettings; @@ -69,11 +69,11 @@ public ExcelSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object AdditionalColumns { get; set; } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs index b6bd1e7ebd2b8..37f563160f92c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs @@ -36,10 +36,15 @@ public FactoryGitHubConfiguration() /// Last commit id. /// GitHub Enterprise host name. For example: /// https://github.mydomain.com - public FactoryGitHubConfiguration(string accountName, string repositoryName, string collaborationBranch, string rootFolder, string lastCommitId = default(string), string hostName = default(string)) + /// GitHub bring your own app client id. + /// GitHub bring your own app client secret + /// information. + public FactoryGitHubConfiguration(string accountName, string repositoryName, string collaborationBranch, string rootFolder, string lastCommitId = default(string), string hostName = default(string), string clientId = default(string), GitHubClientSecret clientSecret = default(GitHubClientSecret)) : base(accountName, repositoryName, collaborationBranch, rootFolder, lastCommitId) { HostName = hostName; + ClientId = clientId; + ClientSecret = clientSecret; CustomInit(); } @@ -55,6 +60,18 @@ public FactoryGitHubConfiguration() [JsonProperty(PropertyName = "hostName")] public string HostName { get; set; } + /// + /// Gets or sets gitHub bring your own app client id. + /// + [JsonProperty(PropertyName = "clientId")] + public string ClientId { get; set; } + + /// + /// Gets or sets gitHub bring your own app client secret information. + /// + [JsonProperty(PropertyName = "clientSecret")] + public GitHubClientSecret ClientSecret { get; set; } + /// /// Validate the object. /// 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 1f7dcbcb62430..74493fedd10f4 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 @@ -48,9 +48,9 @@ public FileSystemSource() /// be read recursively. Default is true. Type: boolean (or Expression /// with resultType boolean). /// 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 disableMetricsCollection = default(object), object recursive = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object recursive = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Recursive = recursive; @@ -73,11 +73,11 @@ public FileSystemSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object AdditionalColumns { get; set; } } } 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 766fe413ba6da..c63f5505b4e49 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 @@ -48,11 +48,11 @@ public GoogleAdWordsSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public GoogleAdWordsSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 d0574c7506d04..4f492f40a2760 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 @@ -48,11 +48,11 @@ public GoogleBigQuerySource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public GoogleBigQuerySource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 2c6265668bd2e..a11ac5c141a52 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 @@ -48,11 +48,11 @@ public GreenplumSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public GreenplumSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 162babb9839be..3b1d8a471a356 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 @@ -48,11 +48,11 @@ public HBaseSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public HBaseSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 ef1fd34bc37c6..176208751d003 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 @@ -48,11 +48,11 @@ public HiveSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public HiveSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 07e1562eab768..a28c2e528e8c1 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 @@ -48,11 +48,11 @@ public HubspotSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public HubspotSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 9d77f3a89556d..016d1a16513a0 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 @@ -48,11 +48,11 @@ public ImpalaSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public ImpalaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 fc4e8a92f4e26..c9494ae670a8c 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 @@ -48,11 +48,11 @@ public InformixSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public InformixSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeDataFlowProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeDataFlowProperties.cs index e57f1a7b0ce49..62bd7a509050d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeDataFlowProperties.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeDataFlowProperties.cs @@ -44,12 +44,16 @@ public IntegrationRuntimeDataFlowProperties() /// and 272. /// Time to live (in minutes) setting of the /// cluster which will execute data flow job. - public IntegrationRuntimeDataFlowProperties(IDictionary additionalProperties = default(IDictionary), string computeType = default(string), int? coreCount = default(int?), int? timeToLive = default(int?)) + /// Cluster will not be recycled and it will be + /// used in next data flow activity run until TTL (time to live) is + /// reached if this is set as false. Default is true. + public IntegrationRuntimeDataFlowProperties(IDictionary additionalProperties = default(IDictionary), string computeType = default(string), int? coreCount = default(int?), int? timeToLive = default(int?), bool? cleanup = default(bool?)) { AdditionalProperties = additionalProperties; ComputeType = computeType; CoreCount = coreCount; TimeToLive = timeToLive; + Cleanup = cleanup; CustomInit(); } @@ -87,6 +91,14 @@ public IntegrationRuntimeDataFlowProperties() [JsonProperty(PropertyName = "timeToLive")] public int? TimeToLive { get; set; } + /// + /// Gets or sets cluster will not be recycled and it will be used in + /// next data flow activity run until TTL (time to live) is reached if + /// this is set as false. Default is true. + /// + [JsonProperty(PropertyName = "cleanup")] + public bool? Cleanup { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesCategoryEndpoint.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesCategoryEndpoint.cs new file mode 100644 index 0000000000000..04b6030ad69bf --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesCategoryEndpoint.cs @@ -0,0 +1,68 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Azure-SSIS integration runtime outbound network dependency endpoints + /// for one category. + /// + public partial class IntegrationRuntimeOutboundNetworkDependenciesCategoryEndpoint + { + /// + /// Initializes a new instance of the + /// IntegrationRuntimeOutboundNetworkDependenciesCategoryEndpoint + /// class. + /// + public IntegrationRuntimeOutboundNetworkDependenciesCategoryEndpoint() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// IntegrationRuntimeOutboundNetworkDependenciesCategoryEndpoint + /// class. + /// + /// The category of outbound network + /// dependency. + /// The endpoints for outbound network + /// dependency. + public IntegrationRuntimeOutboundNetworkDependenciesCategoryEndpoint(string category = default(string), IList endpoints = default(IList)) + { + Category = category; + Endpoints = endpoints; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the category of outbound network dependency. + /// + [JsonProperty(PropertyName = "category")] + public string Category { get; set; } + + /// + /// Gets or sets the endpoints for outbound network dependency. + /// + [JsonProperty(PropertyName = "endpoints")] + public IList Endpoints { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpoint.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpoint.cs new file mode 100644 index 0000000000000..41d5439283f8f --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpoint.cs @@ -0,0 +1,64 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The endpoint for Azure-SSIS integration runtime outbound network + /// dependency. + /// + public partial class IntegrationRuntimeOutboundNetworkDependenciesEndpoint + { + /// + /// Initializes a new instance of the + /// IntegrationRuntimeOutboundNetworkDependenciesEndpoint class. + /// + public IntegrationRuntimeOutboundNetworkDependenciesEndpoint() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// IntegrationRuntimeOutboundNetworkDependenciesEndpoint class. + /// + /// The domain name of endpoint. + /// The details of endpoint. + public IntegrationRuntimeOutboundNetworkDependenciesEndpoint(string domainName = default(string), IList endpointDetails = default(IList)) + { + DomainName = domainName; + EndpointDetails = endpointDetails; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the domain name of endpoint. + /// + [JsonProperty(PropertyName = "domainName")] + public string DomainName { get; set; } + + /// + /// Gets or sets the details of endpoint. + /// + [JsonProperty(PropertyName = "endpointDetails")] + public IList EndpointDetails { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpointDetails.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpointDetails.cs new file mode 100644 index 0000000000000..7bc4b46901b1a --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpointDetails.cs @@ -0,0 +1,54 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The details of Azure-SSIS integration runtime outbound network + /// dependency endpoint. + /// + public partial class IntegrationRuntimeOutboundNetworkDependenciesEndpointDetails + { + /// + /// Initializes a new instance of the + /// IntegrationRuntimeOutboundNetworkDependenciesEndpointDetails class. + /// + public IntegrationRuntimeOutboundNetworkDependenciesEndpointDetails() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// IntegrationRuntimeOutboundNetworkDependenciesEndpointDetails class. + /// + /// The port of endpoint. + public IntegrationRuntimeOutboundNetworkDependenciesEndpointDetails(int? port = default(int?)) + { + Port = port; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the port of endpoint. + /// + [JsonProperty(PropertyName = "port")] + public int? Port { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse.cs new file mode 100644 index 0000000000000..1b14fcb5a89f3 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse.cs @@ -0,0 +1,58 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Azure-SSIS integration runtime outbound network dependency endpoints. + /// + public partial class IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse + { + /// + /// Initializes a new instance of the + /// IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse + /// class. + /// + public IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse + /// class. + /// + /// The list of outbound network dependency + /// endpoints. + public IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse(IList value = default(IList)) + { + Value = value; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the list of outbound network dependency endpoints. + /// + [JsonProperty(PropertyName = "value")] + public IList Value { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeVNetProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeVNetProperties.cs index d65652a7832f5..e07d87fc9d0ad 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeVNetProperties.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeVNetProperties.cs @@ -41,12 +41,15 @@ public IntegrationRuntimeVNetProperties() /// runtime will join. /// Resource IDs of the public IP addresses /// that this integration runtime will use. - public IntegrationRuntimeVNetProperties(IDictionary additionalProperties = default(IDictionary), string vNetId = default(string), string subnet = default(string), IList publicIPs = default(IList)) + /// The ID of subnet, to which this Azure-SSIS + /// integration runtime will be joined. + public IntegrationRuntimeVNetProperties(IDictionary additionalProperties = default(IDictionary), string vNetId = default(string), string subnet = default(string), IList publicIPs = default(IList), string subnetId = default(string)) { AdditionalProperties = additionalProperties; VNetId = vNetId; Subnet = subnet; PublicIPs = publicIPs; + SubnetId = subnetId; CustomInit(); } @@ -83,5 +86,12 @@ public IntegrationRuntimeVNetProperties() [JsonProperty(PropertyName = "publicIPs")] public IList PublicIPs { get; set; } + /// + /// Gets or sets the ID of subnet, to which this Azure-SSIS integration + /// runtime will be joined. + /// + [JsonProperty(PropertyName = "subnetId")] + public string SubnetId { get; set; } + } } 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 97a1a0204c39f..ede2a9f68c608 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 @@ -48,11 +48,11 @@ public JiraSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public JiraSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 8e57d5ef5b14d..f31d1cfa99b1d 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 @@ -47,9 +47,9 @@ public JsonSource() /// Json store settings. /// Json format settings. /// 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), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), JsonReadSettings formatSettings = default(JsonReadSettings), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), JsonReadSettings formatSettings = default(JsonReadSettings), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { StoreSettings = storeSettings; @@ -77,11 +77,11 @@ public JsonSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 fcf4303a57787..8f894abe7d348 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 @@ -48,11 +48,11 @@ public MagentoSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public MagentoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 273511895c470..e24f98de1ed8c 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 @@ -48,11 +48,11 @@ public MariaDBSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public MariaDBSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 b7e74f82105e2..8c3e2eed09f65 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 @@ -48,11 +48,11 @@ public MarketoSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public MarketoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 917f815c1734a..458e1054e09cf 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 @@ -47,9 +47,9 @@ public MicrosoftAccessSource() /// Database query. Type: string (or Expression /// with resultType string). /// 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 disableMetricsCollection = default(object), object query = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object query = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -71,11 +71,11 @@ public MicrosoftAccessSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object AdditionalColumns { get; set; } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbAtlasSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbAtlasSource.cs index d4bd17b176523..03b5297849359 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbAtlasSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbAtlasSource.cs @@ -60,9 +60,9 @@ public MongoDbAtlasSource() /// 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). - public MongoDbAtlasSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object filter = default(object), MongoDbCursorMethodsProperties cursorMethods = default(MongoDbCursorMethodsProperties), object batchSize = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). + public MongoDbAtlasSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object filter = default(object), MongoDbCursorMethodsProperties cursorMethods = default(MongoDbCursorMethodsProperties), object batchSize = default(object), object queryTimeout = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Filter = filter; @@ -114,11 +114,11 @@ public MongoDbAtlasSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 6f78d9fdd8918..25e4382032dd0 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 @@ -48,9 +48,9 @@ public MongoDbSource() /// expression. Type: string (or Expression with resultType /// string). /// 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 disableMetricsCollection = default(object), object query = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object query = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -72,11 +72,11 @@ public MongoDbSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 9b05a79d52975..ad132d6bd64e7 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 @@ -60,9 +60,9 @@ public MongoDbV2Source() /// 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). - public MongoDbV2Source(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object filter = default(object), MongoDbCursorMethodsProperties cursorMethods = default(MongoDbCursorMethodsProperties), object batchSize = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object filter = default(object), MongoDbCursorMethodsProperties cursorMethods = default(MongoDbCursorMethodsProperties), object batchSize = default(object), object queryTimeout = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Filter = filter; @@ -114,11 +114,11 @@ public MongoDbV2Source() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 f6f9246e2069a..5e5c99e3baaaa 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 @@ -48,11 +48,11 @@ public MySqlSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public MySqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 1f422ff9983bd..b0fb1c1ddcdd2 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 @@ -48,8 +48,8 @@ public NetezzaSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 @@ -57,7 +57,7 @@ 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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), object partitionOption = default(object), NetezzaPartitionSettings partitionSettings = default(NetezzaPartitionSettings)) + public NetezzaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object), object partitionOption = default(object), NetezzaPartitionSettings partitionSettings = default(NetezzaPartitionSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 45833bfb66edb..bd164edef32c9 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 @@ -52,9 +52,9 @@ public ODataSource() /// 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). - public ODataSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object query = default(object), object httpRequestTimeout = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object query = default(object), object httpRequestTimeout = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -87,11 +87,11 @@ public ODataSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 0c03cdbe9060c..bed308f9a0e9d 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 @@ -48,11 +48,11 @@ public OdbcSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public OdbcSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 a8dc9e6afc370..87fbed971864f 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 @@ -48,11 +48,11 @@ public OracleServiceCloudSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public OracleServiceCloudSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 0b86da4ac6199..0a144f35b9f3a 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 @@ -55,9 +55,9 @@ public OracleSource() /// The settings that will be leveraged /// for Oracle source partitioning. /// 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 disableMetricsCollection = default(object), object oracleReaderQuery = default(object), object queryTimeout = default(object), object partitionOption = default(object), OraclePartitionSettings partitionSettings = default(OraclePartitionSettings), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object oracleReaderQuery = default(object), object queryTimeout = default(object), object partitionOption = default(object), OraclePartitionSettings partitionSettings = default(OraclePartitionSettings), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { OracleReaderQuery = oracleReaderQuery; @@ -105,11 +105,11 @@ public OracleSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 afe1245c4439c..5ff4611445d57 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 @@ -46,9 +46,9 @@ public OrcSource() /// with resultType boolean). /// ORC store settings. /// 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), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { StoreSettings = storeSettings; @@ -69,11 +69,11 @@ public OrcSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 217ca5bd11bcf..0bd5c92e0a3e3 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 @@ -46,9 +46,9 @@ public ParquetSource() /// with resultType boolean). /// Parquet store settings. /// 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), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { StoreSettings = storeSettings; @@ -69,11 +69,11 @@ public ParquetSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 17a56212d41e5..a787aa30fef1a 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 @@ -48,11 +48,11 @@ public PaypalSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public PaypalSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 0b942d3f05528..178a4d089ec25 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 @@ -48,11 +48,11 @@ public PhoenixSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public PhoenixSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 18d5e94c31031..44489dd9ae887 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 @@ -48,11 +48,11 @@ public PostgreSqlSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public PostgreSqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 e1cb6c0beb5f1..39257b6b61a73 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 @@ -48,11 +48,11 @@ public PrestoSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public PrestoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 36a474289fe57..10878446293ac 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 @@ -48,11 +48,11 @@ public QuickBooksSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public QuickBooksSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 6794ddce82dce..32371f7be72dd 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 @@ -47,9 +47,9 @@ public RelationalSource() /// Database query. Type: string (or Expression /// with resultType string). /// 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 disableMetricsCollection = default(object), object query = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object query = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -71,11 +71,11 @@ public RelationalSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object AdditionalColumns { get; set; } } } 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 e6b28a61b70d3..bcfdd6f2cb0c2 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 @@ -48,11 +48,11 @@ public ResponsysSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public ResponsysSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 9e0dd7310c6ee..59fd70362ea4a 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 @@ -64,9 +64,9 @@ public RestSource() /// The time to await before sending next /// page request. /// 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 disableMetricsCollection = 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)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = 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), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { RequestMethod = requestMethod; @@ -132,11 +132,11 @@ public RestSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object AdditionalColumns { get; set; } } } 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 2d60bb7f9d469..bb865a2ac3396 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 @@ -50,11 +50,11 @@ public SalesforceMarketingCloudSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public SalesforceMarketingCloudSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 a1af0a182fd64..8ded65994b5fb 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 @@ -52,9 +52,9 @@ public SalesforceServiceCloudSource() /// Default is Query. Possible values include: 'Query', /// 'QueryAll' /// 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 disableMetricsCollection = default(object), object query = default(object), string readBehavior = default(string), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object query = default(object), string readBehavior = default(string), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { Query = query; @@ -84,11 +84,11 @@ public SalesforceServiceCloudSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 21cfc16c79d0e..24cfe3e3e3857 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 @@ -48,14 +48,14 @@ public SalesforceSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), string readBehavior = default(string)) + public SalesforceSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object), string readBehavior = default(string)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 46b9fbe17fe07..42603b3463877 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 @@ -48,11 +48,11 @@ public SapBwSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public SapBwSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 574493c786054..4968259e7be76 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 @@ -48,8 +48,8 @@ public SapCloudForCustomerSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). /// SAP Cloud for Customer OData query. For /// example, "$top=1". Type: string (or Expression with resultType /// string). @@ -58,7 +58,7 @@ public SapCloudForCustomerSource() /// to read response data. Default value: 00:05:00. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). - public SapCloudForCustomerSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), object httpRequestTimeout = default(object)) + public SapCloudForCustomerSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object), object httpRequestTimeout = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 b8235b0ef4629..1b65f3aa0e15f 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 @@ -48,8 +48,8 @@ public SapEccSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). /// SAP ECC OData query. For example, "$top=1". /// Type: string (or Expression with resultType string). /// The timeout (TimeSpan) to get an @@ -57,7 +57,7 @@ public SapEccSource() /// to read response data. Default value: 00:05:00. Type: string (or /// Expression with resultType string), pattern: /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). - public SapEccSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), object httpRequestTimeout = default(object)) + public SapEccSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object), object httpRequestTimeout = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 5f41ddde7ea6b..1ab8129051652 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 @@ -48,8 +48,8 @@ public SapHanaSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 @@ -60,7 +60,7 @@ public SapHanaSource() /// /// 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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), object packetSize = default(object), object partitionOption = default(object), SapHanaPartitionSettings partitionSettings = default(SapHanaPartitionSettings)) + public SapHanaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object), object packetSize = default(object), object partitionOption = default(object), SapHanaPartitionSettings partitionSettings = default(SapHanaPartitionSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 a0492c212b392..69c6f265b6faa 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 @@ -49,8 +49,8 @@ public SapOpenHubSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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). @@ -65,7 +65,7 @@ public SapOpenHubSource() /// be used as delimiter passed to SAP RFC as well as splitting the /// output data retrieved. Type: string (or Expression with resultType /// string). - public SapOpenHubSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object excludeLastRequest = default(object), object baseRequestId = default(object), object customRfcReadTableFunctionModule = default(object), object sapDataColumnDelimiter = default(object)) + public SapOpenHubSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object excludeLastRequest = default(object), object baseRequestId = default(object), object customRfcReadTableFunctionModule = default(object), object sapDataColumnDelimiter = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { ExcludeLastRequest = excludeLastRequest; 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 8e37115c57fa2..df3f040fedb23 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 @@ -48,8 +48,8 @@ public SapTableSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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. @@ -77,7 +77,7 @@ 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 disableMetricsCollection = 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), object sapDataColumnDelimiter = default(object), object partitionOption = default(object), SapTablePartitionSettings partitionSettings = default(SapTablePartitionSettings)) + public SapTableSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = 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), object sapDataColumnDelimiter = default(object), object partitionOption = default(object), SapTablePartitionSettings partitionSettings = default(SapTablePartitionSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { RowCount = rowCount; 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 ba81292454d82..96f4a4ef0f9b8 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 @@ -48,11 +48,11 @@ public ServiceNowSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public ServiceNowSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 b089ffef1d277..73ffc53a86be6 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 @@ -48,11 +48,11 @@ public ShopifySource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public ShopifySource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 f96430d50c577..3a6f8dbdaab48 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 @@ -48,11 +48,11 @@ public SparkSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public SparkSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWSink.cs index 85618404fb37d..e63175803062c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWSink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWSink.cs @@ -64,7 +64,14 @@ public SqlDWSink() /// The option to handle sink table, such as /// autoCreate. For now only 'autoCreate' value is supported. Type: /// string (or Expression with resultType string). - public SqlDWSink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object preCopyScript = default(object), object allowPolyBase = default(object), PolybaseSettings polyBaseSettings = default(PolybaseSettings), object allowCopyCommand = default(object), DWCopyCommandSettings copyCommandSettings = default(DWCopyCommandSettings), object tableOption = default(object)) + /// Whether to use table lock + /// during bulk copy. Type: boolean (or Expression with resultType + /// boolean). + /// Write behavior when copying data into + /// azure SQL DW. Type: SqlDWWriteBehaviorEnum (or Expression with + /// resultType SqlDWWriteBehaviorEnum) + /// SQL DW upsert settings. + public SqlDWSink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object preCopyScript = default(object), object allowPolyBase = default(object), PolybaseSettings polyBaseSettings = default(PolybaseSettings), object allowCopyCommand = default(object), DWCopyCommandSettings copyCommandSettings = default(DWCopyCommandSettings), object tableOption = default(object), object sqlWriterUseTableLock = default(object), object writeBehavior = default(object), SqlDWUpsertSettings upsertSettings = default(SqlDWUpsertSettings)) : base(additionalProperties, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection) { PreCopyScript = preCopyScript; @@ -73,6 +80,9 @@ public SqlDWSink() AllowCopyCommand = allowCopyCommand; CopyCommandSettings = copyCommandSettings; TableOption = tableOption; + SqlWriterUseTableLock = sqlWriterUseTableLock; + WriteBehavior = writeBehavior; + UpsertSettings = upsertSettings; CustomInit(); } @@ -126,5 +136,26 @@ public SqlDWSink() [JsonProperty(PropertyName = "tableOption")] public object TableOption { get; set; } + /// + /// Gets or sets whether to use table lock during bulk copy. Type: + /// boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "sqlWriterUseTableLock")] + public object SqlWriterUseTableLock { get; set; } + + /// + /// Gets or sets write behavior when copying data into azure SQL DW. + /// Type: SqlDWWriteBehaviorEnum (or Expression with resultType + /// SqlDWWriteBehaviorEnum) + /// + [JsonProperty(PropertyName = "writeBehavior")] + public object WriteBehavior { get; set; } + + /// + /// Gets or sets SQL DW upsert settings. + /// + [JsonProperty(PropertyName = "upsertSettings")] + public SqlDWUpsertSettings UpsertSettings { get; set; } + } } 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 dfbca5b7fed6d..a97edc53bf6a2 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 @@ -48,8 +48,8 @@ public SqlDWSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). /// SQL Data Warehouse reader query. Type: /// string (or Expression with resultType string). /// Name of the stored @@ -65,7 +65,7 @@ public SqlDWSource() /// "PhysicalPartitionsOfTable", "DynamicRange". /// The settings that will be leveraged /// for Sql source partitioning. - public SqlDWSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), object storedProcedureParameters = default(object), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) + public SqlDWSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), object storedProcedureParameters = default(object), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { SqlReaderQuery = sqlReaderQuery; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWUpsertSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWUpsertSettings.cs new file mode 100644 index 0000000000000..7b6c86c2eef48 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWUpsertSettings.cs @@ -0,0 +1,64 @@ +// +// 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; + + /// + /// Sql DW upsert option settings + /// + public partial class SqlDWUpsertSettings + { + /// + /// Initializes a new instance of the SqlDWUpsertSettings class. + /// + public SqlDWUpsertSettings() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SqlDWUpsertSettings class. + /// + /// Schema name for interim table. + /// Type: string (or Expression with resultType string). + /// Key column names for unique row identification. + /// Type: array of strings (or Expression with resultType array of + /// strings). + public SqlDWUpsertSettings(object interimSchemaName = default(object), object keys = default(object)) + { + InterimSchemaName = interimSchemaName; + Keys = keys; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets schema name for interim table. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "interimSchemaName")] + public object InterimSchemaName { get; set; } + + /// + /// Gets or sets key column names for unique row identification. Type: + /// array of strings (or Expression with resultType array of strings). + /// + [JsonProperty(PropertyName = "keys")] + public object Keys { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWWriteBehaviorEnum.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWWriteBehaviorEnum.cs new file mode 100644 index 0000000000000..6f905c4287ca7 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlDWWriteBehaviorEnum.cs @@ -0,0 +1,22 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + + /// + /// Defines values for SqlDWWriteBehaviorEnum. + /// + public static class SqlDWWriteBehaviorEnum + { + public const string Insert = "Insert"; + public const string Upsert = "Upsert"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlMISink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlMISink.cs index 40611d33c54dc..4d69950593136 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlMISink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlMISink.cs @@ -64,7 +64,14 @@ public SqlMISink() /// The option to handle sink table, such as /// autoCreate. For now only 'autoCreate' value is supported. Type: /// string (or Expression with resultType string). - public SqlMISink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object sqlWriterStoredProcedureName = default(object), object sqlWriterTableType = default(object), object preCopyScript = default(object), IDictionary storedProcedureParameters = default(IDictionary), object storedProcedureTableTypeParameterName = default(object), object tableOption = default(object)) + /// Whether to use table lock + /// during bulk copy. Type: boolean (or Expression with resultType + /// boolean). + /// White behavior when copying data into + /// azure SQL MI. Type: SqlWriteBehaviorEnum (or Expression with + /// resultType SqlWriteBehaviorEnum) + /// SQL upsert settings. + public SqlMISink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object sqlWriterStoredProcedureName = default(object), object sqlWriterTableType = default(object), object preCopyScript = default(object), IDictionary storedProcedureParameters = default(IDictionary), object storedProcedureTableTypeParameterName = default(object), object tableOption = default(object), object sqlWriterUseTableLock = default(object), object writeBehavior = default(object), SqlUpsertSettings upsertSettings = default(SqlUpsertSettings)) : base(additionalProperties, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection) { SqlWriterStoredProcedureName = sqlWriterStoredProcedureName; @@ -73,6 +80,9 @@ public SqlMISink() StoredProcedureParameters = storedProcedureParameters; StoredProcedureTableTypeParameterName = storedProcedureTableTypeParameterName; TableOption = tableOption; + SqlWriterUseTableLock = sqlWriterUseTableLock; + WriteBehavior = writeBehavior; + UpsertSettings = upsertSettings; CustomInit(); } @@ -123,5 +133,26 @@ public SqlMISink() [JsonProperty(PropertyName = "tableOption")] public object TableOption { get; set; } + /// + /// Gets or sets whether to use table lock during bulk copy. Type: + /// boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "sqlWriterUseTableLock")] + public object SqlWriterUseTableLock { get; set; } + + /// + /// Gets or sets white behavior when copying data into azure SQL MI. + /// Type: SqlWriteBehaviorEnum (or Expression with resultType + /// SqlWriteBehaviorEnum) + /// + [JsonProperty(PropertyName = "writeBehavior")] + public object WriteBehavior { get; set; } + + /// + /// Gets or sets SQL upsert settings. + /// + [JsonProperty(PropertyName = "upsertSettings")] + public SqlUpsertSettings UpsertSettings { get; set; } + } } 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 71a7dba88c011..6c1e422d93c31 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 @@ -48,8 +48,8 @@ public SqlMISource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). /// SQL reader query. Type: string (or /// Expression with resultType string). /// Name of the stored @@ -66,7 +66,7 @@ public SqlMISource() /// "PhysicalPartitionsOfTable", "DynamicRange". /// The settings that will be leveraged /// for Sql source partitioning. - public SqlMISource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = 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), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) + public SqlMISource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { SqlReaderQuery = sqlReaderQuery; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerSink.cs index 841b30e178a05..93302987e4d45 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerSink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerSink.cs @@ -64,7 +64,14 @@ public SqlServerSink() /// The option to handle sink table, such as /// autoCreate. For now only 'autoCreate' value is supported. Type: /// string (or Expression with resultType string). - public SqlServerSink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object sqlWriterStoredProcedureName = default(object), object sqlWriterTableType = default(object), object preCopyScript = default(object), IDictionary storedProcedureParameters = default(IDictionary), object storedProcedureTableTypeParameterName = default(object), object tableOption = default(object)) + /// Whether to use table lock + /// during bulk copy. Type: boolean (or Expression with resultType + /// boolean). + /// Write behavior when copying data into + /// sql server. Type: SqlWriteBehaviorEnum (or Expression with + /// resultType SqlWriteBehaviorEnum) + /// SQL upsert settings. + public SqlServerSink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object sqlWriterStoredProcedureName = default(object), object sqlWriterTableType = default(object), object preCopyScript = default(object), IDictionary storedProcedureParameters = default(IDictionary), object storedProcedureTableTypeParameterName = default(object), object tableOption = default(object), object sqlWriterUseTableLock = default(object), object writeBehavior = default(object), SqlUpsertSettings upsertSettings = default(SqlUpsertSettings)) : base(additionalProperties, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection) { SqlWriterStoredProcedureName = sqlWriterStoredProcedureName; @@ -73,6 +80,9 @@ public SqlServerSink() StoredProcedureParameters = storedProcedureParameters; StoredProcedureTableTypeParameterName = storedProcedureTableTypeParameterName; TableOption = tableOption; + SqlWriterUseTableLock = sqlWriterUseTableLock; + WriteBehavior = writeBehavior; + UpsertSettings = upsertSettings; CustomInit(); } @@ -123,5 +133,26 @@ public SqlServerSink() [JsonProperty(PropertyName = "tableOption")] public object TableOption { get; set; } + /// + /// Gets or sets whether to use table lock during bulk copy. Type: + /// boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "sqlWriterUseTableLock")] + public object SqlWriterUseTableLock { get; set; } + + /// + /// Gets or sets write behavior when copying data into sql server. + /// Type: SqlWriteBehaviorEnum (or Expression with resultType + /// SqlWriteBehaviorEnum) + /// + [JsonProperty(PropertyName = "writeBehavior")] + public object WriteBehavior { get; set; } + + /// + /// Gets or sets SQL upsert settings. + /// + [JsonProperty(PropertyName = "upsertSettings")] + public SqlUpsertSettings UpsertSettings { get; set; } + } } 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 f839bda080d9f..07e9e467d73d6 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 @@ -48,8 +48,8 @@ public SqlServerSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). /// SQL reader query. Type: string (or /// Expression with resultType string). /// Name of the stored @@ -66,7 +66,7 @@ public SqlServerSource() /// "PhysicalPartitionsOfTable", "DynamicRange". /// The settings that will be leveraged /// for Sql source partitioning. - public SqlServerSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = 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), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) + public SqlServerSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { SqlReaderQuery = sqlReaderQuery; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlSink.cs index 3d603b5d85220..d22257ec5197f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlSink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlSink.cs @@ -64,7 +64,14 @@ public SqlSink() /// The option to handle sink table, such as /// autoCreate. For now only 'autoCreate' value is supported. Type: /// string (or Expression with resultType string). - public SqlSink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object sqlWriterStoredProcedureName = default(object), object sqlWriterTableType = default(object), object preCopyScript = default(object), IDictionary storedProcedureParameters = default(IDictionary), object storedProcedureTableTypeParameterName = default(object), object tableOption = default(object)) + /// Whether to use table lock + /// during bulk copy. Type: boolean (or Expression with resultType + /// boolean). + /// Write behavior when copying data into + /// sql. Type: SqlWriteBehaviorEnum (or Expression with resultType + /// SqlWriteBehaviorEnum) + /// SQL upsert settings. + public SqlSink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object sqlWriterStoredProcedureName = default(object), object sqlWriterTableType = default(object), object preCopyScript = default(object), IDictionary storedProcedureParameters = default(IDictionary), object storedProcedureTableTypeParameterName = default(object), object tableOption = default(object), object sqlWriterUseTableLock = default(object), object writeBehavior = default(object), SqlUpsertSettings upsertSettings = default(SqlUpsertSettings)) : base(additionalProperties, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections, disableMetricsCollection) { SqlWriterStoredProcedureName = sqlWriterStoredProcedureName; @@ -73,6 +80,9 @@ public SqlSink() StoredProcedureParameters = storedProcedureParameters; StoredProcedureTableTypeParameterName = storedProcedureTableTypeParameterName; TableOption = tableOption; + SqlWriterUseTableLock = sqlWriterUseTableLock; + WriteBehavior = writeBehavior; + UpsertSettings = upsertSettings; CustomInit(); } @@ -123,5 +133,26 @@ public SqlSink() [JsonProperty(PropertyName = "tableOption")] public object TableOption { get; set; } + /// + /// Gets or sets whether to use table lock during bulk copy. Type: + /// boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "sqlWriterUseTableLock")] + public object SqlWriterUseTableLock { get; set; } + + /// + /// Gets or sets write behavior when copying data into sql. Type: + /// SqlWriteBehaviorEnum (or Expression with resultType + /// SqlWriteBehaviorEnum) + /// + [JsonProperty(PropertyName = "writeBehavior")] + public object WriteBehavior { get; set; } + + /// + /// Gets or sets SQL upsert settings. + /// + [JsonProperty(PropertyName = "upsertSettings")] + public SqlUpsertSettings UpsertSettings { get; set; } + } } 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 fb68740291c9c..1cb224f0bbd3b 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 @@ -48,8 +48,8 @@ public SqlSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). /// SQL reader query. Type: string (or /// Expression with resultType string). /// Name of the stored @@ -69,7 +69,7 @@ public SqlSource() /// "PhysicalPartitionsOfTable", "DynamicRange". /// The settings that will be leveraged /// for Sql source partitioning. - public SqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = 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), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) + public SqlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object isolationLevel = default(object), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { SqlReaderQuery = sqlReaderQuery; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlUpsertSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlUpsertSettings.cs new file mode 100644 index 0000000000000..04c0ec7db7ebb --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlUpsertSettings.cs @@ -0,0 +1,75 @@ +// +// 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; + + /// + /// Sql upsert option settings + /// + public partial class SqlUpsertSettings + { + /// + /// Initializes a new instance of the SqlUpsertSettings class. + /// + public SqlUpsertSettings() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SqlUpsertSettings class. + /// + /// Specifies whether to use temp db for upsert + /// interim table. Type: boolean (or Expression with resultType + /// boolean). + /// Schema name for interim table. + /// Type: string (or Expression with resultType string). + /// Key column names for unique row identification. + /// Type: array of strings (or Expression with resultType array of + /// strings). + public SqlUpsertSettings(object useTempDB = default(object), object interimSchemaName = default(object), object keys = default(object)) + { + UseTempDB = useTempDB; + InterimSchemaName = interimSchemaName; + Keys = keys; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets specifies whether to use temp db for upsert interim + /// table. Type: boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "useTempDB")] + public object UseTempDB { get; set; } + + /// + /// Gets or sets schema name for interim table. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "interimSchemaName")] + public object InterimSchemaName { get; set; } + + /// + /// Gets or sets key column names for unique row identification. Type: + /// array of strings (or Expression with resultType array of strings). + /// + [JsonProperty(PropertyName = "keys")] + public object Keys { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlWriteBehaviorEnum.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlWriteBehaviorEnum.cs new file mode 100644 index 0000000000000..1bc31bb01b30c --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlWriteBehaviorEnum.cs @@ -0,0 +1,23 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + + /// + /// Defines values for SqlWriteBehaviorEnum. + /// + public static class SqlWriteBehaviorEnum + { + public const string Insert = "Insert"; + public const string Upsert = "Upsert"; + public const string StoredProcedure = "StoredProcedure"; + } +} 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 065e96e11468e..ecde984731c12 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 @@ -48,11 +48,11 @@ public SquareSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public SquareSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 84c5181ecdb44..3b7f7f3bca80b 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 @@ -48,11 +48,11 @@ public SybaseSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public SybaseSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 3d1612af4c15b..71aa0cf566c11 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 @@ -48,9 +48,9 @@ public TabularSource() /// 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). - public TabularSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { QueryTimeout = queryTimeout; @@ -73,11 +73,11 @@ public TabularSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 2f35e7f2b6a5d..fc465b2171b67 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 @@ -48,8 +48,8 @@ public TeradataSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). /// Teradata query. Type: string (or Expression /// with resultType string). /// The partition mechanism that will be @@ -57,7 +57,7 @@ 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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object), object partitionOption = default(object), TeradataPartitionSettings partitionSettings = default(TeradataPartitionSettings)) + public TeradataSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object), object partitionOption = default(object), TeradataPartitionSettings partitionSettings = default(TeradataPartitionSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 013cef909846f..82b372340758d 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 @@ -48,11 +48,11 @@ public VerticaSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public VerticaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; 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 c73cb5c5a1125..ea77dcb33d9fe 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 @@ -45,9 +45,9 @@ public WebSource() /// metrics collection. Default is false. Type: boolean (or Expression /// with resultType boolean). /// 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), object disableMetricsCollection = default(object), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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), object disableMetricsCollection = default(object), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { AdditionalColumns = additionalColumns; @@ -61,11 +61,11 @@ public WebSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object 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 85491d12ef7c2..ea34450de2e88 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 @@ -48,11 +48,11 @@ public XeroSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public XeroSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlSource.cs index 12185a2637870..76f76cf358ee4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/XmlSource.cs @@ -47,9 +47,9 @@ public XmlSource() /// Xml store settings. /// Xml format settings. /// Specifies the additional columns to - /// be added to source data. Type: array of objects (or Expression with - /// resultType array of objects). - public XmlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), XmlReadSettings formatSettings = default(XmlReadSettings), IList additionalColumns = default(IList)) + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). + public XmlSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), StoreReadSettings storeSettings = default(StoreReadSettings), XmlReadSettings formatSettings = default(XmlReadSettings), object additionalColumns = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection) { StoreSettings = storeSettings; @@ -77,11 +77,11 @@ public XmlSource() /// /// Gets or sets specifies the additional columns to be added to source - /// data. Type: array of objects (or Expression with resultType array - /// of objects). + /// data. Type: array of objects(AdditionalColumns) (or Expression with + /// resultType array of objects). /// [JsonProperty(PropertyName = "additionalColumns")] - public IList AdditionalColumns { get; set; } + public object AdditionalColumns { get; set; } } } 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 7a7425e559158..b992696d3a697 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 @@ -48,11 +48,11 @@ public ZohoSource() /// 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). + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (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 disableMetricsCollection = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object query = default(object)) + public ZohoSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object query = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) { Query = query; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index b770177806e76..f9b95cdcc6c89 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -5,15 +5,15 @@ Microsoft.Azure.Management.DataFactory Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms. - 4.21.0 + 4.22.0 Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs index a67de1d2171db..78f2f3a27442f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("4.21.0.0")] -[assembly: AssemblyFileVersion("4.21.0.0")] +[assembly: AssemblyVersion("4.22.0.0")] +[assembly: AssemblyFileVersion("4.22.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs new file mode 100644 index 0000000000000..b3753f4a81705 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs @@ -0,0 +1,35 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. + +using DataFactory.Tests.Utils; + +namespace DataFactory.Tests.JsonSamples +{ + public class IntegrationRuntimeJsonSamples : JsonSampleCollection + { + [JsonSample] + public const string AzureSSISIntegrationRuntime = @" +{ + ""properties"": { + ""type"": ""Managed"", + ""typeProperties"": { + ""computeProperties"": { + ""location"": ""West Us"", + ""nodeSize"": ""standard_d2_v3"", + ""numberOfNodes"": 1, + ""maxParallelExecutionsPerNode"": 4, + ""vNetProperties"": { + ""subnetId"": ""/subscriptions/1491d049-b7ce-4dc5-9833-d2947b0bd2e1/Azure_SSIS_API/providers/Microsoft.Network/virtualNetworks/FirstVNetForAzureSSIS/subnets/default"" + } + }, + ""ssisProperties"": { + ""licenseType"": ""BasePrice"", + ""edition"": ""Standard"" + } + } + }, + ""name"": ""rpV2testIntegrationRuntime-1cec239b-0b0a-460f-9e7a-0dfff4b885e6"" +}"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs index 5f2ed26b3d391..330fb7d170a97 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs @@ -7325,6 +7325,73 @@ public class PipelineJsonSamples : JsonSampleCollection ] } } +"; + + [JsonSample(version: "Copy")] + public const string CopySqlMIToSqlMIWithTableLockUpsert = @" +{ + name: ""MyPipelineName"", + properties: + { + description : ""Copy from SqlMI to SqlMI"", + activities: + [ + { + type: ""Copy"", + name: ""TestActivity"", + typeProperties: + { + source: + { + type: ""SqlMISource"", + sqlReaderQuery: ""select * from my_table"", + queryTimeout: ""00:00:01"", + partitionOption: ""DynamicRange"", + partitionSettings: { + partitionColumnName: ""column"", + partitionUpperBound: 1, + partitionLowerBound: 100 + } + }, + sink: + { + type: ""SqlMISink"", + sqlWriterTableType: ""MarketingType"", + sqlWriterUseTableLock: true, + writeBehavior: ""Upsert"", + upsertSettings:{ + useTempDB: true, + keys: [""key1""] + } + }, + translator: + { + type: ""TabularTranslator"", + columnMappings: ""PartitionKey:PartitionKey"" + } + }, + inputs: + [ + { + referenceName: ""exampleDataset"", type: ""DatasetReference"" + } + ], + outputs: + [ + { + referenceName: ""exampleDataset"", type: ""DatasetReference"" + } + ], + linkedServiceName: { referenceName: ""MyLinkedServiceName"", type: ""LinkedServiceReference"" }, + policy: + { + retry: 3, + timeout: ""00:00:05"", + } + } + ] + } +} "; } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/IntegrationRuntimeScenarioTests.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/IntegrationRuntimeScenarioTests.cs index 276239c19e148..d420d6a89deea 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/IntegrationRuntimeScenarioTests.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/ScenarioTests/IntegrationRuntimeScenarioTests.cs @@ -155,7 +155,11 @@ public async Task SsisAzureIntegrationRuntimeScenarioTest() NodeSize = "Standard_D1_v2", MaxParallelExecutionsPerNode = 1, NumberOfNodes = 1, - Location = "WestUS" + Location = "WestUS", + VNetProperties = new IntegrationRuntimeVNetProperties + { + SubnetId = "/subscriptions/1491d049-b7ce-4dc5-9833-d2947b0bd2e1/resourceGroups/Azure_SSIS_API/providers/Microsoft.Network/virtualNetworks/FirstVNetForAzureSSIS/subnets/TestVnetJoin" + } }, SsisProperties = new IntegrationRuntimeSsisProperties { @@ -218,6 +222,11 @@ await client.IntegrationRuntimes.StopAsync( integrationRuntimeName); managedStatus = status.Properties as ManagedIntegrationRuntimeStatus; Assert.Equal(IntegrationRuntimeState.Stopped, managedStatus.State); + + await client.IntegrationRuntimes.ListOutboundNetworkDependenciesEndpointsWithHttpMessagesAsync( + this.ResourceGroupName, + this.DataFactoryName, + integrationRuntimeName); }; Func finallyAction = async (client) => diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/SessionRecords/IntegrationRuntimeScenarioTests/SsisAzureIntegrationRuntimeScenarioTest.json b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/SessionRecords/IntegrationRuntimeScenarioTests/SsisAzureIntegrationRuntimeScenarioTest.json index 3af81b862f694..dc857c661cbe5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/SessionRecords/IntegrationRuntimeScenarioTests/SsisAzureIntegrationRuntimeScenarioTest.json +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/SessionRecords/IntegrationRuntimeScenarioTests/SsisAzureIntegrationRuntimeScenarioTest.json @@ -6179,6 +6179,73 @@ }, "StatusCode": 200 }, + { + "RequestUri": "/subscriptions/c39dce18-cead-4065-8fb1-3af7683a5038/resourceGroups/sdktestingadfrg5566/providers/Microsoft.DataFactory/factories/sdktestingfactory352/integrationRuntimes/ssisazureintegrationruntime/outboundNetworkDependenciesEndpoints?api-version=2018-06-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYzM5ZGNlMTgtY2VhZC00MDY1LThmYjEtM2FmNzY4M2E1MDM4L3Jlc291cmNlR3JvdXBzL3Nka3Rlc3RpbmdhZGZyZzU1NjYvcHJvdmlkZXJzL01pY3Jvc29mdC5EYXRhRmFjdG9yeS9mYWN0b3JpZXMvc2RrdGVzdGluZ2ZhY3RvcnkzNTIvaW50ZWdyYXRpb25SdW50aW1lcy9zc2lzYXp1cmVpbnRlZ3JhdGlvbnJ1bnRpbWUvb3V0Ym91bmROZXR3b3JrRGVwZW5kZW5jaWVzRW5kcG9pbnRzP2FwaS12ZXJzaW9uPTIwMTgtMDYtMDE=", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-client-request-id": [ + "a8010bda-5d3a-4a64-8862-cbb79c787d6d" + ], + "accept-language": [ + "en-US" + ], + "User-Agent": [ + "FxVersion/4.6.25211.01", + "Microsoft.Azure.Management.DataFactory.DataFactoryManagementClient/0.8.0.0" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"category\": \"Azure Data Factory (Management)\",\r\n \"endpoints\": [\r\n {\r\n \"domainName\": \"wu.frontend.clouddatahub.net\",\r\n \"endpointDetails\": [\r\n {\r\n \"port\": 443\r\n }\r\n ]\r\n }\r\n ]\r\n },\r\n {\r\n \"category\": \"Azure Storage (Management)\",\r\n \"endpoints\": [\r\n {\r\n \"domainName\": \"*.blob.core.windows.net\",\r\n \"endpointDetails\": [\r\n {\r\n \"port\": 443\r\n }\r\n ]\r\n },\r\n {\r\n \"domainName\": \"*.table.core.windows.net\",\r\n \"endpointDetails\": [\r\n {\r\n \"port\": 443\r\n }\r\n ]\r\n }\r\n ]\r\n },\r\n {\r\n \"category\": \"Event Hub (Logging)\",\r\n \"endpoints\": [\r\n {\r\n \"domainName\": \"*.servicebus.windows.net\",\r\n \"endpointDetails\": [\r\n {\r\n \"port\": 443\r\n }\r\n ]\r\n }\r\n ]\r\n },\r\n {\r\n \"category\": \"Microsoft Logging service (Internal Use)\",\r\n \"endpoints\": [\r\n {\r\n \"domainName\": \"gcs.prod.monitoring.core.windows.net\",\r\n \"endpointDetails\": [\r\n {\r\n \"port\": 443\r\n }\r\n ]\r\n },\r\n {\r\n \"domainName\": \"prod.warmpath.msftcloudes.com\",\r\n \"endpointDetails\": [\r\n {\r\n \"port\": 443\r\n }\r\n ]\r\n },\r\n {\r\n \"domainName\": \"azurewatsonanalysis-prod.core.windows.net\",\r\n \"endpointDetails\": [\r\n {\r\n \"port\": 443\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 22 Jun 2018 09:11:59 GMT" + ], + "Pragma": [ + "no-cache" + ], + "Transfer-Encoding": [ + "chunked" + ], + "Server": [ + "Microsoft-IIS/8.5" + ], + "Vary": [ + "Accept-Encoding" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "X-Content-Type-Options": [ + "nosniff" + ], + "X-Powered-By": [ + "ASP.NET" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14911" + ], + "x-ms-request-id": [ + "13326532-db8c-4e0e-abfc-9e86764b3c60" + ], + "x-ms-correlation-request-id": [ + "13326532-db8c-4e0e-abfc-9e86764b3c60" + ], + "x-ms-routing-request-id": [ + "NORTHEUROPE:20180622T091200Z:13326532-db8c-4e0e-abfc-9e86764b3c60" + ] + }, + "StatusCode": 200 + }, { "RequestUri": "/subscriptions/c39dce18-cead-4065-8fb1-3af7683a5038/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1TREtURVNUSU5HQURGUkc1NTY2LVdFU1RFVVJPUEUiLCJqb2JMb2NhdGlvbiI6Indlc3RldXJvcGUifQ?api-version=2017-05-10", "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYzM5ZGNlMTgtY2VhZC00MDY1LThmYjEtM2FmNzY4M2E1MDM4L29wZXJhdGlvbnJlc3VsdHMvZXlKcWIySkpaQ0k2SWxKRlUwOVZVa05GUjFKUFZWQkVSVXhGVkVsUFRrcFBRaTFUUkV0VVJWTlVTVTVIUVVSR1VrYzFOVFkyTFZkRlUxUkZWVkpQVUVVaUxDSnFiMkpNYjJOaGRHbHZiaUk2SW5kbGMzUmxkWEp2Y0dVaWZRP2FwaS12ZXJzaW9uPTIwMTctMDUtMTA=", diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/IntegrationRuntimeTests.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/IntegrationRuntimeTests.cs new file mode 100644 index 0000000000000..ffef475e4be29 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/UnitTests/IntegrationRuntimeTests.cs @@ -0,0 +1,33 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. + +using DataFactory.Tests.JsonSamples; +using DataFactory.Tests.Utils; +using Microsoft.Azure.Management.DataFactory.Models; +using Xunit; +using Xunit.Abstractions; +using Xunit.Sdk; + +namespace DataFactory.Tests.UnitTests +{ + public class IntegrationRuntimeTests : BaseUnitTest + { + // Enable Xunit test output logger. + protected readonly ITestOutputHelper logger = new TestOutputHelper(); + + public IntegrationRuntimeTests(ITestOutputHelper logger) + : base() + { + this.logger = logger; + } + + [Theory] + [ClassData(typeof(IntegrationRuntimeJsonSamples))] + [Trait(TraitName.TestType, TestType.Unit)] + public void IntegrationRuntime_SerializationTest(JsonSampleInfo jsonSample) + { + TestJsonSample(jsonSample); + } + } +} \ No newline at end of file From 4f2c788f93a9bb8a0e961a674bba6ec17efd0a73 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 4 Aug 2021 15:52:13 +0800 Subject: [PATCH 5/5] Added --- .../datafactory_resource-manager.txt | 4 ++-- .../src/CHANGELOG.md | 1 + .../Models/CosmosDbMongoDbApiLinkedService.cs | 14 +++++++++++++- ...icrosoft.Azure.Management.DataFactory.csproj | 1 + .../JsonSamples/LinkedServiceJsonSamples.cs | 17 +++++++++++++++++ 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index d7f690389c3a2..b48bbd3f16b5f 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,11 +4,11 @@ Commencing code generation Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net-1\sdk -2021-08-03 08:05:41 UTC +2021-08-04 07:49:11 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: c25e3a8c81feb4e965d65e8584262fea42b5da0a +Commit: c981b81aa26ad4d0d156e034e6782853b4e747a1 AutoRest information Requested version: v2 Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index f174f05869331..0e64e489c8237 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -3,6 +3,7 @@ ## Version 4.22.0 ### Feature Additions - Added Sql table lock and upsert properties +- Added isServerVersionAbove32 in CosmosDbMongoDbApi linked service - Changed additionalColumns/compressionType to type of object - Support cleanup property for integration runtime resource from DataFactory - Unify IR vNet injection experience diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbMongoDbApiLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbMongoDbApiLinkedService.cs index ce562e9fe1238..ba39a2c84c35c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbMongoDbApiLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbMongoDbApiLinkedService.cs @@ -51,9 +51,13 @@ public CosmosDbMongoDbApiLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the linked service. - public CosmosDbMongoDbApiLinkedService(object connectionString, object database, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) + /// Whether the CosmosDB (MongoDB + /// API) server version is higher than 3.2. The default value is false. + /// Type: boolean (or Expression with resultType boolean). + public CosmosDbMongoDbApiLinkedService(object connectionString, object database, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object isServerVersionAbove32 = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { + IsServerVersionAbove32 = isServerVersionAbove32; ConnectionString = connectionString; Database = database; CustomInit(); @@ -64,6 +68,14 @@ public CosmosDbMongoDbApiLinkedService() /// partial void CustomInit(); + /// + /// Gets or sets whether the CosmosDB (MongoDB API) server version is + /// higher than 3.2. The default value is false. Type: boolean (or + /// Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "typeProperties.isServerVersionAbove32")] + public object IsServerVersionAbove32 { get; set; } + /// /// Gets or sets the CosmosDB (MongoDB API) connection string. Type: /// string, SecureString or AzureKeyVaultSecretReference. Type: string, diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index f9b95cdcc6c89..bff86e7642b9d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -11,6 +11,7 @@