[Compute] az vm/vmss application set: Add new parameter --enable-automatic-upgrade to support enabling application automatic upgrade (#32394)

Author: Jing-song

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

@@ -1550,6 +1550,9 @@
     text: az vm application set -g MyResourceGroup -n MyVm --app-version-ids /subscriptions/subid/resourceGroups/MyResourceGroup/providers/Microsoft.Compute/galleries/myGallery1/applications/MyApplication1/versions/1.0 \
 /subscriptions/subid/resourceGroups/MyResourceGroup/providers/Microsoft.Compute/galleries/myGallery1/applications/MyApplication1/versions/1.1 \
 --app-config-overrides https://mystorageaccount.blob.core.windows.net/configurations/settings.config null
+  - name: Set applications for vm with auto upgrade
+    text: az vm application set -g MyResourceGroup -n MyVm --app-version-ids /subscriptions/subid/resourceGroups/MyResourceGroup/providers/Microsoft.Compute/galleries/myGallery1/applications/MyApplication1/versions/1.0 \
+/subscriptions/subid/resourceGroups/MyResourceGroup/providers/Microsoft.Compute/galleries/myGallery1/applications/MyApplication2/versions/1.1 --enable-automatic-upgrade True False
 """
 
 helps['vm application list'] = """

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

@@ -1053,6 +1053,7 @@ def load_arguments(self, _):
                        'It should have the same number of items as the application version ids. Null is available for a application '
                        'which does not have a configuration override.')
             c.argument('treat_deployment_as_failure', nargs='*', help="Space-separated list of true or false corresponding to the application version ids. If set to true, failure to install or update gallery application version operation will fail this operation")
+            c.argument('enable_automatic_upgrade', nargs='*', options_list=['--enable-automatic-upgrade', '--enable-auto-upgrade'], help='Space-separated list of true or false corresponding to the application version ids. If set to true, when a new Gallery Application version is available in PIR/SIG, it will be automatically updated for the VM/VMSS')
 
     for scope in ['vm application list', 'vmss application list']:
         with self.argument_context(scope) as c:

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

@@ -1486,6 +1486,10 @@ def _validate_vm_vmss_set_applications(cmd, namespace):  # pylint: disable=unuse
             if boolean_value_in_string.lower() != 'true' and boolean_value_in_string.lower() != 'false':
                 raise ArgumentUsageError('usage error: --treat-deployment-as-failure only accepts a list of "true" or'
                                          ' "false" values')
+    if namespace.enable_automatic_upgrade:
+        if len(namespace.application_version_ids) != len(namespace.enable_automatic_upgrade):
+            raise ArgumentUsageError('usage error: --enable-automatic-upgrade should have the same number of items'
+                                     ' as --application-version-ids')
 
 
 def _resolve_role_id(cli_ctx, role, scope):

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

@@ -5930,7 +5930,7 @@ def show_capacity_reservation_group(client, resource_group_name, capacity_reserv
                       expand=expand)
 
 
-def set_vm_applications(cmd, vm_name, resource_group_name, application_version_ids, order_applications=False, application_configuration_overrides=None, treat_deployment_as_failure=None, no_wait=False):
+def set_vm_applications(cmd, vm_name, resource_group_name, application_version_ids, order_applications=False, application_configuration_overrides=None, treat_deployment_as_failure=None, enable_automatic_upgrade=None, no_wait=False):
     from .aaz.latest.vm import Update as _VMUpdate
 
     class SetVMApplications(_VMUpdate):
@@ -5961,6 +5961,13 @@ def pre_instance_update(self, instance):
                         treat_as_failure.lower() == 'true'
                     index += 1
 
+            if enable_automatic_upgrade:
+                index = 0
+                for enable_auto_upgrade in enable_automatic_upgrade:
+                    instance.properties.application_profile.gallery_applications[index]["enable_automatic_upgrade"] = \
+                        enable_auto_upgrade.lower() == 'true'
+                    index += 1
+
         def _output(self, *args, **kwargs):
             from azure.cli.core.aaz import AAZUndefined, has_value
 
@@ -5992,35 +5999,62 @@ def list_vm_applications(cmd, vm_name, resource_group_name):
     return vm.get("applicationProfile", {})
 
 
