Skip to content
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

Jump to bottom

Salesforce add apiVersion and set security token optional #8416

Merged
merged 13 commits into from
Feb 21, 2020
Merged

Salesforce add apiVersion and set security token optional #8416

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9dde2e5
Update Salesforce LinkedService Add ApiVersion
Jingshu918 Nov 29, 2019
f640637
Merge pull request #1 from Azure/master
Jingshu923 Dec 3, 2019
72a16df
Merge pull request #2 from Azure/master
Jingshu923 Dec 5, 2019
284e49e
Update GoogleAdWords and GoogleBigQuery clientId for fix issue
Jingshu918 Dec 5, 2019
b3a4e9a
Merge pull request #3 from Azure/master
Jingshu923 Dec 6, 2019
a1a3e4a
Merge pull request #4 from Azure/master
Jingshu923 Dec 10, 2019
9715687
Merge pull request #5 from Azure/master
Jingshu923 Jan 3, 2020
b6b3b37
Add DB2 ConnectionString
Jingshu918 Jan 3, 2020
e9ebbe2
Merge pull request #6 from Azure/master
Jingshu923 Feb 18, 2020
233cd93
Salesforce add apiVersion and set securityToken optional
Jingshu918 Feb 18, 2020
cce4898
Revert "Salesforce add apiVersion and set securityToken optional"
Jingshu918 Feb 18, 2020
fc4417b
Revert "Add DB2 ConnectionString"
Jingshu918 Feb 18, 2020
88ffa9c
Salesforce add apiVersion and set security token optional
Jingshu918 Feb 18, 2020
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
12 changes: 10 additions & 2 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 @@ -2263,9 +2263,13 @@
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"securityToken": {
"description": "The security token is required to remotely access Salesforce instance.",
"description": "The security token is optional to remotely access Salesforce instance.",
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"apiVersion": {
"type": "object",
Copy link
Contributor

Choose a reason for hiding this comment

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

should it be string?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@myronfanqiu If we set object type, customer can input a expression instead a string value.

Copy link
Contributor

Choose a reason for hiding this comment

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

what's the meaning of expression? Could you give me an example? I think an expression is also a string.

"description": "The Salesforce API version used in ADF. Type: string (or Expression with resultType 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 @@ -2308,9 +2312,13 @@
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"securityToken": {
"description": "The security token is required to remotely access Salesforce instance.",
"description": "The security token is optional to remotely access Salesforce instance.",
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"apiVersion": {
"type": "object",
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

"description": "The Salesforce API version used in ADF. Type: string (or Expression with resultType string)."
},
"extendedProperties": {
"type": "object",
"description": "Extended properties appended to the connection string. Type: string (or Expression with resultType string)."
Expand Down