Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DataFactory] - Add CosmosDbSqlApi dataset #7242

Merged
merged 4 commits into from
Sep 24, 2019
Merged

[DataFactory] - Add CosmosDbSqlApi dataset #7242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cd2bf8
Added CosmosDbSqlApiV2 dataset
shawnxzq Sep 17, 2019
db7be0e
Improved comment according review comments
shawnxzq Sep 18, 2019
6fae19d
Replaced tabs with white spaces
shawnxzq Sep 18, 2019
8188f2e
Removed one property which won't be exposed to public for now
shawnxzq Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions ...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,6 +1012,38 @@
}
}
},
"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",
"description": "Microsoft Azure Document Database Collection dataset.",
Expand Down
17 changes: 11 additions & 6 deletions ...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,18 +482,23 @@
"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": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you make connection not required here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We added dedicated properties to include information which must be in connectionString before. So its's not required any more and it is still backward compatible.

"connectionString"
]
}
},
"DynamicsLinkedService": {
"x-ms-discriminator-value": "Dynamics",
Expand Down
40 changes: 39 additions & 1 deletion ...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,29 @@
}
}
},
"CosmosDbSqlApiSource": {
Juliehzl marked this conversation as resolved.
Show resolved Hide resolved
"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)."
}
}
},
"DynamicsSource": {
"description": "A copy activity Dynamics source.",
"type": "object",
Expand Down Expand Up @@ -2906,7 +2929,22 @@
},
"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."
}
}
},
"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. Type: string (or Expression with resultType string). Allowed values: insert and upsert."
}
}
},
Expand Down