Merge branch 'dev' of https://github.com/Azure/azure-cli into albertofori/strip_comments

Author: albertofori

src/azure-cli-core/azure/cli/core/breaking_change.py

@@ -266,7 +266,7 @@ def register(self, cli_ctx):
                 if not arg:
                     continue
                 arg.deprecate_info = self.appended_status_tag(cli_ctx, arg.deprecate_info, self.to_tag(cli_ctx))
-                arg.action = _argument_breaking_change_action(cli_ctx, arg.deprecate_info, arg.options['action'])
+                arg.action = _argument_breaking_change_action(cli_ctx, arg.deprecate_info, arg.options.get('action'))
         elif self.is_command_group(cli_ctx):
             command_group = cli_ctx.invocation.commands_loader.command_group_table[self.command_name]
             if not command_group:

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

@@ -1666,7 +1666,12 @@ def progress_callback(current, total):
         progress_message = 'Uploading {} {}%'.format(progress_bar, percents)
         cmd.cli_ctx.get_progress_controller().add(message=progress_message)
 
-    blob_client = container_client.upload_blob(blob_name, src, validate_content=True, progress_hook=progress_callback)
+    blob_client = None
+    import os
+    with open(os.path.realpath(os.path.expanduser(src)), 'rb') as fs:
+        zip_content = fs.read()
+        blob_client = container_client.upload_blob(blob_name, zip_content, validate_content=True,
+                                                   progress_hook=progress_callback)
 
     now = datetime.datetime.utcnow()
     blob_start = now - datetime.timedelta(minutes=10)

src/azure-cli/azure/cli/command_modules/monitor/aaz/latest/monitor/diagnostic_settings/_create.py

@@ -63,7 +63,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
         )
         _args_schema.logs = AAZListArg(
             options=["--logs"],
-            help="JSON encoded list of logs settings. Use '@{file}' to load from a file.For more information, visit: https://learn.microsoft.com/rest/api/monitor/diagnosticsettings/createorupdate#logsettings.",
+            help="JSON encoded list of logs settings. Use '@{file}' to load from a file. For more information, visit: https://learn.microsoft.com/rest/api/monitor/diagnosticsettings/createorupdate#logsettings.",
         )
         _args_schema.marketplace_partner_id = AAZStrArg(
             options=["--marketplace-partner-id"],
@@ -100,12 +100,12 @@ def _build_arguments_schema(cls, *args, **kwargs):
         )
         _element.enabled = AAZBoolArg(
             options=["enabled"],
-            help="a value indicating whether this log is enabled.",
+            help="A value indicating whether this log is enabled.",
             required=True,
         )
         _element.retention_policy = AAZObjectArg(
             options=["retention-policy"],
-            help="the retention policy for this log.",
+            help="The retention policy for this log.",
         )
         cls._build_args_retention_policy_create(_element.retention_policy)
 
@@ -119,17 +119,17 @@ def _build_arguments_schema(cls, *args, **kwargs):
         )
         _element.enabled = AAZBoolArg(
             options=["enabled"],
-            help="a value indicating whether this category is enabled.",
+            help="A value indicating whether this category is enabled.",
             required=True,
         )
         _element.retention_policy = AAZObjectArg(
             options=["retention-policy"],
-            help="the retention policy for this category.",
+            help="The retention policy for this category.",
         )
         cls._build_args_retention_policy_create(_element.retention_policy)
         _element.time_grain = AAZDurationArg(
             options=["time-grain"],
-            help="the timegrain of the metric in ISO8601 format.",
+            help="The timegrain of the metric in ISO8601 format.",
         )
 
         # define Arg Group "Target Resource"
@@ -157,15 +157,15 @@ def _build_args_retention_policy_create(cls, _schema):
         retention_policy_create = cls._args_retention_policy_create
         retention_policy_create.days = AAZIntArg(
             options=["days"],
-            help="the number of days for the retention in days. A value of 0 will retain the events indefinitely.",
+            help="The number of days for the retention. A value of 0 will retain the events indefinitely.",
             required=True,
             fmt=AAZIntArgFormat(
                 minimum=0,
             ),
         )
         retention_policy_create.enabled = AAZBoolArg(
             options=["enabled"],
-            help="a value indicating whether the retention policy is enabled.",
+            help="A value indicating whether the retention policy is enabled.",
             required=True,
         )
 

