diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzPowerShellSetup.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzPowerShellSetup.cs new file mode 100644 index 000000000000..026165f6ba8b --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzPowerShellSetup.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 Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Linq; + + /// + /// The express custom setup of installing Azure PowerShell. + /// + [Rest.Serialization.JsonTransformation] + public partial class AzPowerShellSetup : CustomSetupBase + { + /// + /// Initializes a new instance of the AzPowerShellSetup class. + /// + public AzPowerShellSetup() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AzPowerShellSetup class. + /// + /// The required version of Azure PowerShell to + /// install. + public AzPowerShellSetup(string version) + { + Version = version; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the required version of Azure PowerShell to install. + /// + [JsonProperty(PropertyName = "typeProperties.version")] + public string Version { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Version == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Version"); + } + } + } +} 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 d28f610d2576..53371190e54d 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 @@ -57,11 +57,16 @@ public AzureBlobFSLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public 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 encryptedCredential = default(object)) + 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)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -69,6 +74,7 @@ public AzureBlobFSLinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -115,6 +121,16 @@ public AzureBlobFSLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs index 54ef46f23082..3d4447bf2d46 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 @@ -66,11 +66,16 @@ public AzureBlobStorageLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), string encryptedCredential = default(string)) + 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 encryptedCredential = default(string)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -81,6 +86,7 @@ public AzureBlobStorageLinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -151,6 +157,16 @@ public AzureBlobStorageLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs index bd50b5a3e1c9..007781598e44 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 @@ -54,6 +54,11 @@ public AzureDataLakeStoreLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// Data Lake Store account name. Type: /// string (or Expression with resultType string). /// Data Lake Store account subscription @@ -66,13 +71,14 @@ 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 accountName = default(object), object subscriptionId = default(object), object resourceGroupName = default(object), object encryptedCredential = default(object)) + 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)) : base(additionalProperties, connectVia, description, parameters, annotations) { DataLakeStoreUri = dataLakeStoreUri; ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; AccountName = accountName; SubscriptionId = subscriptionId; ResourceGroupName = resourceGroupName; @@ -115,6 +121,16 @@ public AzureDataLakeStoreLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets data Lake Store account name. Type: string (or /// Expression with resultType string). 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 1ac3e9ad74f8..76f63b301128 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 @@ -83,6 +83,9 @@ public AzureDatabricksLinkedService() /// Additional tags for cluster /// resources. This property is ignored in instance pool /// configurations. + /// Specify a location to + /// deliver Spark driver, worker, and event logs. Type: string (or + /// Expression with resultType string). /// The driver node type for the /// new job cluster. This property is ignored in instance pool /// configurations. Type: string (or Expression with resultType @@ -99,7 +102,7 @@ public AzureDatabricksLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureDatabricksLinkedService(object domain, SecretBase accessToken, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), 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 newClusterDriverNodeType = default(object), object newClusterInitScripts = default(object), object newClusterEnableElasticDisk = default(object), object encryptedCredential = default(object)) + public AzureDatabricksLinkedService(object domain, SecretBase accessToken, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), 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)) : base(additionalProperties, connectVia, description, parameters, annotations) { Domain = domain; @@ -112,6 +115,7 @@ public AzureDatabricksLinkedService() NewClusterSparkConf = newClusterSparkConf; NewClusterSparkEnvVars = newClusterSparkEnvVars; NewClusterCustomTags = newClusterCustomTags; + NewClusterLogDestination = newClusterLogDestination; NewClusterDriverNodeType = newClusterDriverNodeType; NewClusterInitScripts = newClusterInitScripts; NewClusterEnableElasticDisk = newClusterEnableElasticDisk; @@ -209,6 +213,14 @@ public AzureDatabricksLinkedService() [JsonProperty(PropertyName = "typeProperties.newClusterCustomTags")] public IDictionary NewClusterCustomTags { get; set; } + /// + /// Gets or sets specify a location to deliver Spark driver, worker, + /// and event logs. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.newClusterLogDestination")] + public object NewClusterLogDestination { get; set; } + /// /// Gets or sets the driver node type for the new job cluster. This /// property is ignored in instance pool configurations. Type: string diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageLinkedService.cs index e7038753e6b4..a2448b59ddf5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageLinkedService.cs @@ -62,11 +62,13 @@ public AzureFileStorageLinkedService() /// The azure file share name. It is required /// when auth with accountKey/sasToken. Type: string (or Expression /// with resultType string). + /// The azure file share snapshot version. Type: + /// string (or Expression with resultType string). /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureFileStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object host = default(object), object userId = default(object), SecretBase password = default(SecretBase), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), object fileShare = default(object), object encryptedCredential = default(object)) + public AzureFileStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object host = default(object), object userId = default(object), SecretBase password = default(SecretBase), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), object fileShare = default(object), object snapshot = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Host = host; @@ -77,6 +79,7 @@ public AzureFileStorageLinkedService() SasUri = sasUri; SasToken = sasToken; FileShare = fileShare; + Snapshot = snapshot; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -144,6 +147,13 @@ public AzureFileStorageLinkedService() [JsonProperty(PropertyName = "typeProperties.fileShare")] public object FileShare { get; set; } + /// + /// Gets or sets the azure file share snapshot version. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.snapshot")] + public object Snapshot { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs index cf1d5a0721c6..b6a653a0227c 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 @@ -55,11 +55,16 @@ public AzureSqlDWLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureSqlDWLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + 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)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -67,6 +72,7 @@ public AzureSqlDWLinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -114,6 +120,16 @@ public AzureSqlDWLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs index 042fedfb87fa..adf8fc049fcc 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 @@ -56,11 +56,16 @@ public AzureSqlDatabaseLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureSqlDatabaseLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + 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)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -68,6 +73,7 @@ public AzureSqlDatabaseLinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -114,6 +120,16 @@ public AzureSqlDatabaseLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs index 9c2188e31085..c3f7e2891d9c 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 @@ -54,11 +54,16 @@ public AzureSqlMILinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public 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 encryptedCredential = default(object)) + 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)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -66,6 +71,7 @@ public AzureSqlMILinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -112,6 +118,16 @@ public AzureSqlMILinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowStagingInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowStagingInfo.cs index b77877ea33a0..67e7c7e5fd5d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowStagingInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowStagingInfo.cs @@ -31,8 +31,9 @@ public DataFlowStagingInfo() /// /// Staging linked service /// reference. - /// Folder path for staging blob. - public DataFlowStagingInfo(LinkedServiceReference linkedService = default(LinkedServiceReference), string folderPath = default(string)) + /// Folder path for staging blob. Type: string + /// (or Expression with resultType string) + public DataFlowStagingInfo(LinkedServiceReference linkedService = default(LinkedServiceReference), object folderPath = default(object)) { LinkedService = linkedService; FolderPath = folderPath; @@ -51,10 +52,11 @@ public DataFlowStagingInfo() public LinkedServiceReference LinkedService { get; set; } /// - /// Gets or sets folder path for staging blob. + /// Gets or sets folder path for staging blob. Type: string (or + /// Expression with resultType string) /// [JsonProperty(PropertyName = "folderPath")] - public string FolderPath { get; set; } + public object FolderPath { get; set; } /// /// Validate the object. diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataLinkedService.cs index 6c12d34d0386..35aef57a1c51 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataLinkedService.cs @@ -57,6 +57,11 @@ public ODataLinkedService() /// Specify the application id of your /// application registered in Azure Active Directory. Type: string (or /// Expression with resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// Specify the resource you are requesting /// authorization to use Directory. Type: string (or Expression with /// resultType string). @@ -79,7 +84,7 @@ public ODataLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public ODataLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), string authenticationType = default(string), object userName = default(object), SecretBase password = default(SecretBase), object tenant = default(object), object servicePrincipalId = default(object), object aadResourceId = default(object), string aadServicePrincipalCredentialType = default(string), SecretBase servicePrincipalKey = default(SecretBase), SecretBase servicePrincipalEmbeddedCert = default(SecretBase), SecretBase servicePrincipalEmbeddedCertPassword = default(SecretBase), object encryptedCredential = default(object)) + public ODataLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), string authenticationType = default(string), object userName = default(object), SecretBase password = default(SecretBase), object tenant = default(object), object servicePrincipalId = default(object), object azureCloudType = default(object), object aadResourceId = default(object), string aadServicePrincipalCredentialType = default(string), SecretBase servicePrincipalKey = default(SecretBase), SecretBase servicePrincipalEmbeddedCert = default(SecretBase), SecretBase servicePrincipalEmbeddedCertPassword = default(SecretBase), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -88,6 +93,7 @@ public ODataLinkedService() Password = password; Tenant = tenant; ServicePrincipalId = servicePrincipalId; + AzureCloudType = azureCloudType; AadResourceId = aadResourceId; AadServicePrincipalCredentialType = aadServicePrincipalCredentialType; ServicePrincipalKey = servicePrincipalKey; @@ -146,6 +152,16 @@ public ODataLinkedService() [JsonProperty(PropertyName = "typeProperties.servicePrincipalId")] public object ServicePrincipalId { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets specify the resource you are requesting authorization /// to use Directory. Type: string (or Expression with resultType 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 94f43d799dbd..ef7a9bf8a1bd 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 @@ -61,13 +61,18 @@ public RestServiceLinkedService() /// The tenant information (domain name or tenant /// ID) used in AadServicePrincipal authentication type under which /// your application resides. + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// The resource you are requesting /// authorization to use. /// The encrypted credential used for /// 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 servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object aadResourceId = default(object), object encryptedCredential = default(object)) + 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 servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object aadResourceId = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -78,6 +83,7 @@ public RestServiceLinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; AadResourceId = aadResourceId; EncryptedCredential = encryptedCredential; CustomInit(); @@ -144,6 +150,16 @@ public RestServiceLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets the resource you are requesting authorization to use. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestSink.cs new file mode 100644 index 000000000000..eb28aa93e384 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestSink.cs @@ -0,0 +1,135 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// A copy activity Rest service Sink. + /// + public partial class RestSink : CopySink + { + /// + /// Initializes a new instance of the RestSink class. + /// + public RestSink() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the RestSink class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Write batch size. Type: integer (or + /// Expression with resultType integer), minimum: 0. + /// Write batch timeout. Type: string + /// (or Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Sink retry count. Type: integer (or + /// Expression with resultType integer). + /// Sink retry wait. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// The maximum concurrent + /// connection count for the sink data store. Type: integer (or + /// Expression with resultType integer). + /// The HTTP method used to call the + /// RESTful API. The default is POST. Type: string (or Expression with + /// resultType string). + /// The additional HTTP headers in the + /// request to the RESTful API. Type: string (or Expression with + /// resultType string). + /// The timeout (TimeSpan) to get an + /// HTTP response. It is the timeout to get a response, not the timeout + /// to read response data. Default value: 00:01:40. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// The time to await before sending next + /// request, in milliseconds + /// Compression Type to Send data in + /// compressed format with Optimal Compression Level, Default is None. + /// And The Only Supported option is Gzip. + /// Wraps Request Array Json + /// into an Object before calling the rest endpoint , Default is false. + /// ex: if true request content sample format is { rows:[]} else the + /// format is [] + public RestSink(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 requestMethod = default(object), object additionalHeaders = default(object), object httpRequestTimeout = default(object), object requestInterval = default(object), object compressionType = default(object), object wrapRequestJsonInAnObject = default(object)) + : base(additionalProperties, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections) + { + RequestMethod = requestMethod; + AdditionalHeaders = additionalHeaders; + HttpRequestTimeout = httpRequestTimeout; + RequestInterval = requestInterval; + CompressionType = compressionType; + WrapRequestJsonInAnObject = wrapRequestJsonInAnObject; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the HTTP method used to call the RESTful API. The + /// default is POST. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "requestMethod")] + public object RequestMethod { get; set; } + + /// + /// Gets or sets the additional HTTP headers in the request to the + /// RESTful API. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "additionalHeaders")] + public object AdditionalHeaders { get; set; } + + /// + /// Gets or sets the timeout (TimeSpan) to get an HTTP response. It is + /// the timeout to get a response, not the timeout to read response + /// data. Default value: 00:01:40. Type: string (or Expression with + /// resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// + [JsonProperty(PropertyName = "httpRequestTimeout")] + public object HttpRequestTimeout { get; set; } + + /// + /// Gets or sets the time to await before sending next request, in + /// milliseconds + /// + [JsonProperty(PropertyName = "requestInterval")] + public object RequestInterval { get; set; } + + /// + /// Gets or sets compression Type to Send data in compressed format + /// with Optimal Compression Level, Default is None. And The Only + /// Supported option is Gzip. + /// + [JsonProperty(PropertyName = "compressionType")] + public object CompressionType { get; set; } + + /// + /// Gets or sets wraps Request Array Json into an Object before calling + /// the rest endpoint , Default is false. ex: if true request content + /// sample format is { rows:[]} else the format is [] + /// + [JsonProperty(PropertyName = "wrapRequestJsonInAnObject")] + public object WrapRequestJsonInAnObject { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs similarity index 100% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs index a1c453f7fb67..b31348b3961b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs @@ -37,16 +37,5 @@ public static IEnumerable> ApiInfo_DataFactoryMana }.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=C:\\Users\\rizh\\Documents\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "09ac2b33d780dbf2f74de2083012f62aaa33c451"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -