From d5fd66ba9d2f9fe255715d36381db680fdac68ab Mon Sep 17 00:00:00 2001 From: wenqibu <153253179+wenqibu@users.noreply.github.com> Date: Wed, 17 Jan 2024 14:38:09 +0800 Subject: [PATCH] Improve Salesforce V2 properties --- .../2018-06-01/entityTypes/LinkedService.json | 10 ++++++++ .../2018-06-01/entityTypes/Pipeline.json | 24 +++++-------------- .../2020-12-01/entityTypes/LinkedService.json | 8 +++++++ .../2020-12-01/entityTypes/Pipeline.json | 20 ++++------------ 4 files changed, 28 insertions(+), 34 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 8df637eb4319..f7d66156c8e6 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 @@ -7743,6 +7743,11 @@ "x-ms-format": "dfe-string", "description": "The URL of Salesforce instance. For example, 'https://[domain].my.salesforce.com'. Type: string (or Expression with resultType string)." }, + "authenticationType": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "The authentication type to be used to connect to the Salesforce. Currently, we only support OAuth2ClientCredentials, it is also the default value" + }, "clientId": { "type": "object", "x-ms-format": "dfe-string", @@ -7792,6 +7797,11 @@ "x-ms-format": "dfe-string", "description": "The URL of Salesforce Service Cloud instance. For example, 'https://[domain].my.salesforce.com'. Type: string (or Expression with resultType string)." }, + "authenticationType": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "The authentication type to be used to connect to the Salesforce. Currently, we only support OAuth2ClientCredentials, it is also the default value" + }, "clientId": { "type": "object", "x-ms-format": "dfe-string", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 76db543b796a..7df58a01d5df 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -9056,10 +9056,10 @@ "x-ms-format": "dfe-string", "description": "Database query. Type: string (or Expression with resultType string)." }, - "readBehavior": { - "description": "The read behavior for the operation. Default is query. Allowed values: query/queryAll. Type: string (or Expression with resultType string).", + "includeDeletedObjects": { + "description": "This property control whether query result contains Deleted objects. Default is false. Type: boolean (or Expression with resultType boolean).", "type": "object", - "x-ms-format": "dfe-string" + "x-ms-format": "dfe-bool" } } }, @@ -9077,10 +9077,10 @@ "x-ms-format": "dfe-string", "description": "Database query. Type: string (or Expression with resultType string)." }, - "readBehavior": { - "description": "The read behavior for the operation. Default is query. Allowed values: query/queryAll. Type: string (or Expression with resultType string).", + "includeDeletedObjects": { + "description": "This property control whether query result contains Deleted objects. Default is false. Type: boolean (or Expression with resultType boolean).", "type": "object", - "x-ms-format": "dfe-string" + "x-ms-format": "dfe-bool" }, "additionalColumns": { "type": "object", @@ -9088,18 +9088,6 @@ } } }, - "SalesforceV2SourceReadBehavior": { - "description": "The Salesforce read behavior for the operation", - "type": "string", - "enum": [ - "query", - "queryAll" - ], - "x-ms-enum": { - "name": "SalesforceV2SourceReadBehavior", - "modelAsString": true - } - }, "SalesforceV2Sink": { "description": "A copy activity Salesforce V2 sink.", "type": "object", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json index 09075f247a6d..7e244d00f63c 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json @@ -7142,6 +7142,10 @@ "type": "object", "description": "The URL of Salesforce instance. For example, 'https://[domain].my.salesforce.com'. Type: string (or Expression with resultType string)." }, + "authenticationType": { + "type": "object", + "description": "The authentication type to be used to connect to the Salesforce. Currently, we only support OAuth2ClientCredentials, it is also the default value" + }, "clientId": { "type": "object", "description": "The client Id for OAuth 2.0 Client Credentials Flow authentication of the Salesforce instance. Type: string (or Expression with resultType string)." @@ -7188,6 +7192,10 @@ "type": "object", "description": "The URL of Salesforce Service Cloud instance. For example, 'https://[domain].my.salesforce.com'. Type: string (or Expression with resultType string)." }, + "authenticationType": { + "type": "object", + "description": "The authentication type to be used to connect to the Salesforce. Currently, we only support OAuth2ClientCredentials, it is also the default value" + }, "clientId": { "type": "object", "description": "The client Id for OAuth 2.0 Client Credentials Flow authentication of the Salesforce instance. Type: string (or Expression with resultType string)." diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json index 1063f625cf74..3ff1020aa022 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json @@ -7984,8 +7984,8 @@ "type": "object", "description": "Database query. Type: string (or Expression with resultType string)." }, - "readBehavior": { - "description": "The read behavior for the operation. Default is query. Allowed values: query/queryAll. Type: string (or Expression with resultType string).", + "includeDeletedObjects": { + "description": "This property control whether query result contains Deleted objects. Default is false. Type: boolean (or Expression with resultType boolean).", "type": "object" } } @@ -8003,8 +8003,8 @@ "type": "object", "description": "Database query. Type: string (or Expression with resultType string)." }, - "readBehavior": { - "description": "The read behavior for the operation. Default is query. Allowed values: query/queryAll. Type: string (or Expression with resultType string).", + "includeDeletedObjects": { + "description": "This property control whether query result contains Deleted objects. Default is false. Type: boolean (or Expression with resultType boolean).", "type": "object" }, "additionalColumns": { @@ -8013,18 +8013,6 @@ } } }, - "SalesforceV2SourceReadBehavior": { - "description": "The Salesforce read behavior for the operation", - "type": "string", - "enum": [ - "query", - "queryAll" - ], - "x-ms-enum": { - "name": "SalesforceV2SourceReadBehavior", - "modelAsString": true - } - }, "SalesforceV2Sink": { "description": "A copy activity Salesforce V2 sink.", "type": "object",