src/azure-cli/azure/cli/command_modules/monitor/operations/diagnostics_settings.py

@@ -80,8 +80,8 @@ def _build_arguments_schema(cls, *args, **kwargs):
             options=['--export-to-resource-specific'],
             help="Indicate that the export to LA must be done to a resource specific table, a.k.a. "
                  "dedicated or fixed schema table, as opposed to the default dynamic schema table called "
-                 "AzureDiagnostics. This argument is effective only when the argument --workspace is also given."
-                 "  Allowed values: false, true."
+                 "AzureDiagnostics. This argument is effective only when the argument --workspace is also given. "
+                 "Allowed values: false, true."
         )
         arg_schema.log_analytics_destination_type._registered = False  # pylint:disable=protected-access
         arg_schema.service_bus_rule_id._registered = False  # pylint:disable=protected-access

src/azure-cli/azure/cli/command_modules/vm/_client_factory.py

@@ -67,10 +67,6 @@ def cf_images(cli_ctx, _):
     return _compute_client_factory(cli_ctx).images
 
 
-def cf_run_commands(cli_ctx, _):
-    return _compute_client_factory(cli_ctx).virtual_machine_run_commands
-
-
 def cf_vmss_run_commands(cli_ctx, _):
     return _compute_client_factory(cli_ctx).virtual_machine_scale_set_vm_run_commands
 

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

@@ -1957,16 +1957,6 @@
 "https://mystorageaccount.blob.core.windows.net/mycontainer/RuncommandOutput.txt?sp=racw&st=2022-10-17T19:02:15Z&se=2022-10-18T03:02:15Z&spr=https&sv=2021-06-08&sr=b&sig=3BxtEasfdasdfasdfdYki9yvYsqc60V0%3D"
 """
 
-helps['vm run-command delete'] = """
-type: command
-short-summary: "The operation to delete the run command."
-examples:
-  - name: Delete a run command.
-    text: |-
-           az vm run-command delete --resource-group "myResourceGroup" --run-command-name \
-"myRunCommand" --vm-name "myVM"
-"""
-
 helps['vm run-command wait'] = """
 type: command
 short-summary: Place the CLI in a waiting state until a condition of the res virtual-machine-run-command is met.

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

@@ -953,10 +953,6 @@ def load_arguments(self, _):
             c.argument('output_blob_uri', help='Specify the Azure storage blob (SAS URI) where script output stream will be uploaded.')
             c.argument('error_blob_uri', help='Specify the Azure storage blob where script error stream will be uploaded.')
 
-    with self.argument_context('vm run-command delete') as c:
-        c.argument('vm_name', run_cmd_vm_name)
-        c.argument('run_command_name', run_cmd_name_type)
-
     with self.argument_context('vm run-command list') as c:
         c.argument('vm_name', run_cmd_vm_name, id_part=None)
         c.argument('expand', help='The expand expression to apply on the operation.')

src/azure-cli/azure/cli/command_modules/vm/aaz/latest/vm/run_command/__cmd_group.py

@@ -0,0 +1,25 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from azure.cli.core.aaz import *
+
+
+@register_command_group(
+    "vm run-command",
+)
+class __CMDGroup(AAZCommandGroup):
+    """Manage run commands on a Virtual Machine.
+
+    For more information, see https://learn.microsoft.com/azure/virtual-machines/windows/run-command or https://learn.microsoft.com/azure/virtual-machines/linux/run-command.
+    """
+    pass
+
+
+__all__ = ["__CMDGroup"]

src/azure-cli/azure/cli/command_modules/vm/aaz/latest/vm/run_command/__init__.py

@@ -0,0 +1,20 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from .__cmd_group import *
+from ._create import *
+from ._delete import *
+from ._invoke import *
+from ._list import *
+from ._list_by_subscription import *
+from ._show import *
+from ._show_by_id import *
+from ._update import *
+from ._wait import *