From e7196841710d4b3a432a6176f9d2e0673a695acd Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 31 May 2023 13:35:46 +0800 Subject: [PATCH 1/3] Fix Bug For Github Issues --- .../2018-06-01/entityTypes/LinkedService.json | 5 +++ .../2018-06-01/entityTypes/Pipeline.json | 38 +++++++++---------- .../2020-12-01/entityTypes/LinkedService.json | 9 +++++ .../2020-12-01/entityTypes/Pipeline.json | 36 ++++++++---------- 4 files changed, 48 insertions(+), 40 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 c687f8015709..bf90040ad82d 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 @@ -1897,6 +1897,11 @@ "x-ms-format": "dfe-string", "description": "Azure ML Service workspace name. Type: string (or Expression with resultType string)." }, + "authentication": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)." + }, "servicePrincipalId": { "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 4009b9a57d49..f6bd7236ded0 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 @@ -2271,16 +2271,9 @@ "description": "Database query. Type: string (or Expression with resultType string)." }, "readBehavior": { - "description": "The read behavior for the operation. Default is Query.", - "type": "string", - "enum": [ - "Query", - "QueryAll" - ], - "x-ms-enum": { - "name": "SalesforceSourceReadBehavior", - "modelAsString": true - } + "description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).", + "type": "object", + "x-ms-format": "dfe-string" } } }, @@ -2299,16 +2292,9 @@ "description": "Database query. Type: string (or Expression with resultType string)." }, "readBehavior": { - "description": "The read behavior for the operation. Default is Query.", - "type": "string", - "enum": [ - "Query", - "QueryAll" - ], - "x-ms-enum": { - "name": "SalesforceSourceReadBehavior", - "modelAsString": true - } + "description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).", + "type": "object", + "x-ms-format": "dfe-string" }, "additionalColumns": { "type": "object", @@ -2316,6 +2302,18 @@ } } }, + "SalesforceSourceReadBehavior": { + "description": "The Salesforce read behavior for the operation", + "type": "string", + "enum": [ + "Query", + "QueryAll" + ], + "x-ms-enum": { + "name": "SalesforceSourceReadBehavior", + "modelAsString": true + } + }, "SapCloudForCustomerSource": { "description": "A copy activity source for SAP Cloud for Customer source.", "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 66dbd1ae9ce1..0aefceb6c613 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 @@ -1616,6 +1616,11 @@ "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)." + }, + "authentication": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)." } }, "required": [ @@ -1659,6 +1664,10 @@ "type": "object", "description": "Azure ML Service workspace name. Type: string (or Expression with resultType string)." }, + "authentication": { + "type": "object", + "description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)." + }, "servicePrincipalId": { "type": "object", "description": "The ID of the service principal used to authenticate against the endpoint of a published Azure ML Service pipeline. 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 c6fc1067a62c..c5e5d398902e 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 @@ -1900,16 +1900,8 @@ "description": "Database query. Type: string (or Expression with resultType string)." }, "readBehavior": { - "description": "The read behavior for the operation. Default is Query.", - "type": "string", - "enum": [ - "Query", - "QueryAll" - ], - "x-ms-enum": { - "name": "SalesforceSourceReadBehavior", - "modelAsString": true - } + "description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).", + "type": "object" } } }, @@ -1927,16 +1919,8 @@ "description": "Database query. Type: string (or Expression with resultType string)." }, "readBehavior": { - "description": "The read behavior for the operation. Default is Query.", - "type": "string", - "enum": [ - "Query", - "QueryAll" - ], - "x-ms-enum": { - "name": "SalesforceSourceReadBehavior", - "modelAsString": true - } + "description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).", + "type": "object" }, "additionalColumns": { "type": "object", @@ -1944,6 +1928,18 @@ } } }, + "SalesforceSourceReadBehavior": { + "description": "The Salesforce read behavior for the operation", + "type": "string", + "enum": [ + "Query", + "QueryAll" + ], + "x-ms-enum": { + "name": "SalesforceSourceReadBehavior", + "modelAsString": true + } + }, "SapCloudForCustomerSource": { "description": "A copy activity source for SAP Cloud for Customer source.", "type": "object", From 655758d91fdaa646b8d7e87cba6d2486f134aab8 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 31 May 2023 13:38:17 +0800 Subject: [PATCH 2/3] fix --- .../stable/2020-12-01/entityTypes/LinkedService.json | 1 - 1 file changed, 1 deletion(-) 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 0aefceb6c613..f8c9bb5da83e 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 @@ -1619,7 +1619,6 @@ }, "authentication": { "type": "object", - "x-ms-format": "dfe-string", "description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)." } }, From be64441d7c4397453c4e7dd1fff4f3bf82243a91 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 31 May 2023 13:53:30 +0800 Subject: [PATCH 3/3] fix --- .../stable/2018-06-01/entityTypes/Pipeline.json | 4 ++-- .../stable/2020-12-01/entityTypes/Pipeline.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 f6bd7236ded0..a010b70d2351 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 @@ -2271,7 +2271,7 @@ "description": "Database query. Type: string (or Expression with resultType string)." }, "readBehavior": { - "description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).", + "description": "The read behavior for the operation. Default is Query. Allowed values: Query/QueryAll. Type: string (or Expression with resultType string).", "type": "object", "x-ms-format": "dfe-string" } @@ -2292,7 +2292,7 @@ "description": "Database query. Type: string (or Expression with resultType string)." }, "readBehavior": { - "description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).", + "description": "The read behavior for the operation. Default is Query. Allowed values: Query/QueryAll. Type: string (or Expression with resultType string).", "type": "object", "x-ms-format": "dfe-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 c5e5d398902e..b4cbc2da5cb9 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 @@ -1900,7 +1900,7 @@ "description": "Database query. Type: string (or Expression with resultType string)." }, "readBehavior": { - "description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).", + "description": "The read behavior for the operation. Default is Query. Allowed values: Query/QueryAll. Type: string (or Expression with resultType string).", "type": "object" } } @@ -1919,7 +1919,7 @@ "description": "Database query. Type: string (or Expression with resultType string)." }, "readBehavior": { - "description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).", + "description": "The read behavior for the operation. Default is Query. Allowed values: Query/QueryAll. Type: string (or Expression with resultType string).", "type": "object" }, "additionalColumns": {