From 9dde2e58adb477a3b8716ab374b9bd82c139e278 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Fri, 29 Nov 2019 12:26:26 +0800 Subject: [PATCH 1/7] Update Salesforce LinkedService Add ApiVersion --- .../stable/2018-06-01/entityTypes/LinkedService.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index b91fef4b4100..6b9f66440c45 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -2266,6 +2266,10 @@ "description": "The security token is required to remotely access Salesforce instance.", "$ref": "../datafactory.json#/definitions/SecretBase" }, + "apiVersion": { + "type": "object", + "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)." From 284e49e67e41e6fa010e4ec05c0213a92e28738d Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 5 Dec 2019 12:52:48 +0800 Subject: [PATCH 2/7] Update GoogleAdWords and GoogleBigQuery clientId for fix issue --- .../stable/2018-06-01/entityTypes/LinkedService.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index b91fef4b4100..9862ee577cb7 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -3381,8 +3381,8 @@ "$ref": "../datafactory.json#/definitions/SecretBase" }, "clientId": { - "description": "The client id of the google application used to acquire the refresh token.", - "$ref": "../datafactory.json#/definitions/SecretBase" + "description": "The client id of the google application used to acquire the refresh token. Type: string (or Expression with resultType string).", + "type": "object" }, "clientSecret": { "description": "The client secret of the google application used to acquire the refresh token.", @@ -5470,8 +5470,8 @@ "$ref": "../datafactory.json#/definitions/SecretBase" }, "clientId": { - "description": "The client id of the google application used to acquire the refresh token.", - "$ref": "../datafactory.json#/definitions/SecretBase" + "description": "The client id of the google application used to acquire the refresh token. Type: string (or Expression with resultType string).", + "type": "object" }, "clientSecret": { "description": "The client secret of the google application used to acquire the refresh token.", From b6b3b37a3ad99cdfa40c2e71a4e9cd1fe806673e Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Fri, 3 Jan 2020 14:26:17 +0800 Subject: [PATCH 3/7] Add DB2 ConnectionString --- .../2018-06-01/entityTypes/LinkedService.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index 9862ee577cb7..fb7c0b820ab3 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -1243,16 +1243,20 @@ "Db2LinkedServiceTypeProperties": { "description": "DB2 linked service properties.", "properties": { + "connectionString": { + "type": "object", + "description": "The connection string. It is mutually exclusive with server, database, authenticationType, userName, packageCollection and certificateCommonName property. Type: string, SecureString or AzureKeyVaultSecretReference." + }, "server": { "type": "object", - "description": "Server name for connection. Type: string (or Expression with resultType string)." + "description": "Server name for connection. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." }, "database": { "type": "object", - "description": "Database name for connection. Type: string (or Expression with resultType string)." + "description": "Database name for connection. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." }, "authenticationType": { - "description": "AuthenticationType to be used for connection.", + "description": "AuthenticationType to be used for connection. It is mutually exclusive with connectionString property.", "type": "string", "enum": [ "Basic" @@ -1264,7 +1268,7 @@ }, "username": { "type": "object", - "description": "Username for authentication. Type: string (or Expression with resultType string)." + "description": "Username for authentication. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." }, "password": { "description": "Password for authentication.", @@ -1272,21 +1276,17 @@ }, "packageCollection": { "type": "object", - "description": "Under where packages are created when querying database. Type: string (or Expression with resultType string)." + "description": "Under where packages are created when querying database. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." }, "certificateCommonName": { "type": "object", - "description": "Certificate Common Name when TLS is enabled. Type: string (or Expression with resultType string)." + "description": "Certificate Common Name when TLS is enabled. It is mutually exclusive with connectionString property. 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)." + "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." } - }, - "required": [ - "server", - "database" - ] + } }, "TeradataLinkedService": { "x-ms-discriminator-value": "Teradata", From 233cd93f43a9e4e995834b608560316bbab54fbf Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 18 Feb 2020 12:35:17 +0800 Subject: [PATCH 4/7] Salesforce add apiVersion and set securityToken optional --- .../2018-06-01/entityTypes/LinkedService.json | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index fb7c0b820ab3..7df4aaf90196 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -1243,10 +1243,6 @@ "Db2LinkedServiceTypeProperties": { "description": "DB2 linked service properties.", "properties": { - "connectionString": { - "type": "object", - "description": "The connection string. It is mutually exclusive with server, database, authenticationType, userName, packageCollection and certificateCommonName property. Type: string, SecureString or AzureKeyVaultSecretReference." - }, "server": { "type": "object", "description": "Server name for connection. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." @@ -2263,9 +2259,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", + "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)." @@ -2308,9 +2308,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", + "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)." From cce4898730132b8905bcef0bf5230dc55aeb23ad Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 18 Feb 2020 12:38:37 +0800 Subject: [PATCH 5/7] Revert "Salesforce add apiVersion and set securityToken optional" This reverts commit 233cd93f43a9e4e995834b608560316bbab54fbf. --- .../2018-06-01/entityTypes/LinkedService.json | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index 7df4aaf90196..fb7c0b820ab3 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -1243,6 +1243,10 @@ "Db2LinkedServiceTypeProperties": { "description": "DB2 linked service properties.", "properties": { + "connectionString": { + "type": "object", + "description": "The connection string. It is mutually exclusive with server, database, authenticationType, userName, packageCollection and certificateCommonName property. Type: string, SecureString or AzureKeyVaultSecretReference." + }, "server": { "type": "object", "description": "Server name for connection. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." @@ -2259,13 +2263,9 @@ "$ref": "../datafactory.json#/definitions/SecretBase" }, "securityToken": { - "description": "The security token is optional to remotely access Salesforce instance.", + "description": "The security token is required to remotely access Salesforce instance.", "$ref": "../datafactory.json#/definitions/SecretBase" }, - "apiVersion": { - "type": "object", - "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)." @@ -2308,13 +2308,9 @@ "$ref": "../datafactory.json#/definitions/SecretBase" }, "securityToken": { - "description": "The security token is optional to remotely access Salesforce instance.", + "description": "The security token is required to remotely access Salesforce instance.", "$ref": "../datafactory.json#/definitions/SecretBase" }, - "apiVersion": { - "type": "object", - "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)." From fc4417b326a0f83bc2d73f111ee6ea34c4661e40 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 18 Feb 2020 12:47:29 +0800 Subject: [PATCH 6/7] Revert "Add DB2 ConnectionString" This reverts commit b6b3b37a3ad99cdfa40c2e71a4e9cd1fe806673e. --- .../2018-06-01/entityTypes/LinkedService.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index fb7c0b820ab3..9862ee577cb7 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -1243,20 +1243,16 @@ "Db2LinkedServiceTypeProperties": { "description": "DB2 linked service properties.", "properties": { - "connectionString": { - "type": "object", - "description": "The connection string. It is mutually exclusive with server, database, authenticationType, userName, packageCollection and certificateCommonName property. Type: string, SecureString or AzureKeyVaultSecretReference." - }, "server": { "type": "object", - "description": "Server name for connection. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." + "description": "Server name for connection. Type: string (or Expression with resultType string)." }, "database": { "type": "object", - "description": "Database name for connection. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." + "description": "Database name for connection. Type: string (or Expression with resultType string)." }, "authenticationType": { - "description": "AuthenticationType to be used for connection. It is mutually exclusive with connectionString property.", + "description": "AuthenticationType to be used for connection.", "type": "string", "enum": [ "Basic" @@ -1268,7 +1264,7 @@ }, "username": { "type": "object", - "description": "Username for authentication. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." + "description": "Username for authentication. Type: string (or Expression with resultType string)." }, "password": { "description": "Password for authentication.", @@ -1276,17 +1272,21 @@ }, "packageCollection": { "type": "object", - "description": "Under where packages are created when querying database. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." + "description": "Under where packages are created when querying database. Type: string (or Expression with resultType string)." }, "certificateCommonName": { "type": "object", - "description": "Certificate Common Name when TLS is enabled. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." + "description": "Certificate Common Name when TLS is enabled. 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. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." + "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." } - } + }, + "required": [ + "server", + "database" + ] }, "TeradataLinkedService": { "x-ms-discriminator-value": "Teradata", From 88ffa9c3add179b623f15c4733ddb2705427a971 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 18 Feb 2020 12:49:45 +0800 Subject: [PATCH 7/7] Salesforce add apiVersion and set security token optional --- .../stable/2018-06-01/entityTypes/LinkedService.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index 9862ee577cb7..dfff4491fe86 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -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", + "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)." @@ -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", + "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)."