Skip to content

[DataFactory]Add Dynamics Server-toServer authentication type. #7437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lirenhe merged 2 commits into from
Oct 17, 2019
Merged

[DataFactory]Add Dynamics Server-toServer authentication type. #7437

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e2c384
Swagger changes for Dynamics S2S auth.
zhenqxuMSFT Oct 9, 2019
7face07
Fix mistakes.
zhenqxuMSFT Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 72 additions & 12 deletions ...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,10 +558,11 @@
},
"enum": [
"Office365",
"Ifd"
"Ifd",
"AADServicePrincipal"
],
"type": "object",
"description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. Type: string (or Expression with resultType string)."
"description": "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)."
},
"username": {
"type": "object",
Expand All @@ -571,15 +572,34 @@
"description": "Password to access the Dynamics instance.",
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"servicePrincipalId": {
"type": "object",
"description": "The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string)."
},
"servicePrincipalCredentialType": {
"x-ms-enum": {
"name": "DynamicsServicePrincipalCredentialType",
"modelAsString": true
},
"enum": [
"ServicePrincipalKey",
"ServicePrincipalCert"
],
"type": "object",
"description": "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)."
},
"servicePrincipalCredential": {
"$ref": "../datafactory.json#/definitions/SecretBase",
"description": "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."
},
"encryptedCredential": {
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
}
},
"required": [
"deploymentType",
"authenticationType",
"username"
"authenticationType"
]
},
"DynamicsCrmLinkedService": {
Expand Down Expand Up @@ -640,10 +660,11 @@
},
"enum": [
"Office365",
"Ifd"
"Ifd",
"AADServicePrincipal"
],
"type": "string",
"description": "The authentication type to connect to Dynamics CRM server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. Type: string (or Expression with resultType string)."
"description": "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)."
},
"username": {
"type": "object",
Expand All @@ -653,15 +674,34 @@
"description": "Password to access the Dynamics CRM instance.",
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"servicePrincipalId": {
"type": "object",
"description": "The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string)."
},
"servicePrincipalCredentialType": {
"x-ms-enum": {
"name": "DynamicsServicePrincipalCredentialType",
"modelAsString": true
},
"enum": [
"ServicePrincipalKey",
"ServicePrincipalCert"
],
"type": "object",
"description": "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)."
},
"servicePrincipalCredential": {
"$ref": "../datafactory.json#/definitions/SecretBase",
"description": "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."
},
"encryptedCredential": {
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
}
},
"required": [
"deploymentType",
"authenticationType",
"username"
"authenticationType"
]
},
"CommonDataServiceForAppsLinkedService": {
Expand Down Expand Up @@ -722,10 +762,11 @@
},
"enum": [
"Office365",
"Ifd"
"Ifd",
"AADServicePrincipal"
],
"type": "string",
"description": "The authentication type to connect to Common Data Service for Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. Type: string (or Expression with resultType string)."
"description": "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)."
},
"username": {
"type": "object",
Expand All @@ -735,15 +776,34 @@
"description": "Password to access the Common Data Service for Apps instance.",
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"servicePrincipalId": {
"type": "object",
"description": "The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string)."
},
"servicePrincipalCredentialType": {
"x-ms-enum": {
"name": "DynamicsServicePrincipalCredentialType",
"modelAsString": true
},
"enum": [
"ServicePrincipalKey",
"ServicePrincipalCert"
],
"type": "object",
"description": "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)."
},
"servicePrincipalCredential": {
"$ref": "../datafactory.json#/definitions/SecretBase",
"description": "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."
},
"encryptedCredential": {
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
}
},
"required": [
"deploymentType",
"authenticationType",
"username"
"authenticationType"
]
},
"HDInsightLinkedService": {
Expand Down