Skip to content

Enable Azure Key Vault for compute linked services #2405

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
jianghaolu merged 1 commit into from
Feb 6, 2018
Merged

Enable Azure Key Vault for compute linked services #2405

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions ...e-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
},
"accessKey": {
"description": "The Azure Batch account access key.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
Copy link
Copy Markdown
Contributor

@jianghaolu jianghaolu Feb 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cannot resolve reference. "../../datafactory.json#/definitions/SecretBase"?

Copy link
Copy Markdown
Member Author

@fhljys fhljys Feb 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In datafactory.json,

Theres is "SecretBase": {
"description": "The base definition of a secret type.",
"discriminator": "type",
"type": "object",
"properties": {
"type": {
"type": "string",
"description": "Type of the secret."
}
},
"required": [
"type"
]
},
Should I add it to somewhere else?

},
"batchUri": {
"type": "object",
Expand Down Expand Up @@ -442,7 +442,7 @@
},
"password": {
"description": "HDInsight cluster password.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"linkedServiceName": {
"description": "The Azure Storage linked service reference.",
Expand Down Expand Up @@ -901,7 +901,7 @@
},
"apiKey": {
"description": "The API key for accessing the Azure ML model endpoint.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"updateResourceEndpoint": {
"type": "object",
Expand All @@ -912,7 +912,7 @@
"description": "The ID of the service principal used to authenticate against the ARM-based updateResourceEndpoint of an Azure ML web service. Type: string (or Expression with resultType string)."
},
"servicePrincipalKey": {
"$ref": "../datafactory.json#/definitions/SecureString",
"$ref": "../datafactory.json#/definitions/SecretBase",
"description": "The key of the service principal used to authenticate against the ARM-based updateResourceEndpoint of an Azure ML web service."
},
"tenant": {
Expand Down Expand Up @@ -1156,7 +1156,7 @@
},
"password": {
"description": "The password for Basic authentication.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
}
},
"required": [
Expand All @@ -1175,11 +1175,11 @@
"properties": {
"pfx": {
"description": "Base64-encoded contents of a PFX file.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"password": {
"description": "Password for the PFX file.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
}
},
"required": [
Expand Down Expand Up @@ -2500,7 +2500,7 @@
},
"password": {
"description": "The password corresponding to the user name that you provided in the Username field",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"httpPath": {
"description": "The partial URL corresponding to the Hive server.",
Expand Down Expand Up @@ -3634,7 +3634,7 @@
},
"servicePrincipalKey": {
"description": "The key for the service principal id.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"tenant": {
"type": "object",
Expand All @@ -3654,15 +3654,15 @@
},
"clusterPassword": {
"description": "The password to access the cluster.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"clusterSshUserName": {
"type": "object",
"description": "The username to SSH remotely connect to cluster’s node (for Linux). Type: string (or Expression with resultType string)."
},
"clusterSshPassword": {
"description": "The password to SSH remotely connect cluster’s node (for Linux).",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"additionalLinkedServiceNames": {
"description": "Specifies additional storage accounts for the HDInsight linked service so that the Data Factory service can register them on your behalf.",
Expand Down Expand Up @@ -3763,7 +3763,7 @@
},
"servicePrincipalKey": {
"description": "The Key of the application used to authenticate against the Azure Data Lake Analytics account.",
"$ref": "../datafactory.json#/definitions/SecureString"
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"tenant": {
"type": "object",
Expand Down