Merge pull request #186 from AzureArcForKubernetes/release-1.3.6

Release 1.3.6

.github/CODEOWNERS

@@ -249,3 +249,7 @@
 /src/traffic-collector/ @rmodh @japani @kukulkarni1
 
 /src/nginx/ @liftr-nginx
+
+/src/elastic-san/ @calvinhzy
+
+/src/reservation/ @gaoyp830 @rkapso @msft-adrianma @sornaks @juhee0202

src/connectedk8s/HISTORY.rst

@@ -2,6 +2,11 @@
 
 Release History
 ===============
+1.3.4
+++++++
+
+* Fixed a proxy related bug in connectedk8s upgrade
+
 1.3.3
 ++++++
 

src/connectedk8s/azext_connectedk8s/custom.py

@@ -1232,6 +1232,7 @@ def upgrade_agents(cmd, client, resource_group_name, cluster_name, kube_config=N
             if key == "global.isProxyEnabled":
                 proxy_enabled_param_added = True
             if (key == "global.httpProxy" or key == "global.httpsProxy" or key == "global.noProxy"):
+                value = escape_proxy_settings(value)
                 if value and not proxy_enabled_param_added:
                     cmd_helm_upgrade.extend(["--set", "global.isProxyEnabled={}".format(True)])
                     proxy_enabled_param_added = True

src/connectedk8s/setup.py

@@ -17,7 +17,7 @@
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
 
-VERSION = '1.3.3'
+VERSION = '1.3.4'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

src/cosmosdb-preview/HISTORY.rst

@@ -6,6 +6,11 @@ Release History
 ++++++
 * Modify parameter for Managed Identity name.
 
+0.19.0
+++++++
+* Add support for performing in-account restore of deleted databases and containers for a Sql database account.
+* Add support for performing in-account restore of deleted databases and collections for a MongoDB database account.
+
 0.18.0
 ++++++
 * Add support for retrieving and redistributing throughput at physical partition level.

src/cosmosdb-preview/README.md

@@ -262,3 +262,37 @@ az cosmosdb service delete \
     --account-name "MyAccount" 
     --name "MaterializedViewsBuilder" \
 ```
+
+#### Restore a deleted database within same account for a Sql database account ####
+
+```sh
+az cosmosdb sql database restore --account-name "account-name" \
+    --name "database-name"
+    --restore-timestamp "2020-07-20T16:09:53+0000" \
+```
+
+#### Restore a deleted container within same account for a Sql database account ####
+
+```sh
+az cosmosdb sql container restore --account-name "account-name" \
+    --database-name "database-name"
+    --name "container-name"
+    --restore-timestamp "2020-07-20T16:09:53+0000" \
+```
+
+#### Restore a deleted database within same account for a MongoDB database account ####
+
+```sh
+az cosmosdb mongodb database restore --account-name "account-name" \
+    --name "database-name"
+    --restore-timestamp "2020-07-20T16:09:53+0000" \
+```
+
+#### Restore a deleted collection within same account for a MongoDB database account ####
+
+```sh
+az cosmosdb mongodb collection restore --account-name "account-name" \
+    --database-name "database-name"
+    --collection-name "collection-name"
+    --restore-timestamp "2020-07-20T16:09:53+0000" \
+```

src/cosmosdb-preview/azext_cosmosdb_preview/_help.py

@@ -692,3 +692,43 @@
         text: |-
                az cosmosdb mongodb collection redistribute-partition-throughput --account-name account_name --database-name db_name --name container_name  --resource-group rg_name --target-partition-info 8=1200 6=1200' --source-partition-info 9'
 """
+
+# in-account restore of a deleted sql database
+helps['cosmosdb sql database restore'] = """
+    type: command
+    short-summary: "Restore a deleted sql database within the same account."
+    examples:
+      - name: Restore a deleted sql database within the same account.
+        text: |-
+               az cosmosdb sql database restore --resource-group resource_group --account-name database_account_name --name name_of_database_needs_to_be_restored --restore-timestamp 2020-07-13T16:03:41+0000
+"""
+
+# in-account restore of a deleted sql container
+helps['cosmosdb sql container restore'] = """
+    type: command
+    short-summary: "Restore a deleted sql container within the same account."
+    examples:
+      - name: Restore a deleted sql container within the same account.
+        text: |-
+               az cosmosdb sql container restore --resource-group resource_group --account-name database_account_name --database-name parent_database_name --name name_of_container_needs_to_be_restored --restore-timestamp 2020-07-13T16:03:41+0000
+"""
+
+# in-account restore of a deleted mongodb database
+helps['cosmosdb mongodb database restore'] = """
+    type: command
+    short-summary: "Restore a deleted mongodb database within the same account."
+    examples:
+      - name: Restore a deleted mongodb database within the same account.
+        text: |-
+               az cosmosdb mongodb database restore --resource-group resource_group --account-name database_account_name --name name_of_database_needs_to_be_restored --restore-timestamp 2020-07-13T16:03:41+0000
+"""
+
+# in-account restore of a deleted mongodb collection
+helps['cosmosdb mongodb collection restore'] = """
+    type: command
+    short-summary: "Restore a deleted mongodb collection within the same account."
+    examples:
+      - name: Restore a deleted mongodb collection within the same account.
+        text: |-
+               az cosmosdb mongodb collection restore --resource-group resource_group --account-name database_account_name --database-name parent_database_name --name name_of_collection_needs_to_be_restored --restore-timestamp 2020-07-13T16:03:41+0000
+"""

src/cosmosdb-preview/azext_cosmosdb_preview/_params.py

@@ -371,3 +371,29 @@ def load_arguments(self, _):
         c.argument('evenly_distribute', arg_type=get_three_state_flag(), help="switch to distribute throughput equally among all physical partitions")
         c.argument('target_partition_info', nargs='+', action=CreateTargetPhysicalPartitionThroughputInfoAction, required=False, help="information about desired target physical partition throughput eg: '0=1200 1=1200'")
         c.argument('source_partition_info', nargs='+', action=CreateSourcePhysicalPartitionThroughputInfoAction, required=False, help="space separated source physical partition ids eg: 1 2")
+
+    # SQL database restore
+    with self.argument_context('cosmosdb sql database restore') as c:
+        c.argument('account_name', account_name_type, id_part=None, required=True)
+        c.argument('database_name', options_list=['--name', '-n'], help="Database name", required=True)
+        c.argument('restore_timestamp', options_list=['--restore-timestamp', '-t'], action=UtcDatetimeAction, help="The timestamp to which the database needs to be restored to.", required=True)
+
+    # SQL collection restore
+    with self.argument_context('cosmosdb sql container restore') as c:
+        c.argument('account_name', account_name_type, id_part=None, required=True)
+        c.argument('database_name', database_name_type, required=True)
+        c.argument('container_name', options_list=['--name', '-n'], help="Container name", required=True)
+        c.argument('restore_timestamp', options_list=['--restore-timestamp', '-t'], action=UtcDatetimeAction, help="The timestamp to which the container needs to be restored to.", required=True)
+
+    # MongoDB database restore
+    with self.argument_context('cosmosdb mongodb database restore') as c:
+        c.argument('account_name', account_name_type, id_part=None, required=True)
+        c.argument('database_name', options_list=['--name', '-n'], help="Database name", required=True)
+        c.argument('restore_timestamp', options_list=['--restore-timestamp', '-t'], action=UtcDatetimeAction, help="The timestamp to which the database needs to be restored to.", required=True)
+
+    # MongoDB collection restore
+    with self.argument_context('cosmosdb mongodb collection restore') as c:
+        c.argument('account_name', account_name_type, id_part=None, required=True)
+        c.argument('database_name', database_name_type, required=True)
+        c.argument('collection_name', options_list=['--name', '-n'], help="Collection name", required=True)
+        c.argument('restore_timestamp', options_list=['--restore-timestamp', '-t'], action=UtcDatetimeAction, help="The timestamp to which the collection needs to be restored to.", required=True)

src/cosmosdb-preview/azext_cosmosdb_preview/commands.py

@@ -219,3 +219,15 @@ def load_command_table(self, _):
     # Redistribute partition throughput for Mongo collection
     with self.command_group('cosmosdb mongodb collection', cosmosdb_mongo_sdk, client_factory=cf_mongo_db_resources) as g:
         g.custom_command('redistribute-partition-throughput', 'cli_begin_redistribute_mongo_container_partition_throughput', is_preview=True)
+
+    with self.command_group('cosmosdb sql database', cosmosdb_sql_sdk, client_factory=cf_sql_resources) as g:
+        g.custom_command('restore', 'cli_cosmosdb_sql_database_restore', is_preview=True)
+
+    with self.command_group('cosmosdb sql container', cosmosdb_sql_sdk, client_factory=cf_sql_resources) as g:
+        g.custom_command('restore', 'cli_cosmosdb_sql_container_restore', is_preview=True)
+
+    with self.command_group('cosmosdb mongodb database', cosmosdb_mongo_sdk, client_factory=cf_mongo_db_resources) as g:
+        g.custom_command('restore', 'cli_cosmosdb_mongodb_database_restore', is_preview=True)
+
+    with self.command_group('cosmosdb mongodb collection', cosmosdb_mongo_sdk, client_factory=cf_mongo_db_resources) as g:
+        g.custom_command('restore', 'cli_cosmosdb_mongodb_collection_restore', is_preview=True)