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 ec81f0322ca5..ef79d222a831 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 @@ -68,7 +68,19 @@ public AzureBlobFSLinkedService() /// resultType string). /// The credential reference containing /// authentication information. - public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) + /// The service principal + /// credential type to use in Server-To-Server authentication. + /// 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for + /// certificate. Type: string (or Expression with resultType + /// string). + /// The credential of the + /// service principal object in Azure Active Directory. If + /// servicePrincipalCredentialType is 'ServicePrincipalKey', + /// servicePrincipalCredential can be SecureString or + /// AzureKeyVaultSecretReference. If servicePrincipalCredentialType is + /// 'ServicePrincipalCert', servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. + public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -79,6 +91,8 @@ public AzureBlobFSLinkedService() AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; Credential = credential; + ServicePrincipalCredentialType = servicePrincipalCredentialType; + ServicePrincipalCredential = servicePrincipalCredential; CustomInit(); } @@ -149,6 +163,27 @@ public AzureBlobFSLinkedService() [JsonProperty(PropertyName = "typeProperties.credential")] public CredentialReference Credential { get; set; } + /// + /// Gets or sets the service principal credential type to use in + /// Server-To-Server authentication. 'ServicePrincipalKey' for + /// key/secret, 'ServicePrincipalCert' for certificate. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredentialType")] + public object ServicePrincipalCredentialType { get; set; } + + /// + /// Gets or sets the credential of the service principal object in + /// Azure Active Directory. If servicePrincipalCredentialType is + /// 'ServicePrincipalKey', servicePrincipalCredential can be + /// SecureString or AzureKeyVaultSecretReference. If + /// servicePrincipalCredentialType is 'ServicePrincipalCert', + /// servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredential")] + public SecretBase ServicePrincipalCredential { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs index ec88ac66a5ac..a88260a18eb3 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs @@ -58,13 +58,20 @@ public AzureDatabricksDeltaLakeLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureDatabricksDeltaLakeLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object clusterId = default(object), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + /// Workspace resource id for + /// databricks REST API. Type: string (or Expression with resultType + /// string). + public AzureDatabricksDeltaLakeLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object clusterId = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object workspaceResourceId = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Domain = domain; AccessToken = accessToken; ClusterId = clusterId; EncryptedCredential = encryptedCredential; + Credential = credential; + WorkspaceResourceId = workspaceResourceId; CustomInit(); } @@ -105,6 +112,20 @@ public AzureDatabricksDeltaLakeLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + + /// + /// Gets or sets workspace resource id for databricks REST API. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.workspaceResourceId")] + public object WorkspaceResourceId { get; set; } + /// /// Validate the object. /// @@ -118,6 +139,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Domain"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs index 0ae5ab29f54c..8536e1707798 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs @@ -83,7 +83,9 @@ public CosmosDbLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public CosmosDbLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object accountEndpoint = default(object), object database = default(object), SecretBase accountKey = default(SecretBase), object servicePrincipalId = default(object), string servicePrincipalCredentialType = default(string), SecretBase servicePrincipalCredential = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string connectionMode = default(string), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public CosmosDbLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object accountEndpoint = default(object), object database = default(object), SecretBase accountKey = default(SecretBase), object servicePrincipalId = default(object), string servicePrincipalCredentialType = default(string), SecretBase servicePrincipalCredential = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string connectionMode = default(string), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -97,6 +99,7 @@ public CosmosDbLinkedService() AzureCloudType = azureCloudType; ConnectionMode = connectionMode; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -197,6 +200,13 @@ public CosmosDbLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -206,6 +216,10 @@ public CosmosDbLinkedService() public override void Validate() { base.Validate(); + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs index 8bc7dbd7d0eb..d2db924bf121 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs @@ -90,7 +90,9 @@ public DynamicsLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public DynamicsLinkedService(object deploymentType, object authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(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), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public DynamicsLinkedService(object deploymentType, object authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(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), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { DeploymentType = deploymentType; @@ -105,6 +107,7 @@ public DynamicsLinkedService() ServicePrincipalCredentialType = servicePrincipalCredentialType; ServicePrincipalCredential = servicePrincipalCredential; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -215,6 +218,13 @@ public DynamicsLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -232,6 +242,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs index 05eb27a16103..2a3bdf659ae7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs @@ -35,6 +35,16 @@ public GoogleAdWordsLinkedService() /// /// Initializes a new instance of the GoogleAdWordsLinkedService class. /// + /// Unmatched properties from the + /// message are deserialized this collection + /// The integration runtime reference. + /// Linked service description. + /// Parameters for linked service. + /// List of tags that can be used for + /// describing the linked service. + /// Properties used to connect to + /// GoogleAds. It is mutually exclusive with any other properties in + /// the linked service. Type: object. /// The Client customer ID of the /// AdWords account that you want to fetch report data for. /// The developer token associated with @@ -44,13 +54,6 @@ public GoogleAdWordsLinkedService() /// mechanism used for authentication. ServiceAuthentication can only /// be used on self-hosted IR. Possible values include: /// 'ServiceAuthentication', 'UserAuthentication' - /// Unmatched properties from the - /// message are deserialized this collection - /// The integration runtime reference. - /// Linked service description. - /// Parameters for linked service. - /// List of tags that can be used for - /// describing the linked service. /// The refresh token obtained from Google /// for authorizing access to AdWords for UserAuthentication. /// The client id of the google application used @@ -76,9 +79,10 @@ public GoogleAdWordsLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public GoogleAdWordsLinkedService(object clientCustomerID, SecretBase developerToken, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase refreshToken = default(SecretBase), object clientId = default(object), SecretBase clientSecret = default(SecretBase), object email = default(object), object keyFilePath = default(object), object trustedCertPath = default(object), object useSystemTrustStore = default(object), object encryptedCredential = default(object)) + public GoogleAdWordsLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionProperties = default(object), object clientCustomerID = default(object), SecretBase developerToken = default(SecretBase), string authenticationType = default(string), SecretBase refreshToken = default(SecretBase), object clientId = default(object), SecretBase clientSecret = default(SecretBase), object email = default(object), object keyFilePath = default(object), object trustedCertPath = default(object), object useSystemTrustStore = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { + ConnectionProperties = connectionProperties; ClientCustomerID = clientCustomerID; DeveloperToken = developerToken; AuthenticationType = authenticationType; @@ -98,6 +102,14 @@ public GoogleAdWordsLinkedService() /// partial void CustomInit(); + /// + /// Gets or sets properties used to connect to GoogleAds. It is + /// mutually exclusive with any other properties in the linked service. + /// Type: object. + /// + [JsonProperty(PropertyName = "typeProperties.connectionProperties")] + public object ConnectionProperties { get; set; } + /// /// Gets or sets the Client customer ID of the AdWords account that you /// want to fetch report data for. @@ -192,18 +204,6 @@ public GoogleAdWordsLinkedService() public override void Validate() { base.Validate(); - if (ClientCustomerID == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "ClientCustomerID"); - } - if (DeveloperToken == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "DeveloperToken"); - } - if (AuthenticationType == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); - } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs index 6dc560c8f96f..2296f23be6dc 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs @@ -36,9 +36,12 @@ public LinkedIntegrationRuntimeRbacAuthorization() /// /// The resource identifier of the integration /// runtime to be shared. - public LinkedIntegrationRuntimeRbacAuthorization(string resourceId) + /// The credential reference containing + /// authentication information. + public LinkedIntegrationRuntimeRbacAuthorization(string resourceId, CredentialReference credential = default(CredentialReference)) { ResourceId = resourceId; + Credential = credential; CustomInit(); } @@ -54,6 +57,13 @@ public LinkedIntegrationRuntimeRbacAuthorization(string resourceId) [JsonProperty(PropertyName = "resourceId")] public string ResourceId { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -66,6 +76,10 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ResourceId"); } + if (Credential != null) + { + Credential.Validate(); + } } } } 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 fcaa64287cb3..ac665f5acd05 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 @@ -43,16 +43,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=D:\\Projects\\azure-sdk-for-net-1\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "2a8a9a79b23c72c6092d5b1212acf6d69b1b3850"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -