fix autoscale update for empty notification (#27597)

Author: AllyW

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

@@ -50,7 +50,7 @@ def update_add_actions(args):
             add_actions.append({
                 "key": "email",
                 "value": {
-                    "custom_emails": add_action_item_arr[1:]
+                    "customEmails": add_action_item_arr[1:]
                 }
             })
         elif _type == "webhook":
@@ -182,30 +182,49 @@ def pre_instance_update(self, instance):
                 profile.capacity.default = str(count)
                 profile.capacity.minimum = str(min_count)
                 profile.capacity.maximum = str(max_count)
-
-        if not instance.properties.notifications:
-            return
-        notification = next(x for x in instance.properties.notifications if x.operation.to_serialized_data().lower() == 'scale')
+        updated_notification = None
+        if instance.properties.notifications:
+            retained_notification = []
+            for x in instance.properties.notifications:
+                note = x.to_serialized_data()
+                if note['operation'].lower() == 'scale':
+                    updated_notification = note
+                else:
+                    retained_notification.append(note)
+            instance.properties.notifications = retained_notification
+        else:
+            instance.properties.notifications = []
+
+        if updated_notification is None:
+            updated_notification = {
+                "operation": "scale",
+                "email": {
+                    "customEmails": []
+                },
+                "webhooks": []
+            }
 
         # process removals
         if len(remove_actions) > 0:
             removed_emails, removed_webhooks = _parse_action_removals(remove_actions)
-            notification.email.custom_emails = \
-                [x for x in notification.email.custom_emails if x not in removed_emails]
-            notification.webhooks = \
-                [x for x in notification.webhooks if x.service_uri not in removed_webhooks]
+            updated_notification['email']['customEmails'] = \
+                [x for x in updated_notification['email']['customEmails'] if x not in removed_emails]
+            updated_notification['webhooks'] = \
+                [x for x in updated_notification['webhooks'] if x['serviceUri'] not in removed_webhooks]
 
         # process additions
         for action in add_actions:
             if action["key"] == "email":
-                for email in action["value"]["custom_emails"]:
-                    notification.email.custom_emails.append(email)
+                for email in action["value"]["customEmails"]:
+                    updated_notification['email']['customEmails'].append(email)
             elif action["key"] == "webhook":
-                notification.webhooks.append(action["value"])  # please check snake case key here
+                updated_notification['webhooks'].append(action["value"])
         if has_value(args.email_administrator):
-            notification.email.send_to_subscription_administrator = args.email_administrator.to_serialized_data()
+            updated_notification['email']['sendToSubscriptionAdministrator'] = args.email_administrator.to_serialized_data()
         if has_value(args.email_coadministrators):
-            notification.email.send_to_subscription_co_administrators = args.email_coadministrators.to_serialized_data()
+            updated_notification['email']['sendToSubscriptionCoAdministrators'] = args.email_coadministrators.to_serialized_data()
+
+        instance.properties.notifications.append(updated_notification)
 
         if has_value(args.scale_look_ahead_time) and not has_value(args.scale_mode) \
                 and not has_value(instance.properties.predictive_autoscale_policy):

src/azure-cli/azure/cli/command_modules/monitor/tests/latest/recordings/test_monitor_autoscale_basic.yaml

@@ -15,7 +15,7 @@ def test_monitor_autoscale_basic(self, resource_group):
         self.kwargs.update({
             'vmss': 'vmss1'
         })
-        self.cmd('vmss create -g {rg} -n {vmss} --image UbuntuLTS --admin-username testadmin --admin-password TestTest12#$')
+        self.cmd('vmss create -g {rg} -n {vmss} --image Ubuntu2204 --admin-username testadmin --admin-password TestTest12#$')
         self.kwargs['vmss_id'] = self.cmd('vmss show -g {rg} -n {vmss}').get_output_in_json()['id']
 
         self.cmd('monitor autoscale create --resource {vmss_id} --count 3 ', checks=[
@@ -55,7 +55,7 @@ def test_monitor_autoscale_refined(self, resource_group):
         self.kwargs.update({
             'vmss': 'vmss1'
         })
-        self.cmd('vmss create -g {rg} -n {vmss} --image UbuntuLTS --admin-username testadmin --admin-password TestTest12#$')
+        self.cmd('vmss create -g {rg} -n {vmss} --image Ubuntu2204 --admin-username testadmin --admin-password TestTest12#$')
         self.kwargs['vmss_id'] = self.cmd('vmss show -g {rg} -n {vmss}').get_output_in_json()['id']
 
         self.cmd('monitor autoscale create --resource {vmss_id} --count 3 --action email abc@example.com efg@example.com opq@example.com --action webhook https://www.contoso.com/alert apiKey=value', checks=[
@@ -101,7 +101,7 @@ def test_monitor_autoscale_rules(self, resource_group):
         self.kwargs.update({
             'vmss': 'vmss1'
         })
-        self.cmd('vmss create -g {rg} -n {vmss} --image UbuntuLTS --admin-username testadmin --admin-password TestTest12#$')
+        self.cmd('vmss create -g {rg} -n {vmss} --image Ubuntu2204 --admin-username testadmin --admin-password TestTest12#$')
         self.kwargs['vmss_id'] = self.cmd('vmss show -g {rg} -n {vmss}').get_output_in_json()['id']
 
         self.cmd('monitor autoscale create --resource {vmss_id} --min-count 1 --count 3 --max-count 5')
@@ -193,7 +193,7 @@ def test_monitor_autoscale_rule_with_dimensions(self, resource_group):
             'vmss': 'vmss1'
         })
         self.cmd(
-            'vmss create -g {rg} -n {vmss} --image UbuntuLTS --admin-username testadmin --admin-password TestTest12#$ --instance-count 2')
+            'vmss create -g {rg} -n {vmss} --image Ubuntu2204 --admin-username testadmin --admin-password TestTest12#$ --instance-count 2')
         self.kwargs['vmss_id'] = self.cmd('vmss show -g {rg} -n {vmss}').get_output_in_json()['id']
 
         self.cmd('monitor autoscale create --resource {vmss_id} --min-count 1 --count 3 --max-count 5')
@@ -273,7 +273,7 @@ def test_monitor_autoscale_fixed(self, resource_group):
             'vmss': 'vmss1',
             'sched': 'Christmas'
         })