-def set_vmss_applications(cmd, vmss_name, resource_group_name, application_version_ids, order_applications=False, application_configuration_overrides=None, treat_deployment_as_failure=None, no_wait=False):
-    client = _compute_client_factory(cmd.cli_ctx)
-    ApplicationProfile, VMGalleryApplication = cmd.get_models('ApplicationProfile', 'VMGalleryApplication')
-    try:
-        vmss = client.virtual_machine_scale_sets.get(resource_group_name, vmss_name)
-    except ResourceNotFoundError:
-        raise ResourceNotFoundError('Could not find vmss {}.'.format(vmss_name))
+def set_vmss_applications(cmd, vmss_name, resource_group_name, application_version_ids, order_applications=False, application_configuration_overrides=None, treat_deployment_as_failure=None, enable_automatic_upgrade=None, no_wait=False):
+    from .aaz.latest.vmss import Update as _VMSSUpdate
+
+    class SetVMSSApplications(_VMSSUpdate):
+        def pre_operations(self):
+            args = self.ctx.args
+            args.no_wait = no_wait
 
-    vmss.virtual_machine_profile.application_profile = ApplicationProfile(gallery_applications=[VMGalleryApplication(package_reference_id=avid) for avid in application_version_ids])
-
-    if order_applications:
-        index = 1
-        for app in vmss.virtual_machine_profile.application_profile.gallery_applications:
-            app.order = index
-            index += 1
-
-    if application_configuration_overrides:
-        index = 0
-        for over_ride in application_configuration_overrides:
-            if over_ride or over_ride.lower() != 'null':
-                vmss.virtual_machine_profile.application_profile.gallery_applications[index].configuration_reference = over_ride
-            index += 1
-
-    if treat_deployment_as_failure:
-        index = 0
-        for treat_as_failure in treat_deployment_as_failure:
-            vmss.virtual_machine_profile.application_profile.gallery_applications[index].treat_failure_as_deployment_failure = treat_as_failure.lower() == 'true'
-            index += 1
-    return sdk_no_wait(no_wait, client.virtual_machine_scale_sets.begin_create_or_update, resource_group_name, vmss_name, vmss)
+        def pre_instance_update(self, instance):
+            instance.properties.virtualMachineProfile.application_profile.gallery_applications = [{"package_reference_id": avid} for avid in application_version_ids]
+
+            if order_applications:
+                index = 1
+                for app in instance.properties.virtualMachineProfile.application_profile.gallery_applications:
+                    app["order"] = index
+                    index += 1
+
+            if application_configuration_overrides:
+                index = 0
+                for over_ride in application_configuration_overrides:
+                    if over_ride or over_ride.lower() != 'null':
+                        instance.properties.virtual_machine_profile.application_profile.gallery_applications[index]["configuration_reference"] = over_ride
+                    index += 1
+
+            if treat_deployment_as_failure:
+                index = 0
+                for treat_as_failure in treat_deployment_as_failure:
+                    instance.properties.virtual_machine_profile.application_profile.gallery_applications[index]["treat_failure_as_deployment_failure"] = \
+                        treat_as_failure.lower() == 'true'
+                    index += 1
+
+            if enable_automatic_upgrade:
+                index = 0
+                for enable_auto_upgrade in enable_automatic_upgrade:
+                    instance.properties.virtual_machine_profile.application_profile.gallery_applications[index]["enable_automatic_upgrade"] = \
+                        enable_auto_upgrade.lower() == 'true'
+                    index += 1
+
+        def _output(self, *args, **kwargs):
+            from azure.cli.core.aaz import AAZUndefined, has_value
+
+            # Resolve flatten conflict
+            # When the type field conflicts, the type in inner layer is ignored and the outer layer is applied
+            print(self.ctx.vars.instance.properties.virtual_machine_profile.extension_profile.extensions)
+            if has_value(self.ctx.vars.instance.properties.virtual_machine_profile.extension_profile.extensions):
+                for extension in self.ctx.vars.instance.properties.virtual_machine_profile.extension_profile.extensions:
+                    if has_value(extension.type):
+                        extension.type = AAZUndefined
+
+            result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
+            return result
+
+    return SetVMSSApplications(cli_ctx=cmd.cli_ctx)(command_args={
+        "resource_group": resource_group_name,
+        "vm_scale_set_name": vmss_name,
+    })
 
 
 def list_vmss_applications(cmd, vmss_name, resource_group_name):