From b5a1e8666b8ca4991ce49673731ae5142798c218 Mon Sep 17 00:00:00 2001 From: rnandurimsft <102784544+rnandurimsft@users.noreply.github.com> Date: Fri, 1 Apr 2022 11:39:48 +0530 Subject: [PATCH 01/11] Updating Dataworld in custom words file --- custom-words.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index 87ccbffef54f..007418c13976 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2513,4 +2513,5 @@ IAASVM Quickbase Smartsheet Qualys -servermetrics \ No newline at end of file +servermetrics +Dataworld From 0dcc81e8f01610ffa9d58f7e63404ad59082dbc7 Mon Sep 17 00:00:00 2001 From: rnandurimsft <102784544+rnandurimsft@users.noreply.github.com> Date: Fri, 1 Apr 2022 11:50:01 +0530 Subject: [PATCH 02/11] Updating Linkedservice details with Dataworld information --- .../2018-06-01/entityTypes/LinkedService.json | 37 +++++++++++++++++++ 1 file changed, 37 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 41e137ce03f2..9ca204419a2a 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 @@ -3214,6 +3214,43 @@ "url" ] }, + "DataworldLinkedService": { + "x-ms-discriminator-value": "Dataworld", + "description": "Linked service for Dataworld.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "Dataworld linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/DataworldLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "DataworldLinkedServiceTypeProperties": { + "description": "Dataworld linked service type properties.", + "type": "object", + "properties": { + "apiToken": { + "$ref": "../datafactory.json#/definitions/SecretBase", + "description": "The api token for the Dataworld source." + }, + "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)." + } + }, + "required": [ + "apiToken" + ] + }, "AmazonRedshiftLinkedService": { "x-ms-discriminator-value": "AmazonRedshift", "description": "Linked service for Amazon Redshift.", From 1df32fee613c22c41fa939da11be62ac74ce3f6b Mon Sep 17 00:00:00 2001 From: rnandurimsft <102784544+rnandurimsft@users.noreply.github.com> Date: Tue, 5 Apr 2022 09:57:52 +0530 Subject: [PATCH 03/11] Update LinkedService.json --- .../2020-12-01/entityTypes/LinkedService.json | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) 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 5bfe733d7b6b..df5d1180da8e 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 @@ -2977,6 +2977,43 @@ "url" ] }, + "DataworldLinkedService": { + "x-ms-discriminator-value": "Dataworld", + "description": "Linked service for Dataworld.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "Dataworld linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/DataworldLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "DataworldLinkedServiceTypeProperties": { + "description": "Dataworld linked service type properties.", + "type": "object", + "properties": { + "apiToken": { + "$ref": "../datafactory.json#/definitions/SecretBase", + "description": "The api token for the Dataworld source." + }, + "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)." + } + }, + "required": [ + "apiToken" + ] + }, "AmazonS3LinkedService": { "x-ms-discriminator-value": "AmazonS3", "description": "Linked service for Amazon S3.", From 83580d7c6b5a024d54bd86ed3ba5fd5c6edd9c28 Mon Sep 17 00:00:00 2001 From: Aravind Reddy Date: Tue, 5 Apr 2022 11:09:25 +0530 Subject: [PATCH 04/11] Asana Swagger changes --- custom-words.txt | 1 + .../2018-06-01/entityTypes/LinkedService.json | 37 +++++++++++++++++++ .../2020-12-01/entityTypes/LinkedService.json | 37 +++++++++++++++++++ 3 files changed, 75 insertions(+) diff --git a/custom-words.txt b/custom-words.txt index 007418c13976..5d954003f05b 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2515,3 +2515,4 @@ Smartsheet Qualys servermetrics Dataworld +Asana \ No newline at end of file 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 9ca204419a2a..bb6a97052a2f 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 @@ -3251,6 +3251,43 @@ "apiToken" ] }, + "AsanaLinkedService": { + "x-ms-discriminator-value": "Asana", + "description": "Linked service for Asana.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "Asana linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AsanaLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "AsanaLinkedServiceTypeProperties": { + "description": "Asana linked service type properties.", + "type": "object", + "properties": { + "apiToken": { + "$ref": "../datafactory.json#/definitions/SecretBase", + "description": "The api token for the Asana source." + }, + "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)." + } + }, + "required": [ + "apiToken" + ] + }, "AmazonRedshiftLinkedService": { "x-ms-discriminator-value": "AmazonRedshift", "description": "Linked service for Amazon Redshift.", 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 df5d1180da8e..b31e7d814e7d 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 @@ -3014,6 +3014,43 @@ "apiToken" ] }, + "AsanaLinkedService": { + "x-ms-discriminator-value": "Asana", + "description": "Linked service for Asana.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "Asana linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AsanaLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "AsanaLinkedServiceTypeProperties": { + "description": "Asana linked service type properties.", + "type": "object", + "properties": { + "apiToken": { + "$ref": "../artifacts.json#/definitions/SecretBase", + "description": "The api token for the Asana source." + }, + "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)." + } + }, + "required": [ + "apiToken" + ] + }, "AmazonS3LinkedService": { "x-ms-discriminator-value": "AmazonS3", "description": "Linked service for Amazon S3.", From 34e836253342fb895d3ebfac3e42597b7c64c659 Mon Sep 17 00:00:00 2001 From: Priyadarshi Ghosh Date: Tue, 5 Apr 2022 17:29:27 +0530 Subject: [PATCH 05/11] swagger changes for appfigures --- custom-words.txt | 3 +- .../2018-06-01/entityTypes/LinkedService.json | 43 +++++++++++++++++++ .../2020-12-01/entityTypes/LinkedService.json | 43 +++++++++++++++++++ 3 files changed, 88 insertions(+), 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index 5d954003f05b..2ca7d0fb3939 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2515,4 +2515,5 @@ Smartsheet Qualys servermetrics Dataworld -Asana \ No newline at end of file +Asana +AppFigures \ No newline at end of file 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 bb6a97052a2f..3f1bad375e14 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 @@ -3251,6 +3251,49 @@ "apiToken" ] }, + "AppFiguresLinkedService": { + "x-ms-discriminator-value": "AppFigures", + "description": "Linked service for AppFigures.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "AppFigures linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AppFiguresLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "AppFiguresLinkedServiceTypeProperties": { + "description": "AppFigures linked service type properties.", + "type": "object", + "properties": { + "userName": { + "type": "object", + "description": "The username of the Appfigures source." + }, + "password": { + "description": "The password of the AppFigures source.", + "$ref": "../datafactory.json#/definitions/SecretBase" + }, + "clientKey": { + "$ref": "../datafactory.json#/definitions/SecretBase", + "description": "The client key for the AppFigures source." + } + }, + "required": [ + "userName", + "password", + "clientKey" + ] + }, "AsanaLinkedService": { "x-ms-discriminator-value": "Asana", "description": "Linked service for Asana.", 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 b31e7d814e7d..4c0eff3acca0 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 @@ -3014,6 +3014,49 @@ "apiToken" ] }, + "AppFiguresLinkedService": { + "x-ms-discriminator-value": "AppFigures", + "description": "Linked service for AppFigures.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "AppFigures linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AppFiguresLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "AppFiguresLinkedServiceTypeProperties": { + "description": "AppFigures linked service type properties.", + "type": "object", + "properties": { + "userName": { + "type": "object", + "description": "The username of the Appfigures source." + }, + "password": { + "description": "The password of the AppFigures source.", + "$ref": "../artifacts.json#/definitions/SecretBase" + }, + "clientKey": { + "$ref": "../artifacts.json#/definitions/SecretBase", + "description": "The client key for the AppFigures source." + } + }, + "required": [ + "userName", + "password", + "clientKey" + ] + }, "AsanaLinkedService": { "x-ms-discriminator-value": "Asana", "description": "Linked service for Asana.", From d4de59eec0d02f98fa6074f64ee5258509fc1a94 Mon Sep 17 00:00:00 2001 From: rnandurimsft <102784544+rnandurimsft@users.noreply.github.com> Date: Wed, 6 Apr 2022 11:36:49 +0530 Subject: [PATCH 06/11] Update LinkedService.json --- .../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 4c0eff3acca0..62a000df332a 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 @@ -3002,7 +3002,7 @@ "type": "object", "properties": { "apiToken": { - "$ref": "../datafactory.json#/definitions/SecretBase", + "$ref": "../artifacts.json#/definitions/SecretBase", "description": "The api token for the Dataworld source." }, "encryptedCredential": { From 71efecd47d660db83f2cc971f33ad17492dc3396 Mon Sep 17 00:00:00 2001 From: mshrivastavamsft <103027908+mshrivastavamsft@users.noreply.github.com> Date: Thu, 7 Apr 2022 12:11:27 +0530 Subject: [PATCH 07/11] Twilio linked service changes for datafactory --- .../2018-06-01/entityTypes/LinkedService.json | 38 +++++++++++++++++++ 1 file changed, 38 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 3f1bad375e14..b664d1f423b4 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 @@ -3331,6 +3331,44 @@ "apiToken" ] }, + "TwilioLinkedService": { + "x-ms-discriminator-value": "Twilio", + "description": "Linked service for Twilio.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "Twilio linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/TwilioLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "TwilioLinkedServiceTypeProperties": { + "description": "Twilio linked service type properties.", + "type": "object", + "properties": { + "userName": { + "type": "object", + "description": "The Account SID of Twilio service." + }, + "password": { + "description": "The auth token of Twilio service.", + "$ref": "../datafactory.json#/definitions/SecretBase" + }, + }, + "required": [ + "userName", + "password" + ] + }, "AmazonRedshiftLinkedService": { "x-ms-discriminator-value": "AmazonRedshift", "description": "Linked service for Amazon Redshift.", From 26a50631690d1112b391b9b776bb96ae7b0b88e9 Mon Sep 17 00:00:00 2001 From: mshrivastavamsft <103027908+mshrivastavamsft@users.noreply.github.com> Date: Thu, 7 Apr 2022 12:53:27 +0530 Subject: [PATCH 08/11] Synapse linked service changes for Twilio --- .../2020-12-01/entityTypes/LinkedService.json | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) 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 62a000df332a..0b0ccb4ac8cb 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 @@ -3094,6 +3094,44 @@ "apiToken" ] }, + "TwilioLinkedService": { + "x-ms-discriminator-value": "Twilio", + "description": "Linked service for Twilio.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "Twilio linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/TwilioLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "TwilioLinkedServiceTypeProperties": { + "description": "Twilio linked service type properties.", + "type": "object", + "properties": { + "userName": { + "type": "object", + "description": "The Account SID of Twilio service." + }, + "password": { + "description": "The auth token of Twilio service.", + "$ref": "../artifacts.json#/definitions/SecretBase" + } + }, + "required": [ + "userName", + "password" + ] + }, "AmazonS3LinkedService": { "x-ms-discriminator-value": "AmazonS3", "description": "Linked service for Amazon S3.", From 05a9ca66b2906268015931714acbef89b1f7ddd6 Mon Sep 17 00:00:00 2001 From: mshrivastavamsft <103027908+mshrivastavamsft@users.noreply.github.com> Date: Thu, 7 Apr 2022 12:55:44 +0530 Subject: [PATCH 09/11] Twilio custom-words.txt change --- custom-words.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index 2ca7d0fb3939..acb278f8c03b 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2516,4 +2516,5 @@ Qualys servermetrics Dataworld Asana -AppFigures \ No newline at end of file +AppFigures +Twilio From 66d0df3957336aad17bc073d325cb4150e5b170e Mon Sep 17 00:00:00 2001 From: rnandurimsft <102784544+rnandurimsft@users.noreply.github.com> Date: Fri, 8 Apr 2022 11:50:42 +0530 Subject: [PATCH 10/11] Resolving conflicts --- custom-words.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index acb278f8c03b..1f2cd039308f 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1,4 +1,4 @@ -A128CBCPAD +A128CBCPAD A192CBCPAD A256CBCPAD AADDS @@ -1526,6 +1526,7 @@ polyline poolusagemetrics popreceipt portalsettings +portalconfigs postbackup Postgre Postgres @@ -2492,6 +2493,8 @@ xvalue yvalue servermetrics IAASVM +Picometer +Petabit questionanswering napt Napt From d24a5af2c14ef5ce97fd9b89bfa32a1b4484b263 Mon Sep 17 00:00:00 2001 From: mshrivastavamsft <103027908+mshrivastavamsft@users.noreply.github.com> Date: Mon, 11 Apr 2022 10:34:00 +0530 Subject: [PATCH 11/11] removed extra comma --- .../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 b664d1f423b4..3c11538cdb7a 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 @@ -3362,7 +3362,7 @@ "password": { "description": "The auth token of Twilio service.", "$ref": "../datafactory.json#/definitions/SecretBase" - }, + } }, "required": [ "userName",