Add CosmosDB RP API Version 2024-09-01-preview

src/cosmosdb-preview/HISTORY.rst

@@ -2,7 +2,10 @@
 
 Release History
 ===============
+1.1.0b1
+* Add support for Mongo (vCore) destination in container copy jobs.
 
++++++++
 1.0.1
 * Add support for CapacityMode in Global Database Accounts
 * Add support for DistributedQuery flag in SqlDedicatedGateway

src/cosmosdb-preview/azext_cosmosdb_preview/_help.py

@@ -824,6 +824,13 @@
             Usage: --dest-mongo database=XX collection=XX'
             database: Database name.
             collection: Collection name.
+      - name: --dest-mongo-vcore
+        short-summary: "Destination Mongo(vCore) collection"
+        long-summary: |
+            Usage: --dest-mongo-vcore database=XX collection=XX connectionStringKeyVaultUri=XX'
+            database: Database name.
+            collection: Collection name.
+            connectionStringKeyVaultUri: Link to Azure KeyVault secret containing connection string.
 
     examples:
       - name: Copy Azure Cosmos DB API for NoSQL container in same account
@@ -838,6 +845,9 @@
       - name: Copy Azure Cosmos DB API for MongoDB collection
         text: |-
           az cosmosdb copy create -g "rg1" --job-name "j1" --src-account "acc1" --dest-account "acc1" --src-mongo database=d1 collection=c1 --dest-mongo database=d2 collection=c2
+      - name: Copy Azure Cosmos DB API from MongoDB(RU) collection to Mongo(vCore) collection
+        text: |-
+          az cosmosdb copy create -g "rg1" --job-name "j1" --src-account "acc1" --src-mongo database=d1 collection=c1 --dest-mongo-vcore database=d2 collection=c2 connectionStringKeyVaultUri=<link_to_Azure_KeyVault_secret>
 """
 
 helps['cosmosdb copy list'] = """

src/cosmosdb-preview/azext_cosmosdb_preview/_params.py

@@ -23,6 +23,7 @@
     CreateTableRestoreResource,
     AddCassandraTableAction,
     AddMongoCollectionAction,
+    AddMongoVCoreCollectionAction,
     AddSqlContainerAction,
     CreateTargetPhysicalPartitionThroughputInfoAction,
     CreateSourcePhysicalPartitionThroughputInfoAction,
@@ -468,10 +469,11 @@ def load_arguments(self, _):
         c.argument('src_account', help='Name of the Azure Cosmos DB source database account.', completer=get_resource_name_completion_list('Microsoft.DocumentDb/databaseAccounts'), id_part='name')
         c.argument('dest_account', help='Name of the Azure Cosmos DB destination database account.', completer=get_resource_name_completion_list('Microsoft.DocumentDb/databaseAccounts'), id_part='name')
         c.argument('src_cassandra', nargs='+', arg_group='Azure Cosmos DB API for Apache Cassandra table copy', action=AddCassandraTableAction, help='Source Cassandra table details')
-        c.argument('src_mongo', nargs='+', arg_group='Azure Cosmos DB API for MongoDB collection copy', action=AddMongoCollectionAction, help='Source Mongo collection details')
+        c.argument('src_mongo', nargs='+', arg_group='Azure Cosmos DB API for MongoDB (RU) collection copy', action=AddMongoCollectionAction, help='Source Mongo collection details')
         c.argument('src_nosql', nargs='+', arg_group='Azure Cosmos DB API for NoSQL container copy', action=AddSqlContainerAction, help='Source NoSql container details')
         c.argument('dest_cassandra', nargs='+', arg_group='Azure Cosmos DB API for Apache Cassandra table copy', action=AddCassandraTableAction, help='Destination Cassandra table details')
-        c.argument('dest_mongo', nargs='+', arg_group='Azure Cosmos DB API for MongoDB collection copy', action=AddMongoCollectionAction, help='Destination Mongo collection details')
+        c.argument('dest_mongo', nargs='+', arg_group='Azure Cosmos DB API for MongoDB (RU) collection copy', action=AddMongoCollectionAction, help='Destination Mongo collection details')
+        c.argument('dest_mongo_vcore', nargs='+', arg_group='Azure Cosmos DB API for MongoDB (vCore) collection copy', action=AddMongoVCoreCollectionAction, help='Destination Mongo vCore collection details')
         c.argument('dest_nosql', nargs='+', arg_group='Azure Cosmos DB API for NoSQL container copy', action=AddSqlContainerAction, help='Destination NoSql container details')
         c.argument('host_copy_on_src', arg_type=get_three_state_flag(), help=argparse.SUPPRESS)
         c.argument('worker_count', type=int, help=argparse.SUPPRESS)

