Skip to content

Support providing Salesforce passwords and security tokens as SecureStrings or as secrets in Azure Key Vault #1917

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
fearthecowboy merged 8 commits into from
Oct 25, 2017
Merged

Support providing Salesforce passwords and security tokens as SecureStrings or as secrets in Azure Key Vault #1917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
462dad0
support securestring/azurekeyvaultsecret for Dynamics/Salesforce
wezou2 Oct 20, 2017
5730cc7
fix issue in code gen
wezou2 Oct 23, 2017
6c80c55
code style refine
wezou2 Oct 23, 2017
911b6c6
support securestring/azurekeyvaultsecret for Salesforce
wezou2 Oct 24, 2017
4655263
fix reduandant changes
wezou2 Oct 24, 2017
455f112
fix small issues
wezou2 Oct 24, 2017
dc18dd6
fix a typo
wezou2 Oct 25, 2017
d0a1889
revert changes in azure-rest-api-specs.njsproj
wezou2 Oct 25, 2017
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
56 changes: 48 additions & 8 deletions ...on/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/datafactory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2243,26 +2243,66 @@
]
},
"SecureString": {
"x-ms-discriminator-value": "SecureString",
"description": "Azure Data Factory secure string definition. The string value will be masked with asterisks '*' during Get or List API calls.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/SecretBase"
}
],
"properties": {
"type": {
"type": "string",
"description": "SecureString type.",
"enum": [
"SecureString"
]
},
"value": {
"type": "string",
"description": "Value of secure string."
}
},
"required": [
"type",
"value"
]
},
"AzureKeyVaultSecretReference": {
"x-ms-discriminator-value": "AzureKeyVaultSecret",
"description": "Azure Key Vault secret reference.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/SecretBase"
}
],
"properties": {
"store": {
"description": "The Azure Key Vault linked service reference.",
"$ref": "#/definitions/LinkedServiceReference"
},
"secretName": {
"type": "object",
"description": "The name of the secret in Azure Key Vault. Type: string (or Expression with resultType string)."
},
"secretVersion": {
"type": "object",
"description": "The version of the secret in Azure Key Vault. The default value is the latest version of the secret. Type: string (or Expression with resultType string)."
}
},
"required": [
"store",
"secretName"
]
},
"SecretBase": {
"description": "The base definition of a secret type.",
"discriminator": "type",
"type": "object",
"properties": {
"type": {
"type": "string",
"description": "Type of the secret."
}
},
"required": [
"type"
]
},
"FactoryListResponse": {
"description": "A list of factory resources.",
"type": "object",
Expand Down
48 changes: 3 additions & 45 deletions .../resource-manager/Microsoft.DataFactory/2017-09-01-preview/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
},
"password": {
"description": "Password to access the Dynamics instance.",
"$ref": "#/definitions/AzureKeyVaultSecretReference"
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference"
}
},
"required": [
Expand All @@ -379,48 +379,6 @@
"password"
]
},
"AzureKeyVaultReference": {
"type": "object",
"description": "A reference to an object in Azure Key Vault.",
"discriminator": "type",
"properties": {
"type": {
"type": "string",
"description": "The type of the Azure Key Vault object to reference."
},
"store": {
"description": "The Azure Key Vault LinkedService.",
"$ref": "../datafactory.json#/definitions/LinkedServiceReference"
}
},
"required": [
"type",
"store"
]
},
"AzureKeyVaultSecretReference": {
"description": "Azure Key Vault Secret properties.",
"x-ms-discriminator-value": "AzureKeyVaultSecret",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/AzureKeyVaultReference"
}
],
"properties": {
"secretName": {
"type": "object",
"description": "The name of secret in Azure Key Vault. Type: string (or Expression with resultType string)."
},
"secretVersion": {
"type": "object",
"description": "The version of the secret in Azure Key Vault. The default value is the latest version of the secret. Type: string (or Expression with resultType string)."
}
},
"required": [
"secretName"
]
},
"HDInsightLinkedService": {
"x-ms-discriminator-value": "HDInsight",
"description": "HDInsight linked service.",
Expand Down Expand Up @@ -1377,11 +1335,11 @@
},
"password": {
"description": "The password for Basic authentication of the Salesforce source.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"securityToken": {
"description": "The security token is required to remotely access Salesforce source.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"encryptedCredential": {
"type": "object",
Expand Down