From 5cd1e81525398e2016d5f6f9f4c662c8ab4dd743 Mon Sep 17 00:00:00 2001 From: Jingshu918 <138486531+Jingshu918@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:53:58 +0800 Subject: [PATCH] [DataFactory]Support New Features In ADF (#25600) * [DataFactory]Support New Features In ADF * Update ChangeLog.md --------- Co-authored-by: Yabo Hu --- .../Models/AzureTableStorageLinkedService.cs | 30 +++++- ...TableStorageLinkedServiceTypeProperties.cs | 96 +++++++++++++++++++ .../CommonDataServiceForAppsLinkedService.cs | 21 +++- ...rviceForAppsLinkedServiceTypeProperties.cs | 21 +++- .../Models/ContinuationSettingsReference.cs | 68 +++++++++++++ .../Models/DynamicsAuthenticationType.cs | 1 + .../Models/DynamicsCrmLinkedService.cs | 21 +++- .../DynamicsCrmLinkedServiceTypeProperties.cs | 21 +++- .../Generated/Models/DynamicsLinkedService.cs | 21 +++- .../DynamicsLinkedServiceTypeProperties.cs | 21 +++- .../Models/ExecuteDataFlowActivity.cs | 13 ++- .../ExecuteDataFlowActivityTypeProperties.cs | 13 ++- ...ExecutePowerQueryActivityTypeProperties.cs | 7 +- .../ExecuteWranglingDataflowActivity.cs | 13 ++- .../Models/SnowflakeExportCopyCommand.cs | 14 ++- .../Models/SnowflakeImportCopyCommand.cs | 14 ++- .../Models/SqlServerAuthenticationType.cs | 1 + .../Models/SqlServerLinkedService.cs | 21 +++- .../SqlServerLinkedServiceTypeProperties.cs | 21 +++- .../DataFactory.Management.Sdk/README.md | 2 +- src/DataFactory/DataFactory/ChangeLog.md | 4 + 21 files changed, 411 insertions(+), 33 deletions(-) create mode 100644 src/DataFactory/DataFactory.Management.Sdk/Generated/Models/AzureTableStorageLinkedServiceTypeProperties.cs create mode 100644 src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ContinuationSettingsReference.cs diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/AzureTableStorageLinkedService.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/AzureTableStorageLinkedService.cs index cd5afb85fb15..c3aab96ee9e9 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/AzureTableStorageLinkedService.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/AzureTableStorageLinkedService.cs @@ -60,7 +60,14 @@ public AzureTableStorageLinkedService() /// The encrypted credential used for authentication. Credentials are encrypted /// using the integration runtime credential manager. Type: string. /// - public AzureTableStorageLinkedService(System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary parameters = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList annotations = default(System.Collections.Generic.IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string encryptedCredential = default(string)) + + /// Table service endpoint of the Azure Table Storage resource. It is mutually + /// exclusive with connectionString, sasUri property. + /// + + /// The credential reference containing authentication information. + /// + public AzureTableStorageLinkedService(System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary parameters = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList annotations = default(System.Collections.Generic.IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string encryptedCredential = default(string), object serviceEndpoint = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { @@ -69,6 +76,8 @@ public AzureTableStorageLinkedService() this.SasUri = sasUri; this.SasToken = sasToken; this.EncryptedCredential = encryptedCredential; + this.ServiceEndpoint = serviceEndpoint; + this.Credential = credential; CustomInit(); } @@ -113,6 +122,20 @@ public AzureTableStorageLinkedService() /// [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public string EncryptedCredential {get; set; } + + /// + /// Gets or sets table service endpoint of the Azure Table Storage resource. It + /// is mutually exclusive with connectionString, sasUri property. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.serviceEndpoint")] + public object ServiceEndpoint {get; set; } + + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential {get; set; } /// /// Validate the object. /// @@ -133,6 +156,11 @@ public override void Validate() this.SasToken.Validate(); } + + if (this.Credential != null) + { + this.Credential.Validate(); + } } } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/AzureTableStorageLinkedServiceTypeProperties.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/AzureTableStorageLinkedServiceTypeProperties.cs new file mode 100644 index 000000000000..25d17b5801e2 --- /dev/null +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/AzureTableStorageLinkedServiceTypeProperties.cs @@ -0,0 +1,96 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is regenerated. + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using System.Linq; + + /// + /// Azure Table Storage linked service properties. + /// + public partial class AzureTableStorageLinkedServiceTypeProperties : AzureStorageLinkedServiceTypeProperties + { + /// + /// Initializes a new instance of the AzureTableStorageLinkedServiceTypeProperties class. + /// + public AzureTableStorageLinkedServiceTypeProperties() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AzureTableStorageLinkedServiceTypeProperties class. + /// + + /// The connection string. It is mutually exclusive with sasUri property. Type: + /// string, SecureString or AzureKeyVaultSecretReference. + /// + + /// The Azure key vault secret reference of accountKey in connection string. + /// + + /// SAS URI of the Azure Storage resource. It is mutually exclusive with + /// connectionString property. Type: string, SecureString or + /// AzureKeyVaultSecretReference. + /// + + /// The Azure key vault secret reference of sasToken in sas uri. + /// + + /// The encrypted credential used for authentication. Credentials are encrypted + /// using the integration runtime credential manager. Type: string. + /// + + /// Table service endpoint of the Azure Table Storage resource. It is mutually + /// exclusive with connectionString, sasUri property. + /// + + /// The credential reference containing authentication information. + /// + public AzureTableStorageLinkedServiceTypeProperties(object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string encryptedCredential = default(string), object serviceEndpoint = default(object), CredentialReference credential = default(CredentialReference)) + + : base(connectionString, accountKey, sasUri, sasToken, encryptedCredential) + { + this.ServiceEndpoint = serviceEndpoint; + this.Credential = credential; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + + /// + /// Gets or sets table service endpoint of the Azure Table Storage resource. It + /// is mutually exclusive with connectionString, sasUri property. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "serviceEndpoint")] + public object ServiceEndpoint {get; set; } + + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "credential")] + public CredentialReference Credential {get; set; } + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + + if (this.Credential != null) + { + this.Credential.Validate(); + } + } + } +} \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/CommonDataServiceForAppsLinkedService.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/CommonDataServiceForAppsLinkedService.cs index e1b3b3f8bfcb..c0d9927b66c2 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/CommonDataServiceForAppsLinkedService.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/CommonDataServiceForAppsLinkedService.cs @@ -72,7 +72,12 @@ public CommonDataServiceForAppsLinkedService() /// The authentication type to connect to Common Data Service for Apps server. /// 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. /// 'AADServicePrincipal' for Server-To-Server authentication in online - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: + /// string (or Expression with resultType string). + /// + + /// The Active Directory domain that will verify user credentials. Type: string + /// (or Expression with resultType string). /// /// User name to access the Common Data Service for Apps instance. Type: string @@ -104,7 +109,7 @@ public CommonDataServiceForAppsLinkedService() /// The encrypted credential used for authentication. Credentials are encrypted /// using the integration runtime credential manager. Type: string. /// - public CommonDataServiceForAppsLinkedService(object deploymentType, object authenticationType, System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary parameters = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList annotations = default(System.Collections.Generic.IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string)) + public CommonDataServiceForAppsLinkedService(object deploymentType, object authenticationType, System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary parameters = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList annotations = default(System.Collections.Generic.IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object domain = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string)) : base(additionalProperties, connectVia, description, parameters, annotations) { @@ -114,6 +119,7 @@ public CommonDataServiceForAppsLinkedService() this.ServiceUri = serviceUri; this.OrganizationName = organizationName; this.AuthenticationType = authenticationType; + this.Domain = domain; this.Username = username; this.Password = password; this.ServicePrincipalId = servicePrincipalId; @@ -175,11 +181,19 @@ public CommonDataServiceForAppsLinkedService() /// Gets or sets the authentication type to connect to Common Data Service for /// Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with /// Ifd scenario. 'AADServicePrincipal' for Server-To-Server authentication in - /// online scenario. Type: string (or Expression with resultType string). + /// online scenario, 'Active Directory' for Dynamics on-premises with IFD. + /// Type: string (or Expression with resultType string). /// [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.authenticationType")] public object AuthenticationType {get; set; } + /// + /// Gets or sets the Active Directory domain that will verify user credentials. + /// Type: string (or Expression with resultType string). + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.domain")] + public object Domain {get; set; } + /// /// Gets or sets user name to access the Common Data Service for Apps instance. /// Type: string (or Expression with resultType string). @@ -257,6 +271,7 @@ public override void Validate() + } } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/CommonDataServiceForAppsLinkedServiceTypeProperties.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/CommonDataServiceForAppsLinkedServiceTypeProperties.cs index 673570600fa9..f9f04eb8cdfc 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/CommonDataServiceForAppsLinkedServiceTypeProperties.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/CommonDataServiceForAppsLinkedServiceTypeProperties.cs @@ -54,7 +54,12 @@ public CommonDataServiceForAppsLinkedServiceTypeProperties() /// The authentication type to connect to Common Data Service for Apps server. /// 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. /// 'AADServicePrincipal' for Server-To-Server authentication in online - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: + /// string (or Expression with resultType string). + /// + + /// The Active Directory domain that will verify user credentials. Type: string + /// (or Expression with resultType string). /// /// User name to access the Common Data Service for Apps instance. Type: string @@ -86,7 +91,7 @@ public CommonDataServiceForAppsLinkedServiceTypeProperties() /// The encrypted credential used for authentication. Credentials are encrypted /// using the integration runtime credential manager. Type: string. /// - public CommonDataServiceForAppsLinkedServiceTypeProperties(object deploymentType, object authenticationType, object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string)) + public CommonDataServiceForAppsLinkedServiceTypeProperties(object deploymentType, object authenticationType, object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object domain = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string)) { this.DeploymentType = deploymentType; @@ -95,6 +100,7 @@ public CommonDataServiceForAppsLinkedServiceTypeProperties() this.ServiceUri = serviceUri; this.OrganizationName = organizationName; this.AuthenticationType = authenticationType; + this.Domain = domain; this.Username = username; this.Password = password; this.ServicePrincipalId = servicePrincipalId; @@ -156,11 +162,19 @@ public CommonDataServiceForAppsLinkedServiceTypeProperties() /// Gets or sets the authentication type to connect to Common Data Service for /// Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with /// Ifd scenario. 'AADServicePrincipal' for Server-To-Server authentication in - /// online scenario. Type: string (or Expression with resultType string). + /// online scenario, 'Active Directory' for Dynamics on-premises with IFD. + /// Type: string (or Expression with resultType string). /// [Newtonsoft.Json.JsonProperty(PropertyName = "authenticationType")] public object AuthenticationType {get; set; } + /// + /// Gets or sets the Active Directory domain that will verify user credentials. + /// Type: string (or Expression with resultType string). + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "domain")] + public object Domain {get; set; } + /// /// Gets or sets user name to access the Common Data Service for Apps instance. /// Type: string (or Expression with resultType string). @@ -237,6 +251,7 @@ public virtual void Validate() + } } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ContinuationSettingsReference.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ContinuationSettingsReference.cs new file mode 100644 index 000000000000..41bd9948a2b3 --- /dev/null +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ContinuationSettingsReference.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 System.Linq; + + /// + /// Continuation settings for execute data flow activity. + /// + public partial class ContinuationSettingsReference + { + /// + /// Initializes a new instance of the ContinuationSettingsReference class. + /// + public ContinuationSettingsReference() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ContinuationSettingsReference class. + /// + + /// Continuation TTL in minutes. + /// + + /// Idle condition. + /// + + /// Customized checkpoint key. + /// + public ContinuationSettingsReference(object continuationTtlInMinutes = default(object), object idleCondition = default(object), object customizedCheckpointKey = default(object)) + + { + this.ContinuationTtlInMinutes = continuationTtlInMinutes; + this.IdleCondition = idleCondition; + this.CustomizedCheckpointKey = customizedCheckpointKey; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + + /// + /// Gets or sets continuation TTL in minutes. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "continuationTtlInMinutes")] + public object ContinuationTtlInMinutes {get; set; } + + /// + /// Gets or sets idle condition. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "idleCondition")] + public object IdleCondition {get; set; } + + /// + /// Gets or sets customized checkpoint key. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "customizedCheckpointKey")] + public object CustomizedCheckpointKey {get; set; } + } +} \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsAuthenticationType.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsAuthenticationType.cs index 4706946b8d50..90f880e74511 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsAuthenticationType.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsAuthenticationType.cs @@ -16,5 +16,6 @@ public static class DynamicsAuthenticationType public const string Office365 = "Office365"; public const string Ifd = "Ifd"; public const string AADServicePrincipal = "AADServicePrincipal"; + public const string ActiveDirectory = "Active Directory"; } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsCrmLinkedService.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsCrmLinkedService.cs index 936388ff89d0..47d03f587f51 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsCrmLinkedService.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsCrmLinkedService.cs @@ -71,7 +71,12 @@ public DynamicsCrmLinkedService() /// The authentication type to connect to Dynamics CRM server. 'Office365' for /// online scenario, 'Ifd' for on-premises with Ifd scenario, /// 'AADServicePrincipal' for Server-To-Server authentication in online - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: + /// string (or Expression with resultType string). + /// + + /// The Active Directory domain that will verify user credentials. Type: string + /// (or Expression with resultType string). /// /// User name to access the Dynamics CRM instance. Type: string (or Expression @@ -106,7 +111,7 @@ public DynamicsCrmLinkedService() /// The encrypted credential used for authentication. Credentials are encrypted /// using the integration runtime credential manager. Type: string. /// - public DynamicsCrmLinkedService(object deploymentType, object authenticationType, System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary parameters = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList annotations = default(System.Collections.Generic.IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), CredentialReference credential = default(CredentialReference), string encryptedCredential = default(string)) + public DynamicsCrmLinkedService(object deploymentType, object authenticationType, System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary parameters = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList annotations = default(System.Collections.Generic.IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object domain = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), CredentialReference credential = default(CredentialReference), string encryptedCredential = default(string)) : base(additionalProperties, connectVia, description, parameters, annotations) { @@ -116,6 +121,7 @@ public DynamicsCrmLinkedService() this.ServiceUri = serviceUri; this.OrganizationName = organizationName; this.AuthenticationType = authenticationType; + this.Domain = domain; this.Username = username; this.Password = password; this.ServicePrincipalId = servicePrincipalId; @@ -177,11 +183,19 @@ public DynamicsCrmLinkedService() /// Gets or sets the authentication type to connect to Dynamics CRM server. /// 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, /// 'AADServicePrincipal' for Server-To-Server authentication in online - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: + /// string (or Expression with resultType string). /// [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.authenticationType")] public object AuthenticationType {get; set; } + /// + /// Gets or sets the Active Directory domain that will verify user credentials. + /// Type: string (or Expression with resultType string). + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.domain")] + public object Domain {get; set; } + /// /// Gets or sets user name to access the Dynamics CRM instance. Type: string /// (or Expression with resultType string). @@ -265,6 +279,7 @@ public override void Validate() + if (this.Credential != null) { this.Credential.Validate(); diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsCrmLinkedServiceTypeProperties.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsCrmLinkedServiceTypeProperties.cs index f00fe7f66a0b..f2cde2cdfc0e 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsCrmLinkedServiceTypeProperties.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsCrmLinkedServiceTypeProperties.cs @@ -53,7 +53,12 @@ public DynamicsCrmLinkedServiceTypeProperties() /// The authentication type to connect to Dynamics CRM server. 'Office365' for /// online scenario, 'Ifd' for on-premises with Ifd scenario, /// 'AADServicePrincipal' for Server-To-Server authentication in online - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: + /// string (or Expression with resultType string). + /// + + /// The Active Directory domain that will verify user credentials. Type: string + /// (or Expression with resultType string). /// /// User name to access the Dynamics CRM instance. Type: string (or Expression @@ -88,7 +93,7 @@ public DynamicsCrmLinkedServiceTypeProperties() /// The encrypted credential used for authentication. Credentials are encrypted /// using the integration runtime credential manager. Type: string. /// - public DynamicsCrmLinkedServiceTypeProperties(object deploymentType, object authenticationType, object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), CredentialReference credential = default(CredentialReference), string encryptedCredential = default(string)) + public DynamicsCrmLinkedServiceTypeProperties(object deploymentType, object authenticationType, object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object domain = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), CredentialReference credential = default(CredentialReference), string encryptedCredential = default(string)) { this.DeploymentType = deploymentType; @@ -97,6 +102,7 @@ public DynamicsCrmLinkedServiceTypeProperties() this.ServiceUri = serviceUri; this.OrganizationName = organizationName; this.AuthenticationType = authenticationType; + this.Domain = domain; this.Username = username; this.Password = password; this.ServicePrincipalId = servicePrincipalId; @@ -158,11 +164,19 @@ public DynamicsCrmLinkedServiceTypeProperties() /// Gets or sets the authentication type to connect to Dynamics CRM server. /// 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, /// 'AADServicePrincipal' for Server-To-Server authentication in online - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: + /// string (or Expression with resultType string). /// [Newtonsoft.Json.JsonProperty(PropertyName = "authenticationType")] public object AuthenticationType {get; set; } + /// + /// Gets or sets the Active Directory domain that will verify user credentials. + /// Type: string (or Expression with resultType string). + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "domain")] + public object Domain {get; set; } + /// /// Gets or sets user name to access the Dynamics CRM instance. Type: string /// (or Expression with resultType string). @@ -245,6 +259,7 @@ public virtual void Validate() + if (this.Credential != null) { this.Credential.Validate(); diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsLinkedService.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsLinkedService.cs index 7cf429d3571e..b9f51e18a576 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsLinkedService.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsLinkedService.cs @@ -71,7 +71,12 @@ public DynamicsLinkedService() /// The authentication type to connect to Dynamics server. 'Office365' for /// online scenario, 'Ifd' for on-premises with Ifd scenario, /// 'AADServicePrincipal' for Server-To-Server authentication in online - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: + /// string (or Expression with resultType string). + /// + + /// The Active Directory domain that will verify user credentials. Type: string + /// (or Expression with resultType string). /// /// User name to access the Dynamics instance. Type: string (or Expression with @@ -106,7 +111,7 @@ public DynamicsLinkedService() /// The credential reference containing authentication information. /// - public DynamicsLinkedService(object deploymentType, object authenticationType, System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary parameters = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList annotations = default(System.Collections.Generic.IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string), CredentialReference credential = default(CredentialReference)) + public DynamicsLinkedService(object deploymentType, object authenticationType, System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary parameters = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList annotations = default(System.Collections.Generic.IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object domain = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { @@ -116,6 +121,7 @@ public DynamicsLinkedService() this.ServiceUri = serviceUri; this.OrganizationName = organizationName; this.AuthenticationType = authenticationType; + this.Domain = domain; this.Username = username; this.Password = password; this.ServicePrincipalId = servicePrincipalId; @@ -177,11 +183,19 @@ public DynamicsLinkedService() /// Gets or sets the authentication type to connect to Dynamics server. /// 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, /// 'AADServicePrincipal' for Server-To-Server authentication in online - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: + /// string (or Expression with resultType string). /// [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.authenticationType")] public object AuthenticationType {get; set; } + /// + /// Gets or sets the Active Directory domain that will verify user credentials. + /// Type: string (or Expression with resultType string). + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.domain")] + public object Domain {get; set; } + /// /// Gets or sets user name to access the Dynamics instance. Type: string (or /// Expression with resultType string). @@ -266,6 +280,7 @@ public override void Validate() + if (this.Credential != null) { this.Credential.Validate(); diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsLinkedServiceTypeProperties.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsLinkedServiceTypeProperties.cs index e4fc5a63cc5a..9a01d8a5d296 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsLinkedServiceTypeProperties.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/DynamicsLinkedServiceTypeProperties.cs @@ -53,7 +53,12 @@ public DynamicsLinkedServiceTypeProperties() /// The authentication type to connect to Dynamics server. 'Office365' for /// online scenario, 'Ifd' for on-premises with Ifd scenario, /// 'AADServicePrincipal' for Server-To-Server authentication in online - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: + /// string (or Expression with resultType string). + /// + + /// The Active Directory domain that will verify user credentials. Type: string + /// (or Expression with resultType string). /// /// User name to access the Dynamics instance. Type: string (or Expression with @@ -88,7 +93,7 @@ public DynamicsLinkedServiceTypeProperties() /// The credential reference containing authentication information. /// - public DynamicsLinkedServiceTypeProperties(object deploymentType, object authenticationType, object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string), CredentialReference credential = default(CredentialReference)) + public DynamicsLinkedServiceTypeProperties(object deploymentType, object authenticationType, object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object domain = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), string encryptedCredential = default(string), CredentialReference credential = default(CredentialReference)) { this.DeploymentType = deploymentType; @@ -97,6 +102,7 @@ public DynamicsLinkedServiceTypeProperties() this.ServiceUri = serviceUri; this.OrganizationName = organizationName; this.AuthenticationType = authenticationType; + this.Domain = domain; this.Username = username; this.Password = password; this.ServicePrincipalId = servicePrincipalId; @@ -158,11 +164,19 @@ public DynamicsLinkedServiceTypeProperties() /// Gets or sets the authentication type to connect to Dynamics server. /// 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, /// 'AADServicePrincipal' for Server-To-Server authentication in online - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: + /// string (or Expression with resultType string). /// [Newtonsoft.Json.JsonProperty(PropertyName = "authenticationType")] public object AuthenticationType {get; set; } + /// + /// Gets or sets the Active Directory domain that will verify user credentials. + /// Type: string (or Expression with resultType string). + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "domain")] + public object Domain {get; set; } + /// /// Gets or sets user name to access the Dynamics instance. Type: string (or /// Expression with resultType string). @@ -246,6 +260,7 @@ public virtual void Validate() + if (this.Credential != null) { this.Credential.Validate(); diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteDataFlowActivity.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteDataFlowActivity.cs index bdefd1972a83..b4abe2875fa6 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteDataFlowActivity.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteDataFlowActivity.cs @@ -66,6 +66,9 @@ public ExecuteDataFlowActivity() /// The integration runtime reference. /// + /// Continuation settings for execute data flow activity. + /// + /// Compute properties for data flow activity. /// @@ -87,13 +90,14 @@ public ExecuteDataFlowActivity() /// Specify number of parallel staging for sources applicable to the sink. /// Type: integer (or Expression with resultType integer) /// - public ExecuteDataFlowActivity(string name, DataFlowReference dataFlow, System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), string description = default(string), string state = default(string), string onInactiveMarkAs = default(string), System.Collections.Generic.IList dependsOn = default(System.Collections.Generic.IList), System.Collections.Generic.IList userProperties = default(System.Collections.Generic.IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), object sourceStagingConcurrency = default(object)) + public ExecuteDataFlowActivity(string name, DataFlowReference dataFlow, System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), string description = default(string), string state = default(string), string onInactiveMarkAs = default(string), System.Collections.Generic.IList dependsOn = default(System.Collections.Generic.IList), System.Collections.Generic.IList userProperties = default(System.Collections.Generic.IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ContinuationSettingsReference continuationSettings = default(ContinuationSettingsReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), object sourceStagingConcurrency = default(object)) : base(name, additionalProperties, description, state, onInactiveMarkAs, dependsOn, userProperties, linkedServiceName, policy) { this.DataFlow = dataFlow; this.Staging = staging; this.IntegrationRuntime = integrationRuntime; + this.ContinuationSettings = continuationSettings; this.Compute = compute; this.TraceLevel = traceLevel; this.ContinueOnError = continueOnError; @@ -126,6 +130,12 @@ public ExecuteDataFlowActivity() [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.integrationRuntime")] public IntegrationRuntimeReference IntegrationRuntime {get; set; } + /// + /// Gets or sets continuation settings for execute data flow activity. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.continuationSettings")] + public ContinuationSettingsReference ContinuationSettings {get; set; } + /// /// Gets or sets compute properties for data flow activity. /// @@ -192,6 +202,7 @@ public override void Validate() + } } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteDataFlowActivityTypeProperties.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteDataFlowActivityTypeProperties.cs index 054ce1a68b82..8b6f75cdea0d 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteDataFlowActivityTypeProperties.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteDataFlowActivityTypeProperties.cs @@ -34,6 +34,9 @@ public ExecuteDataFlowActivityTypeProperties() /// The integration runtime reference. /// + /// Continuation settings for execute data flow activity. + /// + /// Compute properties for data flow activity. /// @@ -55,12 +58,13 @@ public ExecuteDataFlowActivityTypeProperties() /// Specify number of parallel staging for sources applicable to the sink. /// Type: integer (or Expression with resultType integer) /// - public ExecuteDataFlowActivityTypeProperties(DataFlowReference dataFlow, DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), object sourceStagingConcurrency = default(object)) + public ExecuteDataFlowActivityTypeProperties(DataFlowReference dataFlow, DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ContinuationSettingsReference continuationSettings = default(ContinuationSettingsReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), object sourceStagingConcurrency = default(object)) { this.DataFlow = dataFlow; this.Staging = staging; this.IntegrationRuntime = integrationRuntime; + this.ContinuationSettings = continuationSettings; this.Compute = compute; this.TraceLevel = traceLevel; this.ContinueOnError = continueOnError; @@ -93,6 +97,12 @@ public ExecuteDataFlowActivityTypeProperties() [Newtonsoft.Json.JsonProperty(PropertyName = "integrationRuntime")] public IntegrationRuntimeReference IntegrationRuntime {get; set; } + /// + /// Gets or sets continuation settings for execute data flow activity. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "continuationSettings")] + public ContinuationSettingsReference ContinuationSettings {get; set; } + /// /// Gets or sets compute properties for data flow activity. /// @@ -158,6 +168,7 @@ public virtual void Validate() + } } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecutePowerQueryActivityTypeProperties.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecutePowerQueryActivityTypeProperties.cs index eaeb914e85e4..3533136b3210 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecutePowerQueryActivityTypeProperties.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecutePowerQueryActivityTypeProperties.cs @@ -34,6 +34,9 @@ public ExecutePowerQueryActivityTypeProperties() /// The integration runtime reference. /// + /// Continuation settings for execute data flow activity. + /// + /// Compute properties for data flow activity. /// @@ -62,9 +65,9 @@ public ExecutePowerQueryActivityTypeProperties() /// List of mapping for Power Query mashup query to sink dataset(s). /// - public ExecutePowerQueryActivityTypeProperties(DataFlowReference dataFlow, DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), object sourceStagingConcurrency = default(object), System.Collections.Generic.IDictionary sinks = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList queries = default(System.Collections.Generic.IList)) + public ExecutePowerQueryActivityTypeProperties(DataFlowReference dataFlow, DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ContinuationSettingsReference continuationSettings = default(ContinuationSettingsReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), object sourceStagingConcurrency = default(object), System.Collections.Generic.IDictionary sinks = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList queries = default(System.Collections.Generic.IList)) - : base(dataFlow, staging, integrationRuntime, compute, traceLevel, continueOnError, runConcurrently, sourceStagingConcurrency) + : base(dataFlow, staging, integrationRuntime, continuationSettings, compute, traceLevel, continueOnError, runConcurrently, sourceStagingConcurrency) { this.Sinks = sinks; this.Queries = queries; diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteWranglingDataflowActivity.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteWranglingDataflowActivity.cs index f534881dc692..01c2742d07c1 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteWranglingDataflowActivity.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/ExecuteWranglingDataflowActivity.cs @@ -63,6 +63,9 @@ public ExecuteWranglingDataflowActivity() /// The integration runtime reference. /// + /// Continuation settings for execute data flow activity. + /// + /// Compute properties for data flow activity. /// @@ -91,7 +94,7 @@ public ExecuteWranglingDataflowActivity() /// List of mapping for Power Query mashup query to sink dataset(s). /// - public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), string description = default(string), string state = default(string), string onInactiveMarkAs = default(string), System.Collections.Generic.IList dependsOn = default(System.Collections.Generic.IList), System.Collections.Generic.IList userProperties = default(System.Collections.Generic.IList), ActivityPolicy policy = default(ActivityPolicy), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), object sourceStagingConcurrency = default(object), System.Collections.Generic.IDictionary sinks = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList queries = default(System.Collections.Generic.IList)) + public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), string description = default(string), string state = default(string), string onInactiveMarkAs = default(string), System.Collections.Generic.IList dependsOn = default(System.Collections.Generic.IList), System.Collections.Generic.IList userProperties = default(System.Collections.Generic.IList), ActivityPolicy policy = default(ActivityPolicy), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ContinuationSettingsReference continuationSettings = default(ContinuationSettingsReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), object sourceStagingConcurrency = default(object), System.Collections.Generic.IDictionary sinks = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList queries = default(System.Collections.Generic.IList)) : base(name, additionalProperties, description, state, onInactiveMarkAs, dependsOn, userProperties) { @@ -99,6 +102,7 @@ public ExecuteWranglingDataflowActivity() this.DataFlow = dataFlow; this.Staging = staging; this.IntegrationRuntime = integrationRuntime; + this.ContinuationSettings = continuationSettings; this.Compute = compute; this.TraceLevel = traceLevel; this.ContinueOnError = continueOnError; @@ -139,6 +143,12 @@ public ExecuteWranglingDataflowActivity() [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.integrationRuntime")] public IntegrationRuntimeReference IntegrationRuntime {get; set; } + /// + /// Gets or sets continuation settings for execute data flow activity. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.continuationSettings")] + public ContinuationSettingsReference ContinuationSettings {get; set; } + /// /// Gets or sets compute properties for data flow activity. /// @@ -223,6 +233,7 @@ public override void Validate() + if (this.Sinks != null) { foreach (var valueElement in this.Sinks.Values) diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SnowflakeExportCopyCommand.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SnowflakeExportCopyCommand.cs index 2b719da84031..7dac36ea7ff1 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SnowflakeExportCopyCommand.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SnowflakeExportCopyCommand.cs @@ -36,11 +36,16 @@ public SnowflakeExportCopyCommand() /// resultType object). Example: "additionalFormatOptions": { "OVERWRITE": /// "TRUE", "MAX_FILE_SIZE": "'FALSE'" } /// - public SnowflakeExportCopyCommand(System.Collections.Generic.IDictionary additionalCopyOptions = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IDictionary additionalFormatOptions = default(System.Collections.Generic.IDictionary)) + + /// The name of the snowflake storage integration to use for the copy + /// operation. Type: string (or Expression with resultType string). + /// + public SnowflakeExportCopyCommand(System.Collections.Generic.IDictionary additionalCopyOptions = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IDictionary additionalFormatOptions = default(System.Collections.Generic.IDictionary), object storageIntegration = default(object)) { this.AdditionalCopyOptions = additionalCopyOptions; this.AdditionalFormatOptions = additionalFormatOptions; + this.StorageIntegration = storageIntegration; CustomInit(); } @@ -67,5 +72,12 @@ public SnowflakeExportCopyCommand() /// [Newtonsoft.Json.JsonProperty(PropertyName = "additionalFormatOptions")] public System.Collections.Generic.IDictionary AdditionalFormatOptions {get; set; } + + /// + /// Gets or sets the name of the snowflake storage integration to use for the + /// copy operation. Type: string (or Expression with resultType string). + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "storageIntegration")] + public object StorageIntegration {get; set; } } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SnowflakeImportCopyCommand.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SnowflakeImportCopyCommand.cs index 359ecbd173d0..de5f5c3cd922 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SnowflakeImportCopyCommand.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SnowflakeImportCopyCommand.cs @@ -36,11 +36,16 @@ public SnowflakeImportCopyCommand() /// resultType object). Example: "additionalFormatOptions": { "FORCE": "TRUE", /// "LOAD_UNCERTAIN_FILES": "'FALSE'" } /// - public SnowflakeImportCopyCommand(System.Collections.Generic.IDictionary additionalCopyOptions = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IDictionary additionalFormatOptions = default(System.Collections.Generic.IDictionary)) + + /// The name of the snowflake storage integration to use for the copy + /// operation. Type: string (or Expression with resultType string). + /// + public SnowflakeImportCopyCommand(System.Collections.Generic.IDictionary additionalCopyOptions = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IDictionary additionalFormatOptions = default(System.Collections.Generic.IDictionary), object storageIntegration = default(object)) { this.AdditionalCopyOptions = additionalCopyOptions; this.AdditionalFormatOptions = additionalFormatOptions; + this.StorageIntegration = storageIntegration; CustomInit(); } @@ -67,5 +72,12 @@ public SnowflakeImportCopyCommand() /// [Newtonsoft.Json.JsonProperty(PropertyName = "additionalFormatOptions")] public System.Collections.Generic.IDictionary AdditionalFormatOptions {get; set; } + + /// + /// Gets or sets the name of the snowflake storage integration to use for the + /// copy operation. Type: string (or Expression with resultType string). + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "storageIntegration")] + public object StorageIntegration {get; set; } } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerAuthenticationType.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerAuthenticationType.cs index 93c9a580027f..a5ffe412fc1b 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerAuthenticationType.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerAuthenticationType.cs @@ -15,5 +15,6 @@ public static class SqlServerAuthenticationType { public const string SQL = "SQL"; public const string Windows = "Windows"; + public const string UserAssignedManagedIdentity = "UserAssignedManagedIdentity"; } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerLinkedService.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerLinkedService.cs index fe1f6a8f0355..fd2a0c5e7916 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerLinkedService.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerLinkedService.cs @@ -148,7 +148,7 @@ public SqlServerLinkedService() /// /// The type used for authentication. Type: string. - /// Possible values include: 'SQL', 'Windows' + /// Possible values include: 'SQL', 'Windows', 'UserAssignedManagedIdentity' /// The on-premises Windows authentication user name. Type: string (or /// Expression with resultType string). @@ -163,7 +163,10 @@ public SqlServerLinkedService() /// Sql always encrypted properties. /// - public SqlServerLinkedService(System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary parameters = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList annotations = default(System.Collections.Generic.IList), object server = default(object), object database = default(object), object encrypt = default(object), object trustServerCertificate = default(object), object hostNameInCertificate = default(object), object applicationIntent = default(object), object connectTimeout = default(object), object connectRetryCount = default(object), object connectRetryInterval = default(object), object loadBalanceTimeout = default(object), object commandTimeout = default(object), object integratedSecurity = default(object), object failoverPartner = default(object), object maxPoolSize = default(object), object minPoolSize = default(object), object multipleActiveResultSets = default(object), object multiSubnetFailover = default(object), object packetSize = default(object), object pooling = default(object), object connectionString = default(object), string authenticationType = default(string), object userName = default(object), SecretBase password = default(SecretBase), string encryptedCredential = default(string), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties)) + + /// The credential reference containing authentication information. + /// + public SqlServerLinkedService(System.Collections.Generic.IDictionary additionalProperties = default(System.Collections.Generic.IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), System.Collections.Generic.IDictionary parameters = default(System.Collections.Generic.IDictionary), System.Collections.Generic.IList annotations = default(System.Collections.Generic.IList), object server = default(object), object database = default(object), object encrypt = default(object), object trustServerCertificate = default(object), object hostNameInCertificate = default(object), object applicationIntent = default(object), object connectTimeout = default(object), object connectRetryCount = default(object), object connectRetryInterval = default(object), object loadBalanceTimeout = default(object), object commandTimeout = default(object), object integratedSecurity = default(object), object failoverPartner = default(object), object maxPoolSize = default(object), object minPoolSize = default(object), object multipleActiveResultSets = default(object), object multiSubnetFailover = default(object), object packetSize = default(object), object pooling = default(object), object connectionString = default(object), string authenticationType = default(string), object userName = default(object), SecretBase password = default(SecretBase), string encryptedCredential = default(string), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { @@ -192,6 +195,7 @@ public SqlServerLinkedService() this.Password = password; this.EncryptedCredential = encryptedCredential; this.AlwaysEncryptedSettings = alwaysEncryptedSettings; + this.Credential = credential; CustomInit(); } @@ -369,7 +373,7 @@ public SqlServerLinkedService() public object ConnectionString {get; set; } /// - /// Gets or sets the type used for authentication. Type: string. Possible values include: 'SQL', 'Windows' + /// Gets or sets the type used for authentication. Type: string. Possible values include: 'SQL', 'Windows', 'UserAssignedManagedIdentity' /// [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.authenticationType")] public string AuthenticationType {get; set; } @@ -400,6 +404,13 @@ public SqlServerLinkedService() /// [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.alwaysEncryptedSettings")] public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings {get; set; } + + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential {get; set; } /// /// Validate the object. /// @@ -437,6 +448,10 @@ public override void Validate() { this.AlwaysEncryptedSettings.Validate(); } + if (this.Credential != null) + { + this.Credential.Validate(); + } } } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerLinkedServiceTypeProperties.cs b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerLinkedServiceTypeProperties.cs index ca5e974694fd..28e4ea2df173 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerLinkedServiceTypeProperties.cs +++ b/src/DataFactory/DataFactory.Management.Sdk/Generated/Models/SqlServerLinkedServiceTypeProperties.cs @@ -130,7 +130,7 @@ public SqlServerLinkedServiceTypeProperties() /// /// The type used for authentication. Type: string. - /// Possible values include: 'SQL', 'Windows' + /// Possible values include: 'SQL', 'Windows', 'UserAssignedManagedIdentity' /// The on-premises Windows authentication user name. Type: string (or /// Expression with resultType string). @@ -145,7 +145,10 @@ public SqlServerLinkedServiceTypeProperties() /// Sql always encrypted properties. /// - public SqlServerLinkedServiceTypeProperties(object server = default(object), object database = default(object), object encrypt = default(object), object trustServerCertificate = default(object), object hostNameInCertificate = default(object), object applicationIntent = default(object), object connectTimeout = default(object), object connectRetryCount = default(object), object connectRetryInterval = default(object), object loadBalanceTimeout = default(object), object commandTimeout = default(object), object integratedSecurity = default(object), object failoverPartner = default(object), object maxPoolSize = default(object), object minPoolSize = default(object), object multipleActiveResultSets = default(object), object multiSubnetFailover = default(object), object packetSize = default(object), object pooling = default(object), object connectionString = default(object), string authenticationType = default(string), object userName = default(object), SecretBase password = default(SecretBase), string encryptedCredential = default(string), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties)) + + /// The credential reference containing authentication information. + /// + public SqlServerLinkedServiceTypeProperties(object server = default(object), object database = default(object), object encrypt = default(object), object trustServerCertificate = default(object), object hostNameInCertificate = default(object), object applicationIntent = default(object), object connectTimeout = default(object), object connectRetryCount = default(object), object connectRetryInterval = default(object), object loadBalanceTimeout = default(object), object commandTimeout = default(object), object integratedSecurity = default(object), object failoverPartner = default(object), object maxPoolSize = default(object), object minPoolSize = default(object), object multipleActiveResultSets = default(object), object multiSubnetFailover = default(object), object packetSize = default(object), object pooling = default(object), object connectionString = default(object), string authenticationType = default(string), object userName = default(object), SecretBase password = default(SecretBase), string encryptedCredential = default(string), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties), CredentialReference credential = default(CredentialReference)) : base(server, database, encrypt, trustServerCertificate, hostNameInCertificate, applicationIntent, connectTimeout, connectRetryCount, connectRetryInterval, loadBalanceTimeout, commandTimeout, integratedSecurity, failoverPartner, maxPoolSize, minPoolSize, multipleActiveResultSets, multiSubnetFailover, packetSize, pooling) { @@ -155,6 +158,7 @@ public SqlServerLinkedServiceTypeProperties() this.Password = password; this.EncryptedCredential = encryptedCredential; this.AlwaysEncryptedSettings = alwaysEncryptedSettings; + this.Credential = credential; CustomInit(); } @@ -172,7 +176,7 @@ public SqlServerLinkedServiceTypeProperties() public object ConnectionString {get; set; } /// - /// Gets or sets the type used for authentication. Type: string. Possible values include: 'SQL', 'Windows' + /// Gets or sets the type used for authentication. Type: string. Possible values include: 'SQL', 'Windows', 'UserAssignedManagedIdentity' /// [Newtonsoft.Json.JsonProperty(PropertyName = "authenticationType")] public string AuthenticationType {get; set; } @@ -203,6 +207,13 @@ public SqlServerLinkedServiceTypeProperties() /// [Newtonsoft.Json.JsonProperty(PropertyName = "alwaysEncryptedSettings")] public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings {get; set; } + + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [Newtonsoft.Json.JsonProperty(PropertyName = "credential")] + public CredentialReference Credential {get; set; } /// /// Validate the object. /// @@ -220,6 +231,10 @@ public virtual void Validate() { this.AlwaysEncryptedSettings.Validate(); } + if (this.Credential != null) + { + this.Credential.Validate(); + } } } } \ No newline at end of file diff --git a/src/DataFactory/DataFactory.Management.Sdk/README.md b/src/DataFactory/DataFactory.Management.Sdk/README.md index 87a0d495a053..3e3ee4d89560 100644 --- a/src/DataFactory/DataFactory.Management.Sdk/README.md +++ b/src/DataFactory/DataFactory.Management.Sdk/README.md @@ -23,7 +23,7 @@ payload-flattening-threshold: 2 ### ``` yaml -commit: bc06df2282fe4d29f42dce56a930fac14ea0f6c4 +commit: 6c18ee7ed8e7c0ca87d48224dd20d4b065f2ba3d require: https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/datafactory/resource-manager/readme.md output-folder: Generated diff --git a/src/DataFactory/DataFactory/ChangeLog.md b/src/DataFactory/DataFactory/ChangeLog.md index c0070ebad7af..e4745e51856d 100644 --- a/src/DataFactory/DataFactory/ChangeLog.md +++ b/src/DataFactory/DataFactory/ChangeLog.md @@ -18,6 +18,10 @@ - Additional information about change #1 --> ## Upcoming Release +* Added security enhancement feature snowflake support storage integration. +* Supported 'domain' Property In Dynamics Family. +* Enabled UAMI auth for Data Factory Sql Server connector. +* Supported managed identity for Data Factory Azure Table connector. ## Version 1.18.5 * Added UAMI in DynamicsCrm LinkedService