src/cosmosdb-preview/azext_cosmosdb_preview/actions.py

@@ -14,6 +14,7 @@
     GremlinDatabaseRestoreResource,
     CosmosCassandraDataTransferDataSourceSink,
     CosmosMongoDataTransferDataSourceSink,
+    CosmosMongoVCoreDataTransferDataSourceSink,
     CosmosSqlDataTransferDataSourceSink,
     PhysicalPartitionThroughputInfoResource,
     PhysicalPartitionId
@@ -184,6 +185,54 @@ def __call__(self, parser, namespace, values, option_string=None):
             namespace.mongo_collection = mongo_collection
 
 
+class AddMongoVCoreCollectionAction(argparse._AppendAction):
+    def __call__(self, parser, namespace, values, option_string=None):
+        if not values:
+            # pylint: disable=line-too-long
+            raise CLIError(f'usage error: {option_string} [KEY=VALUE ...]')
+
+        database_name = None
+        collection_name = None
+        host_name = None
+        connection_string_key_vault_uri = None
+
+        for (k, v) in (x.split('=', 1) for x in values):
+            kl = k.lower()
+            if kl == 'database':
+                database_name = v
+
+            elif kl == 'collection':
+                collection_name = v
+
+            elif kl == 'hostname':
+                host_name = v
+
+            elif kl == 'connectionstringkeyvaulturi':
+                connection_string_key_vault_uri = v
+
+            else:
+                raise CLIError(
+                    f'Unsupported Key {k} is provided for {option_string} component. All'
+                    ' possible keys are: database, collection, hostname, connectionstringkeyvaulturi'
+                )
+
+        if database_name is None:
+            raise CLIError(f'usage error: missing key database in {option_string} component')
+
+        if collection_name is None:
+            raise CLIError(f'usage error: missing key collection in {option_string} component')
+
+        if host_name is None and connection_string_key_vault_uri is None:
+            raise CLIError(f'usage error: missing keys hostName and connectionStringKeyVaultUri in {option_string} component')
+
+        mongo_vcore_collection = CosmosMongoVCoreDataTransferDataSourceSink(database_name=database_name, collection_name=collection_name, host_name=host_name, connection_string_key_vault_uri=connection_string_key_vault_uri)
+
+        if option_string == "--dest-mongo-vcore":
+            namespace.dest_mongo_vcore = mongo_vcore_collection
+        else:
+            namespace.mongo_vcore_collection = mongo_vcore_collection
+
+
 class AddSqlContainerAction(argparse._AppendAction):
     def __call__(self, parser, namespace, values, option_string=None):
         if not values:

src/cosmosdb-preview/azext_cosmosdb_preview/custom.py

@@ -1675,21 +1675,26 @@ def cosmosdb_data_transfer_copy_job(client,
 
 def cosmosdb_copy_job(client,
                       resource_group_name,
-                      dest_account,
                       src_account,
+                      dest_account=None,
                       src_cassandra=None,
                       dest_cassandra=None,
                       src_nosql=None,
                       dest_nosql=None,
                       src_mongo=None,
                       dest_mongo=None,
+                      dest_mongo_vcore=None,
                       job_name=None,
                       worker_count=0,
                       host_copy_on_src=False,
                       mode="Offline"):
     job_create_properties = {}
-    is_cross_account = src_account != dest_account
+    if dest_account is None and dest_mongo_vcore is None:
+        raise CLIError('Invalid input: dest_account is a required parameter')
+
+    is_cross_account = False if dest_mongo_vcore is not None else src_account != dest_account
     remote_account_name = dest_account if host_copy_on_src else src_account
+    host_account_name = src_account if (dest_mongo_vcore is not None or host_copy_on_src) else dest_account
 
     source = None
     if src_cassandra is not None:
@@ -1746,6 +1751,11 @@ def cosmosdb_copy_job(client,
         else:
             destination = dest_mongo
 
+    if dest_mongo_vcore is not None:
+        if destination is not None:
+            raise CLIError('Invalid input: multiple destination components')
+        destination = dest_mongo_vcore
+
     if destination is None:
         raise CLIError('destination component is missing')
     job_create_properties['destination'] = destination
@@ -1761,8 +1771,6 @@ def cosmosdb_copy_job(client,
     if job_name is None:
         job_name = _gen_guid()
 
-    host_account_name = src_account if host_copy_on_src else dest_account
-
     return client.create(resource_group_name=resource_group_name,
                          account_name=host_account_name,
                          job_name=job_name,