Skip to content

[DataFactory]Add sensitive fields extracted from connection string in swagger for AKV reference #4375

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
jhendrixMSFT merged 2 commits into from
Nov 6, 2018
Merged

[DataFactory]Add sensitive fields extracted from connection string in swagger for AKV reference #4375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e66be9
Add sensitive fields extracted from connection string in swagger for …
boxiao-o Nov 1, 2018
f0f730d
Change sasUri type to object as it supports string, SecureString and …
boxiao-o Nov 2, 2018
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
80 changes: 76 additions & 4 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 @@ -109,9 +109,17 @@
"description": "The connection string. It is mutually exclusive with sasUri property. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"accountKey": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of accountKey in connection string."
},
"sasUri": {
"description": "SAS URI of the Azure Storage resource. It is mutually exclusive with connectionString property.",
"$ref": "../datafactory.json#/definitions/SecretBase"
"description": "SAS URI of the Azure Storage resource. It is mutually exclusive with connectionString property. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"sasToken": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of sasToken in sas uri."
},
"encryptedCredential": {
"type": "string",
Expand All @@ -126,9 +134,17 @@
"type": "object",
"description": "The connection string. It is mutually exclusive with sasUri, serviceEndpoint property. Type: string, SecureString or AzureKeyVaultSecretReference."
},
"accountKey": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of accountKey in connection string."
},
"sasUri": {
"description": "SAS URI of the Azure Blob Storage resource. It is mutually exclusive with connectionString, serviceEndpoint property.",
"$ref": "../datafactory.json#/definitions/SecretBase"
"description": "SAS URI of the Azure Blob Storage resource. It is mutually exclusive with connectionString, serviceEndpoint property. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"sasToken": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of sasToken in sas uri."
},
"serviceEndpoint": {
"type": "string",
Expand Down Expand Up @@ -179,6 +195,10 @@
"description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"password": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"servicePrincipalId": {
"type": "object",
"description": "The ID of the service principal used to authenticate against Azure SQL Data Warehouse. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -271,6 +291,10 @@
"description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"password": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"servicePrincipalId": {
"type": "object",
"description": "The ID of the service principal used to authenticate against Azure SQL Database. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -406,6 +430,10 @@
"description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"accountKey": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of accountKey in connection string."
},
"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)."
Expand Down Expand Up @@ -620,6 +648,10 @@
"description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"password": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"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)."
Expand Down Expand Up @@ -656,6 +688,10 @@
"description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"password": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"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)."
Expand Down Expand Up @@ -692,6 +728,10 @@
"description": "The connection string.",
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"password": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"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)."
Expand Down Expand Up @@ -728,6 +768,10 @@
"description": "The connection string.",
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"password": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"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)."
Expand Down Expand Up @@ -2132,6 +2176,10 @@
"description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"password": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"encryptedCredential": {
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
"type": "object"
Expand Down Expand Up @@ -2222,6 +2270,10 @@
"description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"credString": {
Copy link
Contributor

@hvermis hvermis Nov 2, 2018

Choose a reason for hiding this comment

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

Here too, please use full words in names

Copy link
Contributor Author

@boxiao-o boxiao-o Nov 5, 2018

Choose a reason for hiding this comment

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

Same here. This field will be back-filled into connection string, so the name should be the same.

"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of credString in connection string."
},
"encryptedCredential": {
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
"type": "object"
Expand Down Expand Up @@ -2255,6 +2307,10 @@
"description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"pwd": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"encryptedCredential": {
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
"type": "object"
Expand Down Expand Up @@ -2430,6 +2486,10 @@
"description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"pwd": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"encryptedCredential": {
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
"type": "object"
Expand Down Expand Up @@ -2924,6 +2984,10 @@
"description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"pwd": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"encryptedCredential": {
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
"type": "object"
Expand Down Expand Up @@ -3730,6 +3794,10 @@
"description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"pwd": {
"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"encryptedCredential": {
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
"type": "object"
Expand Down Expand Up @@ -3763,6 +3831,10 @@
"description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"pwd": {
Copy link
Contributor

@hvermis hvermis Nov 2, 2018

Choose a reason for hiding this comment

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

Why is this one named pwd while others password?

Copy link
Contributor Author

@boxiao-o boxiao-o Nov 5, 2018

Choose a reason for hiding this comment

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

The property name needs to be same with the name in connection string. In this Netezza linked service case, a typical connection string is Server=<server>;Port=<port>;Database=<database>;UID=<user name>;PWD=<password>.

"$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference",
"description": "The Azure key vault secret reference of password in connection string."
},
"encryptedCredential": {
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
"type": "object"
Expand Down