-        self.cmd('vmss create -g {rg} -n {vmss} --image UbuntuLTS --admin-username testadmin --admin-password TestTest12#$')
+        self.cmd('vmss create -g {rg} -n {vmss} --image Ubuntu2204 --admin-username testadmin --admin-password TestTest12#$')
         self.kwargs['vmss_id'] = self.cmd('vmss show -g {rg} -n {vmss}').get_output_in_json()['id']
 
         self.cmd('monitor autoscale create --resource {vmss_id} --count 3')
@@ -310,7 +310,7 @@ def test_monitor_autoscale_recurring(self, resource_group):
         self.kwargs.update({
             'vmss': 'vmss1'
         })
-        self.cmd('vmss create -g {rg} -n {vmss} --image UbuntuLTS --admin-username testname --admin-password TestTest12#$')
+        self.cmd('vmss create -g {rg} -n {vmss} --image Ubuntu2204 --admin-username testname --admin-password TestTest12#$')
         self.kwargs['vmss_id'] = self.cmd('vmss show -g {rg} -n {vmss}').get_output_in_json()['id']
 
         self.cmd('monitor autoscale create --resource {vmss_id} --count 3')
@@ -368,7 +368,7 @@ def test_monitor_autoscale_predictive_policy(self, resource_group):
             'new-scale-mode': 'ForecastOnly'
         })
         self.cmd(
-            'vmss create -g {rg} -n {vmss} --image UbuntuLTS --admin-username testadmin --admin-password TestTest12#$')
+            'vmss create -g {rg} -n {vmss} --image Ubuntu2204 --admin-username testadmin --admin-password TestTest12#$')
         self.kwargs['vmss_id'] = self.cmd('vmss show -g {rg} -n {vmss}').get_output_in_json()['id']
 
         self.cmd('monitor autoscale create --resource {vmss_id} --count 3 --scale-mode {scale-mode}', checks=[
@@ -400,7 +400,7 @@ def test_monitor_autoscale_show_predictive_metric(self, resource_group):
             'scale-mode': 'Enabled',
         })
         self.cmd(
-            'vmss create -g {rg} -n {vmss} --image UbuntuLTS --admin-username testadmin --admin-password TestTest12#$')
+            'vmss create -g {rg} -n {vmss} --image Ubuntu2204 --admin-username testadmin --admin-password TestTest12#$')
         self.kwargs['vmss_id'] = self.cmd('vmss show -g {rg} -n {vmss}').get_output_in_json()['id']
 
         self.cmd('monitor autoscale create --resource {vmss_id} --count 3 --max-count 5 --min-count 1 '