Merge branch 'dev' of git://github.com/Azure/azure-cli into daetienn/template-spec-crud

Author: Dania Etienne

doc/sphinx/azhelpgen/doc_source_map.json

@@ -35,7 +35,6 @@
     "group": "src/azure-cli/azure/cli/command_modules/resource/_help.py",
     "hdinsight": "src/azure-cli/azure/cli/command_modules/hdinsight/_help.py",
     "iot": "src/azure-cli/azure/cli/command_modules/iot/_help.py",
-    "iotcentral": "src/azure-cli/azure/cli/command_modules/iotcentral/_help.py",
     "keyvault": "src/azure-cli/azure/cli/command_modules/keyvault/_help.py",
     "kusto": "src/azure-cli/azure/cli/command_modules/kusto/_help.py",
     "lab": "src/azure-cli/azure/cli/command_modules/lab/_help.py",

scripts/ci/credscan/CredScanSuppressions.json

@@ -190,7 +190,8 @@
         "src\\azure-cli\\azure\\cli\\command_modules\\storage\\tests\\hybrid_2018_03_01\\test_storage_url_helpers.py",
         "src\\azure-cli\\azure\\cli\\command_modules\\storage\\tests\\latest\\test_storage_url_helpers.py",
         "src\\azure-cli\\azure\\cli\\command_modules\\storage\\tests\\latest\\recordings\\test_renew_account_key.yaml",
-        "src\\azure-cli\\azure\\cli\\command_modules\\storage\\tests\\latest\\recordings\\test_renew_account_kerb_key.yaml"
+        "src\\azure-cli\\azure\\cli\\command_modules\\storage\\tests\\latest\\recordings\\test_renew_account_kerb_key.yaml",
+        "src\\azure-cli\\azure\\cli\\command_modules\\storage\\tests\\latest\\recordings\\test_storage_blob_incremental_copy.yaml"
       ],
       "_justification": "[Storage] response body contains random value recognized as secret in outdated recoding files of storage may remove in the future"
     },

src/azure-cli/azure/cli/command_modules/apim/_help.py

@@ -180,7 +180,7 @@
 
 helps['apim api import'] = """
 type: command
-short-summary: Import an API Management service instance.
+short-summary: Import an API Management API.
 """
 
 helps['apim product api list'] = """

src/azure-cli/azure/cli/command_modules/appservice/custom.py

@@ -568,10 +568,13 @@ def progress_callback(current, total):
             client.web_apps.sync_function_triggers_slot(resource_group_name, name, slot)
         else:
             client.web_apps.sync_function_triggers(resource_group_name, name)
-    except CloudError as ce:
+    except CloudError as ex:
         # This SDK function throws an error if Status Code is 200
-        if ce.status_code != 200:
-            raise ce
+        if ex.status_code != 200:
+            raise ex
+    except DefaultErrorResponseException as ex:
+        if ex.response.status_code != 200:
+            raise ex
 
 
 def _generic_settings_operation(cli_ctx, resource_group_name, name, operation_name,

src/azure-cli/azure/cli/command_modules/find/custom.py

@@ -115,7 +115,7 @@ def call_aladdin_service(query):
     if telemetry_core.is_telemetry_enabled() and subscription_id is not None:
         context['subscriptionId'] = subscription_id
 
-    api_url = 'https://aladdindevwestus-app.azurewebsites.net/api/v1.0/examples'
+    api_url = 'https://app.aladdin.microsoft.com/api/v1.0/examples'
     headers = {
         'Content-Type': 'application/json',
         'X-UserId': hashed_user_id

src/azure-cli/azure/cli/command_modules/hdinsight/_params.py

@@ -184,10 +184,12 @@ def load_arguments(self, _):
 
         # Private Link Network Settings
         c.argument('public_network_access_type', arg_group='Private Link Network Settings',
-                   arg_type=get_enum_type(PublicNetworkAccess), help='The public network access type.')
+                   arg_type=get_enum_type(PublicNetworkAccess), help='The public network access type.',
+                   deprecate_info=c.deprecate(expiration='2.14.0'))
         c.argument('outbound_public_network_access_type', arg_group='Private Link Network Settings',
                    arg_type=get_enum_type(OutboundOnlyPublicNetworkAccessType),
-                   help='The outbound only public network access type.')
+                   help='The outbound only public network access type.',
+                   deprecate_info=c.deprecate(expiration='2.14.0'))
 
         # Encryption In Transit
         c.argument('encryption_in_transit', arg_group='Encryption In Transit', arg_type=get_three_state_flag(),