[AppConfig]Fix pagination and globalization bugs.

src/azure-cli/HISTORY.rst

@@ -8,10 +8,19 @@ Release History
 
 * Support Local context in acr task run
 
+**ACS**
+
+* [BREAKING CHANGE]az openshift create: rename `--workspace-resource-id` to `--workspace-id`.
+
 **AMS**
 
 * Update show commands to return 3 when resource not found
 
+**AppConfig**
+
+* Fix bug when appending api-version to request url. The existing solution doesn't work with pagination.
+* Support showing languages besides English as our backend service support unicode for globalization.
+
 **AppService**
 
 * Fix issue #11217: webapp: az webapp config ssl upload should support slot parameter

src/azure-cli/azure/cli/command_modules/appconfig/_azconfig/azconfig_client.py

@@ -170,8 +170,8 @@ def delete_keyvalue_by_key_label(self, key, label=None, modify_options=None):
             modify_options = models.ModifyKeyValueOptions()
 
         key, label = utils.unescape_encode_key_and_label(key, label)
-        query_url = '/kv/{}?label={}'.format(key,
-                                             '' if label is None else label)
+        query_url = '/kv/{}?label={}'.format(key, '' if label is None else label)
+        query_url = self.__append_api_version(query_url)
 
         endpoint = utils.get_endpoint_from_connection_string(
             self.connection_string)
@@ -219,8 +219,9 @@ def delete_keyvalue(self, keyvalue, modify_options=None):
             raise ValueError("Etag of the keyvalue cannot be null")
 
         key, label = utils.unescape_encode_key_and_label(keyvalue.key, keyvalue.label)
-        query_url = '/kv/{}?label={}'.format(key,
-                                             '' if label is None else label)
+        query_url = '/kv/{}?label={}'.format(key, '' if label is None else label)
+        query_url = self.__append_api_version(query_url)
+
         endpoint = utils.get_endpoint_from_connection_string(
             self.connection_string)
         url = 'https://{}{}'.format(endpoint, query_url)
@@ -314,6 +315,8 @@ def lock_keyvalue(self, keyvalue, modify_options=None):
 
         query_url = '/locks/{}'.format(key)
         query_url += '?label={}'.format('' if label is None else label)
+        query_url = self.__append_api_version(query_url)
+
         endpoint = utils.get_endpoint_from_connection_string(
             self.connection_string)
         url = 'https://{}{}'.format(endpoint, query_url)
@@ -356,6 +359,7 @@ def unlock_keyvalue(self, keyvalue, modify_options=None):
 
         query_url = '/locks/{}'.format(key)
         query_url += '?label={}'.format('' if label is None else label)
+        query_url = self.__append_api_version(query_url)
 
         endpoint = utils.get_endpoint_from_connection_string(
             self.connection_string)
@@ -389,6 +393,8 @@ def __write_key(self,
                     if_match_etag=None,
                     if_none_match_etag=None):
         query_url = '/kv/{}?label={}'.format(key, '' if label is None else label)
+        query_url = self.__append_api_version(query_url)
+
         endpoint = utils.get_endpoint_from_connection_string(
             self.connection_string)
         url = 'https://{}{}'.format(endpoint, query_url)
@@ -421,6 +427,7 @@ def __list_revision(self, query_option, continuation_link):
             query_url = '/revisions?key={}'.format('*' if key is None else key)
             query_url += '&label={}'.format('*'if label is None else label)
             query_url += '&fields={}'.format(query_fields)
+            query_url = self.__append_api_version(query_url)
         else:
             query_url = self.__parse_link_header(continuation_link)
             if query_url is None:
@@ -455,6 +462,7 @@ def __query_key(self, key, query_kv_option):
         query_url = '/kv/{}?label={}'.format(key,
                                              label if label is not None else '')
         query_url += '&fields={}'.format('*' if fields is None else fields)
+        query_url = self.__append_api_version(query_url)
 
         endpoint = utils.get_endpoint_from_connection_string(
             self.connection_string)
@@ -488,8 +496,8 @@ def __query_keys(self, query_kv_collection_option, continuation_link):
         if continuation_link is None:
             query_url = '/kv?key={}'.format('*' if key is None else key)
             query_url += '&label={}'.format('*' if label is None else label)
-            query_url += '&fields={}'.format(
-                '*' if query_fields is None else query_fields)
+            query_url += '&fields={}'.format('*' if query_fields is None else query_fields)
+            query_url = self.__append_api_version(query_url)
         else:
             query_url = self.__parse_link_header(continuation_link)
             if query_url is None:
@@ -549,3 +557,8 @@ def __configure_request_ids(request_options):
         custom_headers[constants.HttpHeaders.CorrelationRequestId] = request_options.correlation_request_id
 
         return custom_headers
+
+    @staticmethod
+    def __append_api_version(url):
+        api_version = "&api-version=" if '?' in url else "?api-version="
+        return url + api_version + constants.Versions.ApiVersion

src/azure-cli/azure/cli/command_modules/appconfig/_azconfig/request_handler.py

@@ -38,10 +38,6 @@ def execute(self, request, request_sessions):
         while True:
             start = time.time()
 
-            # Append api-version to all URLs
-            api_version = "&api-version=" if '?' in request.url else "?api-version="
-            request.url = request.url + api_version + constants.Versions.ApiVersion
-
             request.headers.update(utils.sign_request(
                 request.method, request.url, request.body, self.connection_string))
 

src/azure-cli/azure/cli/command_modules/appconfig/keyvalue.py

@@ -173,7 +173,8 @@ def set_key(cmd,
             "value": set_kv.value,
             "tags": set_kv.tags
         }
-        entry = json.dumps(verification_kv, indent=2, sort_keys=True)
+
+        entry = json.dumps(verification_kv, indent=2, sort_keys=True, ensure_ascii=False)
         confirmation_message = "Are you sure you want to set the key: \n" + entry + "\n"
         user_confirmation(confirmation_message, yes)
 
@@ -233,7 +234,7 @@ def delete_key(cmd,
     if not_deleted_entries:
         if deleted_entries:
             logger.error('Deletion operation partially succeed. Some keys are not successfully deleted. \n %s',
-                         json.dumps(not_deleted_entries, indent=2))
+                         json.dumps(not_deleted_entries, indent=2, ensure_ascii=False))
         else:
             raise CLIError('Deletion operation failed.' + str(http_exception))
 

src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/export.json

@@ -1,5 +1,4 @@
 {
-  "background-color": "black",
   "font-size": "34",
   "abc": "",
   "Settings:BackgroundColor": {
@@ -12,9 +11,10 @@
       "ship3"
     ]
   },
+  "background-color": "black",
   "Langugage": "English",
-  "Language": "spanish",
   "BackgroundColor": "red",
-  "appabc": "",
-  "language": "spanish"
+  "Language": "spanish",
+  "language": "spanish",
+  "appabc": ""
 }