move prompt to update decorator

Author: yewmsft

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

@@ -832,16 +832,6 @@ def aks_update(
     # DO NOT MOVE: get all the original parameters and save them as a dictionary
     raw_parameters = locals()
 
-    # Check if auto_upgrade_channel is set to "none"
-    if auto_upgrade_channel == "none":
-        warning_message = (
-            "Since auto-upgrade-channel is set to none, cluster kubernetesVersion will be set to the value of "
-            "currentKubernetesVersion, all agent pools orchestratorVersion will be set to the value of "
-            "currentOrchestratorVersion respectively. Continue?"
-        )
-        if not prompt_y_n(warning_message, default="n"):
-            raise CLIError("Operation cancelled by user.")
-
     # decorator pattern
     from azure.cli.command_modules.acs.managed_cluster_decorator import AKSManagedClusterUpdateDecorator
     aks_update_decorator = AKSManagedClusterUpdateDecorator(
@@ -854,8 +844,7 @@ def aks_update(
         # update mc profile
         mc = aks_update_decorator.update_mc_profile_default()
         # Update kubernetes_version and orchestrator_version based on auto_upgrade_channel
-        if auto_upgrade_channel == "none":
-            mc = aks_update_decorator.update_kubernetes_version_and_orchestrator_version(mc)
+        mc = aks_update_decorator.update_kubernetes_version_and_orchestrator_version(mc)
     except DecoratorEarlyExitException:
         # exit gracefully
         return None

src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py

@@ -8492,14 +8492,25 @@ def update_kubernetes_version_and_orchestrator_version(self, mc: ManagedCluster)
         """
         self._ensure_mc(mc)
 
-        # Set kubernetes version to match the current kubernetes version if it has a value
-        if mc.current_kubernetes_version:
-            mc.kubernetes_version = mc.current_kubernetes_version
-
-        # Set orchestrator version for each agent pool to match the current orchestrator version if it has a value
-        for agent_pool in mc.agent_pool_profiles:
-            if agent_pool.current_orchestrator_version:
-                agent_pool.orchestrator_version = agent_pool.current_orchestrator_version
+        # Check if auto_upgrade_channel is set to "none"
+        auto_upgrade_channel = self.context.get_auto_upgrade_channel()
+        if auto_upgrade_channel == "none":
+            warning_message = (
+                "Since auto-upgrade-channel is set to none, cluster kubernetesVersion will be set to the value of "
+                "currentKubernetesVersion, all agent pools orchestratorVersion will be set to the value of "
+                "currentOrchestratorVersion respectively. Continue?"
+            )
+            if not prompt_y_n(warning_message, default="n"):
+                raise CLIError("Operation cancelled by user.")
+
+            # Set kubernetes version to match the current kubernetes version if it has a value
+            if mc.current_kubernetes_version:
+                mc.kubernetes_version = mc.current_kubernetes_version
+
+            # Set orchestrator version for each agent pool to match the current orchestrator version if it has a value
+            for agent_pool in mc.agent_pool_profiles:
+                if agent_pool.current_orchestrator_version:
+                    agent_pool.orchestrator_version = agent_pool.current_orchestrator_version
 
         return mc
 

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_managed_cluster_decorator.py

@@ -11211,10 +11211,13 @@ def test_update_mc_profile_default(self):
 
     def test_update_kubernetes_version_and_orchestrator_version(self):
         # First test case
+        raw_param_dict = {
+            "auto_upgrade_channel": "none",
+        }
         dec_1 = AKSManagedClusterUpdateDecorator(
             self.cmd,
             self.client,
-            {},
+            raw_param_dict,
             ResourceType.MGMT_CONTAINERSERVICE,
         )
         mc_1 = self.models.ManagedCluster(
@@ -11239,7 +11242,11 @@ def test_update_kubernetes_version_and_orchestrator_version(self):
         mc_1.agent_pool_profiles[1].current_orchestrator_version = "1.21.2"
 
         dec_1.context.attach_mc(mc_1)
-        updated_mc_1 = dec_1.update_kubernetes_version_and_orchestrator_version(mc_1)
+        with patch(
+            "azure.cli.command_modules.acs.managed_cluster_decorator.prompt_y_n",
+            return_value=True,
+        ):
+            updated_mc_1 = dec_1.update_kubernetes_version_and_orchestrator_version(mc_1)
 
         # Check if kubernetes_version is updated
         self.assertEqual(updated_mc_1.kubernetes_version, "1.21.2")
@@ -11251,7 +11258,7 @@ def test_update_kubernetes_version_and_orchestrator_version(self):
         dec_2 = AKSManagedClusterUpdateDecorator(
             self.cmd,
             self.client,
-            {},
+            raw_param_dict,
             ResourceType.MGMT_CONTAINERSERVICE,
         )
         mc_2 = self.models.ManagedCluster(
@@ -11274,13 +11281,51 @@ def test_update_kubernetes_version_and_orchestrator_version(self):
         mc_2.agent_pool_profiles[1].current_orchestrator_version = None
 
         dec_2.context.attach_mc(mc_2)
-        updated_mc_2 = dec_2.update_kubernetes_version_and_orchestrator_version(mc_2)
+        with patch(
+            "azure.cli.command_modules.acs.managed_cluster_decorator.prompt_y_n",
+            return_value=True,
+        ):
+            updated_mc_2 = dec_2.update_kubernetes_version_and_orchestrator_version(mc_2)
 
         # Check if kubernetes_version and orchestrator_version remain unchanged
         self.assertEqual(updated_mc_2.kubernetes_version, "1.18.14")
         self.assertEqual(updated_mc_2.agent_pool_profiles[0].orchestrator_version, "1.18.14")
         self.assertEqual(updated_mc_2.agent_pool_profiles[1].orchestrator_version, "1.19.7")
 
+        # Third test case with both current_kubernetes_version and current_orchestrator_version as None
+        dec_3 = AKSManagedClusterUpdateDecorator(
+            self.cmd,
+            self.client,
+            {},
+            ResourceType.MGMT_CONTAINERSERVICE,
+        )
+        mc_3 = self.models.ManagedCluster(
+            location="test_location",
+            kubernetes_version="1.18.14",
+            agent_pool_profiles=[
+                self.models.ManagedClusterAgentPoolProfile(
+                    name="agentpool1",
+                    orchestrator_version="1.18.14"
+                ),
+                self.models.ManagedClusterAgentPoolProfile(
+                    name="agentpool2",
+                    orchestrator_version="1.19.7"
+                )
+            ]
+        )
+        # Set current kubernetes version and orchestrator version to 1.21.2
+        mc_3.current_kubernetes_version = "1.21.2"
+        mc_3.agent_pool_profiles[0].current_orchestrator_version = "1.21.2"
+        mc_3.agent_pool_profiles[1].current_orchestrator_version = "1.21.2"
+
+        dec_3.context.attach_mc(mc_3) # no prompt 
+        updated_mc_3 = dec_3.update_kubernetes_version_and_orchestrator_version(mc_3)
+
+        # Check if kubernetes_version and orchestrator_version remain unchanged
+        self.assertEqual(updated_mc_3.kubernetes_version, "1.18.14")
+        self.assertEqual(updated_mc_3.agent_pool_profiles[0].orchestrator_version, "1.18.14")
+        self.assertEqual(updated_mc_3.agent_pool_profiles[1].orchestrator_version, "1.19.7")
+
     def test_check_is_postprocessing_required(self):
         dec_1 = AKSManagedClusterUpdateDecorator(
             self.cmd,