From 6cd2bf8ae0b52a44365006e99a2936542cb9edd9 Mon Sep 17 00:00:00 2001 From: "Shawn Xiao (IM)" Date: Tue, 17 Sep 2019 19:06:51 +0800 Subject: [PATCH 1/3] Added CosmosDbSqlApiV2 dataset --- .../2018-06-01/entityTypes/Dataset.json | 32 ++++++++++++++ .../2018-06-01/entityTypes/LinkedService.json | 17 +++++--- .../2018-06-01/entityTypes/Pipeline.json | 42 +++++++++++++++++++ 3 files changed, 85 insertions(+), 6 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index f7a94e505a4e..708a00800bc4 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -1011,6 +1011,38 @@ "type": "object" } } + }, + "CosmosDbSqlApiCollectionDataset": { + "x-ms-discriminator-value": "CosmosDbSqlApiCollection", + "description": "Microsoft Azure CosmosDB (SQL API) Collection dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "CosmosDB (SQL API) Collection dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/CosmosDbSqlApiCollectionDatasetTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "CosmosDbSqlApiCollectionDatasetTypeProperties": { + "description": "CosmosDB (SQL API) Collection dataset properties.", + "properties": { + "collectionName": { + "type": "object", + "description": "CosmosDB (SQL API) collection name. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "collectionName" + ] }, "DocumentDbCollectionDataset": { "x-ms-discriminator-value": "DocumentDbCollection", 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 511e67689dc6..61712684f7cd 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 @@ -481,19 +481,24 @@ "connectionString": { "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", "type": "object" + }, + "accountEndpoint": { + "description": "The endpoint of the Azure CosmosDB account. Type: string (or Expression with resultType string)", + "type": "object" + }, + "database": { + "description": "The name of the database. Type: string (or Expression with resultType string)", + "type": "object" }, "accountKey": { - "$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference", - "description": "The Azure key vault secret reference of accountKey in connection string." + "$ref": "../datafactory.json#/definitions/SecretBase", + "description": "The account key of the Azure CosmosDB account. Type: SecureString or AzureKeyVaultSecretReference." }, "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": [ - "connectionString" - ] + } }, "DynamicsLinkedService": { "x-ms-discriminator-value": "Dynamics", 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 ab3bd70aa600..5aea9d00aa30 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 @@ -1050,6 +1050,33 @@ "description": "Nested properties separator. Type: string (or Expression with resultType string)." } } + }, + "CosmosDbSqlApiSource": { + "description": "A copy activity Azure CosmosDB (SQL API) Collection source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "query": { + "type": "object", + "description": "SQL API query. Type: string (or Expression with resultType string)." + }, + "pageSize": { + "type": "object", + "description": "Page size of the result. Type: integer (or Expression with resultType integer)." + }, + "preferredRegions": { + "type": "object", + "description": "Preferred regions. Type: array of strings (or Expression with resultType array of strings)." + }, + "includeSystemColumns": { + "type": "object", + "description": "Whether includes system columns in result. Type: boolean (or Expression with resultType boolean)." + } + } }, "DynamicsSource": { "description": "A copy activity Dynamics source.", @@ -2909,6 +2936,21 @@ "description": "Describes how to write data to Azure Cosmos DB. Allowed values: insert and upsert." } } + }, + "CosmosDbSqlApiSink": { + "description": "A copy activity Azure CosmosDB (SQL API) Collection sink.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySink" + } + ], + "properties": { + "writeBehavior": { + "type": "object", + "description": "Describes how to write data to Azure Cosmos DB. Allowed values: insert and upsert." + } + } }, "SqlSink": { "description": "A copy activity SQL sink.", From db7be0e5307b7fb42239ad5d2ba5bcbb499bffb6 Mon Sep 17 00:00:00 2001 From: "Shawn Xiao (IM)" Date: Wed, 18 Sep 2019 13:49:18 +0800 Subject: [PATCH 2/3] Improved comment according review comments --- .../stable/2018-06-01/entityTypes/Pipeline.json | 4 ++-- 1 file changed, 2 insertions(+), 2 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 5aea9d00aa30..8a197e0555ef 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 @@ -2933,7 +2933,7 @@ }, "writeBehavior": { "type": "object", - "description": "Describes how to write data to Azure Cosmos DB. Allowed values: insert and upsert." + "description": "Describes how to write data to Azure Cosmos DB. Type: string (or Expression with resultType string). Allowed values: insert and upsert." } } }, @@ -2948,7 +2948,7 @@ "properties": { "writeBehavior": { "type": "object", - "description": "Describes how to write data to Azure Cosmos DB. Allowed values: insert and upsert." + "description": "Describes how to write data to Azure Cosmos DB. Type: string (or Expression with resultType string). Allowed values: insert and upsert." } } }, From 6fae19de3677b49e0f9398d8d2bf3dd0453447fe Mon Sep 17 00:00:00 2001 From: "Shawn Xiao (IM)" Date: Wed, 18 Sep 2019 14:00:34 +0800 Subject: [PATCH 3/3] Replaced tabs with white spaces --- .../stable/2018-06-01/entityTypes/Dataset.json | 2 +- .../stable/2018-06-01/entityTypes/LinkedService.json | 4 ++-- .../stable/2018-06-01/entityTypes/Pipeline.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index 708a00800bc4..50d116ec4d6c 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -1012,7 +1012,7 @@ } } }, - "CosmosDbSqlApiCollectionDataset": { + "CosmosDbSqlApiCollectionDataset": { "x-ms-discriminator-value": "CosmosDbSqlApiCollection", "description": "Microsoft Azure CosmosDB (SQL API) Collection dataset.", "type": "object", 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 61712684f7cd..0b6e9dcdb77a 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 @@ -482,11 +482,11 @@ "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", "type": "object" }, - "accountEndpoint": { + "accountEndpoint": { "description": "The endpoint of the Azure CosmosDB account. Type: string (or Expression with resultType string)", "type": "object" }, - "database": { + "database": { "description": "The name of the database. Type: string (or Expression with resultType string)", "type": "object" }, 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 8a197e0555ef..735b64dd0707 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 @@ -1051,7 +1051,7 @@ } } }, - "CosmosDbSqlApiSource": { + "CosmosDbSqlApiSource": { "description": "A copy activity Azure CosmosDB (SQL API) Collection source.", "type": "object", "allOf": [ @@ -2937,7 +2937,7 @@ } } }, - "CosmosDbSqlApiSink": { + "CosmosDbSqlApiSink": { "description": "A copy activity Azure CosmosDB (SQL API) Collection sink.", "type": "object", "allOf": [