[CosmosDB] Updated to version 2023-03-15-preview (#6462)

* [CosmosDB] Updated to version 2023-03-15-preview * Revert "[CosmosDB] Updated to version 2023-03-15-preview" This reverts commit fd9a8b8. * [CosmosDB] Updated to version 2023-03-15-preview * [CosmosDB] Updated to version 2023-03-15-preview * Save changes * adding materializedview option for container create and update * adding tests for cli extensions * modifying test to verify MV definition content in response * minor changes * fixing static analysis error * Save test recording * Save Recordings * Save changes * Save changes * Save Recordings * Save Recordings * Save Recordings * Update src/cosmosdb-preview/azext_cosmosdb_preview/_help.py Co-authored-by: Yishi Wang <[email protected]> * Save changes * Address code changes. --------- Co-authored-by: Chandrasekhar Gunturi <[email protected]> Co-authored-by: Yishi Wang <[email protected]>
Azure · Jul 28, 2023 · f1bb89b · f1bb89b
1 parent 2491e8d
commit f1bb89b
Show file tree

Hide file tree

Showing 142 changed files with 25,599 additions and 38,982 deletions.
diff --git a/src/cosmosdb-preview/HISTORY.rst b/src/cosmosdb-preview/HISTORY.rst
@@ -2,6 +2,10 @@
 
 Release History
 ===============
+0.25.0
+* Add support for performing database merge for Sql and MongoDB database account.
+
+++++++
 0.24.0
 * Create and manage mongo clusters.
 * Add 'source_backup_location' parameter to 'cosmosdb restore' command

diff --git a/src/cosmosdb-preview/azext_cosmosdb_preview/_help.py b/src/cosmosdb-preview/azext_cosmosdb_preview/_help.py
@@ -796,6 +796,24 @@
                az cosmosdb mongodb collection merge -g my-resource-group -a my-account -d my-db --name my-mongodb-collection
 """
 
+helps['cosmosdb sql database merge'] = """
+    type: command
+    short-summary: "Merge the partitions of a sql database."
+    examples:
+      - name: Merge partitions of database my-database
+        text: |-
+               az cosmosdb sql database merge -g my-resource-group -a my-account --name my-database
+"""
+
+helps['cosmosdb mongodb database merge'] = """
+    type: command
+    short-summary: "Merges the partitions of a mongodb database."
+    examples:
+      - name: merge partitions of database my-mongodb-database
+        text: |-
+               az cosmosdb mongodb database merge -g my-resource-group -a my-account --name my-mongodb-collection
+"""
+
 helps['cosmosdb sql container retrieve-partition-throughput'] = """
     type: command
     short-summary: "Retrieve  the partition throughput of a sql container."

diff --git a/src/cosmosdb-preview/azext_cosmosdb_preview/_params.py b/src/cosmosdb-preview/azext_cosmosdb_preview/_params.py
diff --git a/src/cosmosdb-preview/azext_cosmosdb_preview/commands.py b/src/cosmosdb-preview/azext_cosmosdb_preview/commands.py