From cf722ceafe31e445bd1ff1073d0fc667e18b1746 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Fri, 5 Jul 2024 11:17:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Support=20=E2=80=98domain=E2=80=99=20Proper?= =?UTF-8?q?ty=20In=20Dynamics=20Family?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2018-06-01/entityTypes/LinkedService.json | 15 +++++++++++++++ .../2020-12-01/entityTypes/LinkedService.json | 12 ++++++++++++ 2 files changed, 27 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 22a1f81ad6e5..6f603c600efa 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 @@ -1031,6 +1031,11 @@ "x-ms-format": "dfe-string", "description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." }, + "domain": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "The Active Directory domain that will verify user credentials. Type: string (or Expression with resultType string)." + }, "username": { "type": "object", "x-ms-format": "dfe-string", @@ -1147,6 +1152,11 @@ "x-ms-format": "dfe-string", "description": "The authentication type to connect to Dynamics CRM server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." }, + "domain": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "The Active Directory domain that will verify user credentials. Type: string (or Expression with resultType string)." + }, "username": { "type": "object", "x-ms-format": "dfe-string", @@ -1250,6 +1260,11 @@ "x-ms-format": "dfe-string", "description": "The authentication type to connect to Common Data Service for Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." }, + "domain": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "The Active Directory domain that will verify user credentials. Type: string (or Expression with resultType string)." + }, "username": { "type": "object", "x-ms-format": "dfe-string", 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 523cf94b76a2..53f2b9f1cbae 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 @@ -918,6 +918,10 @@ "type": "object", "description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." }, + "domain": { + "type": "object", + "description": "The Active Directory domain that will verify user credentials. Type: string (or Expression with resultType string)." + }, "username": { "type": "object", "description": "User name to access the Dynamics instance. Type: string (or Expression with resultType string)." @@ -1025,6 +1029,10 @@ "type": "object", "description": "The authentication type to connect to Dynamics CRM server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." }, + "domain": { + "type": "object", + "description": "The Active Directory domain that will verify user credentials. Type: string (or Expression with resultType string)." + }, "username": { "type": "object", "description": "User name to access the Dynamics CRM instance. Type: string (or Expression with resultType string)." @@ -1119,6 +1127,10 @@ "type": "object", "description": "The authentication type to connect to Common Data Service for Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." }, + "domain": { + "type": "object", + "description": "The Active Directory domain that will verify user credentials. Type: string (or Expression with resultType string)." + }, "username": { "type": "object", "description": "User name to access the Common Data Service for Apps instance. Type: string (or Expression with resultType string)." From 064ea2c7bb83b9c6e0986b8ac06ba09f0e2967df Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Fri, 5 Jul 2024 12:28:51 +0800 Subject: [PATCH 2/2] add --- .../stable/2018-06-01/entityTypes/LinkedService.json | 9 +++++---- .../stable/2020-12-01/entityTypes/LinkedService.json | 9 +++++---- 2 files changed, 10 insertions(+), 8 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 6f603c600efa..356ece9ed6ad 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 @@ -1029,7 +1029,7 @@ "authenticationType": { "type": "object", "x-ms-format": "dfe-string", - "description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." + "description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: string (or Expression with resultType string)." }, "domain": { "type": "object", @@ -1091,7 +1091,8 @@ "enum": [ "Office365", "Ifd", - "AADServicePrincipal" + "AADServicePrincipal", + "Active Directory" ], "x-ms-enum": { "name": "DynamicsAuthenticationType", @@ -1150,7 +1151,7 @@ "authenticationType": { "type": "object", "x-ms-format": "dfe-string", - "description": "The authentication type to connect to Dynamics CRM server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." + "description": "The authentication type to connect to Dynamics CRM server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: string (or Expression with resultType string)." }, "domain": { "type": "object", @@ -1258,7 +1259,7 @@ "authenticationType": { "type": "object", "x-ms-format": "dfe-string", - "description": "The authentication type to connect to Common Data Service for Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." + "description": "The authentication type to connect to Common Data Service for Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. 'AADServicePrincipal' for Server-To-Server authentication in online scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: string (or Expression with resultType string)." }, "domain": { "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 53f2b9f1cbae..88c676889ffb 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 @@ -916,7 +916,7 @@ }, "authenticationType": { "type": "object", - "description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." + "description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: string (or Expression with resultType string)." }, "domain": { "type": "object", @@ -974,7 +974,8 @@ "enum": [ "Office365", "Ifd", - "AADServicePrincipal" + "AADServicePrincipal", + "Active Directory" ], "x-ms-enum": { "name": "DynamicsAuthenticationType", @@ -1027,7 +1028,7 @@ }, "authenticationType": { "type": "object", - "description": "The authentication type to connect to Dynamics CRM server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." + "description": "The authentication type to connect to Dynamics CRM server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: string (or Expression with resultType string)." }, "domain": { "type": "object", @@ -1125,7 +1126,7 @@ }, "authenticationType": { "type": "object", - "description": "The authentication type to connect to Common Data Service for Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)." + "description": "The authentication type to connect to Common Data Service for Apps server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. 'AADServicePrincipal' for Server-To-Server authentication in online scenario, 'Active Directory' for Dynamics on-premises with IFD. Type: string (or Expression with resultType string)." }, "domain": { "type": "object",