From 28b46c34eca3152c953907e16326351541922180 Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Mon, 1 Jul 2024 21:51:39 +0530 Subject: [PATCH 01/11] support Vertica V2 in ADF --- .../2018-06-01/entityTypes/LinkedService.json | 32 ++++++++++++++++--- 1 file changed, 28 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 22a1f81ad6e5..cff55535eb15 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 @@ -6708,18 +6708,42 @@ "description": "Vertica linked service properties.", "type": "object", "properties": { + "version": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "The version of the Vertica driver. Type: string." + }, "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", + "type": "object" + }, + "server": { "type": "object", - "x-ms-format": "dfe-string" + "x-ms-format": "dfe-string", + "description": "Server name for connection. Type: string." }, - "pwd": { + "port": { + "type": "object", + "x-ms-format": "dfe-int", + "description": "The port for the connection. Type: integer." + }, + "username": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "Username for authentication. Type: string." + }, + "database": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "Database name for connection. Type: string." + }, + "password": { "$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference", "description": "The Azure key vault secret reference of password in connection string." }, "encryptedCredential": { - "type": "string", - "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string." + "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).", + "type": "object" } } }, From c9b63ee392df82b12f5f6225b5d2440f265abaef Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Mon, 1 Jul 2024 22:09:18 +0530 Subject: [PATCH 02/11] Update LinkedService.json in synapse --- .../2020-12-01/entityTypes/LinkedService.json | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) 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..53cb35d11c88 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 @@ -6161,12 +6161,37 @@ "description": "Vertica linked service properties.", "type": "object", "properties": { + "version": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "The version of the Vertica driver. Type: string." + }, "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", "type": "object" }, - "pwd": { - "$ref": "../artifacts.json#/definitions/AzureKeyVaultSecretReference", + "server": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "Server name for connection. Type: string." + }, + "port": { + "type": "object", + "x-ms-format": "dfe-int", + "description": "The port for the connection. Type: integer." + }, + "username": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "Username for authentication. Type: string." + }, + "database": { + "type": "object", + "x-ms-format": "dfe-string", + "description": "Database name for connection. Type: string." + }, + "password": { + "$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference", "description": "The Azure key vault secret reference of password in connection string." }, "encryptedCredential": { From d7237f1a2eb1c013d9ebf202343d4bc4ac112ca0 Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Mon, 1 Jul 2024 22:11:10 +0530 Subject: [PATCH 03/11] updating password --- .../stable/2020-12-01/entityTypes/LinkedService.json | 2 +- 1 file changed, 1 insertion(+), 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 53cb35d11c88..db3b4230d790 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 @@ -6191,7 +6191,7 @@ "description": "Database name for connection. Type: string." }, "password": { - "$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference", + "$ref": "../artifacts.json#/definitions/AzureKeyVaultSecretReference", "description": "The Azure key vault secret reference of password in connection string." }, "encryptedCredential": { From 98e87ef63cdc9980a361d76768742cf2a43bb680 Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:09:17 +0530 Subject: [PATCH 04/11] Update LinkedService.json --- .../stable/2020-12-01/entityTypes/LinkedService.json | 5 ----- 1 file changed, 5 deletions(-) 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 db3b4230d790..c47afb26be37 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 @@ -6163,7 +6163,6 @@ "properties": { "version": { "type": "object", - "x-ms-format": "dfe-string", "description": "The version of the Vertica driver. Type: string." }, "connectionString": { @@ -6172,22 +6171,18 @@ }, "server": { "type": "object", - "x-ms-format": "dfe-string", "description": "Server name for connection. Type: string." }, "port": { "type": "object", - "x-ms-format": "dfe-int", "description": "The port for the connection. Type: integer." }, "username": { "type": "object", - "x-ms-format": "dfe-string", "description": "Username for authentication. Type: string." }, "database": { "type": "object", - "x-ms-format": "dfe-string", "description": "Database name for connection. Type: string." }, "password": { From fc519bda480f69b8e68c8c9144c857ec53d90cbd Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:16:19 +0530 Subject: [PATCH 05/11] Update LinkedService.json --- .../stable/2018-06-01/entityTypes/LinkedService.json | 5 ----- 1 file changed, 5 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 cff55535eb15..a9a1690d3de5 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 @@ -6708,11 +6708,6 @@ "description": "Vertica linked service properties.", "type": "object", "properties": { - "version": { - "type": "object", - "x-ms-format": "dfe-string", - "description": "The version of the Vertica driver. Type: string." - }, "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", "type": "object" From a288ef416f43bcc02b67da55802aace3e0768170 Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:17:22 +0530 Subject: [PATCH 06/11] Update LinkedService.json --- .../stable/2020-12-01/entityTypes/LinkedService.json | 4 ---- 1 file changed, 4 deletions(-) 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 c47afb26be37..e80828ddba20 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 @@ -6161,10 +6161,6 @@ "description": "Vertica linked service properties.", "type": "object", "properties": { - "version": { - "type": "object", - "description": "The version of the Vertica driver. Type: string." - }, "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", "type": "object" From f25c510d2b1c539825ee4d04e8d02b73e61034af Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:46:43 +0530 Subject: [PATCH 07/11] Update LinkedService.json --- .../stable/2018-06-01/entityTypes/LinkedService.json | 4 ++-- 1 file changed, 2 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 a9a1690d3de5..1b1e78743c2d 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 @@ -6722,7 +6722,7 @@ "x-ms-format": "dfe-int", "description": "The port for the connection. Type: integer." }, - "username": { + "uid": { "type": "object", "x-ms-format": "dfe-string", "description": "Username for authentication. Type: string." @@ -6732,7 +6732,7 @@ "x-ms-format": "dfe-string", "description": "Database name for connection. Type: string." }, - "password": { + "pwd": { "$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference", "description": "The Azure key vault secret reference of password in connection string." }, From 94f1af73373fcfa5b84c42bb23578e2b146c025c Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:48:53 +0530 Subject: [PATCH 08/11] Update LinkedService.json --- .../stable/2020-12-01/entityTypes/LinkedService.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e80828ddba20..828d2be006fa 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 @@ -6173,7 +6173,7 @@ "type": "object", "description": "The port for the connection. Type: integer." }, - "username": { + "uid": { "type": "object", "description": "Username for authentication. Type: string." }, @@ -6181,7 +6181,7 @@ "type": "object", "description": "Database name for connection. Type: string." }, - "password": { + "pwd": { "$ref": "../artifacts.json#/definitions/AzureKeyVaultSecretReference", "description": "The Azure key vault secret reference of password in connection string." }, From 8832dd36a67c69c5608174d643a14cbf99918099 Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:34:38 +0530 Subject: [PATCH 09/11] Update LinkedService.json --- .../stable/2018-06-01/entityTypes/LinkedService.json | 4 ++-- 1 file changed, 2 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 1b1e78743c2d..1da41c720dc3 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 @@ -6737,8 +6737,8 @@ "description": "The Azure key vault secret reference of password in connection string." }, "encryptedCredential": { - "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).", - "type": "object" + "type": "string", + "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string.", } } }, From 0e8e1fd998f8ea7e00b8e5f863eeeb95e3bd7932 Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:36:16 +0530 Subject: [PATCH 10/11] Update LinkedService.json --- .../stable/2018-06-01/entityTypes/LinkedService.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1da41c720dc3..1222144ea274 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 @@ -6738,7 +6738,7 @@ }, "encryptedCredential": { "type": "string", - "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string.", + "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string." } } }, From b5f479509881473637c5a64195fadbd5097af67f Mon Sep 17 00:00:00 2001 From: ms-kanikagupta <166607519+kanikagupta11@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:28:45 +0530 Subject: [PATCH 11/11] Update LinkedService.json --- .../stable/2018-06-01/entityTypes/LinkedService.json | 1 + 1 file changed, 1 insertion(+) 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 1222144ea274..47b6ad103aea 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 @@ -6710,6 +6710,7 @@ "properties": { "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", + "x-ms-format": "dfe-string", "type": "object" }, "server": {