{AKS} Update v2 managed cluster decorator - part 1 (#4973)

src/aks-preview/azext_aks_preview/agentpool_decorator.py

@@ -17,8 +17,8 @@
     AKSAgentPoolUpdateDecorator,
 )
 from azure.cli.core.azclierror import (
-    ArgumentUsageError,
     InvalidArgumentValueError,
+    MutuallyExclusiveArgumentError,
 )
 from azure.cli.core.commands import AzCliCommand
 from azure.cli.core.profiles import ResourceType
@@ -174,6 +174,65 @@ def get_workload_runtime(self) -> Union[str, None]:
         # this parameter does not need validation
         return workload_runtime
 
+    def _get_enable_custom_ca_trust(self, enable_validation: bool = False) -> bool:
+        """Internal function to obtain the value of enable_custom_ca_trust.
+
+        This function supports the option of enable_validation. When enabled, if both enable_custom_ca_trust and
+        disable_custom_ca_trust are specified, raise a MutuallyExclusiveArgumentError.
+
+        :return: bool
+        """
+        # read the original value passed by the command
+        enable_custom_ca_trust = self.raw_param.get("enable_custom_ca_trust")
+        # In create mode, try to read the property value corresponding to the parameter from the `agentpool` object
+        if self.decorator_mode == DecoratorMode.CREATE:
+            if self.agentpool and self.agentpool.enable_custom_ca_trust is not None:
+                enable_custom_ca_trust = self.agentpool.enable_custom_ca_trust
+
+        # this parameter does not need dynamic completion
+        # validation
+        if enable_validation:
+            if enable_custom_ca_trust and self._get_disable_custom_ca_trust(enable_validation=False):
+                raise MutuallyExclusiveArgumentError(
+                    'Cannot specify "--enable-custom-ca-trust" and "--disable-custom-ca-trust" at the same time'
+                )
+        return enable_custom_ca_trust
+
+    def get_enable_custom_ca_trust(self) -> bool:
+        """Obtain the value of enable_custom_ca_trust.
+
+        :return: bool
+        """
+        return self._get_enable_custom_ca_trust(enable_validation=True)
+
+    def _get_disable_custom_ca_trust(self, enable_validation: bool = False) -> bool:
+        """Internal function to obtain the value of disable_custom_ca_trust.
+
+        This function supports the option of enable_validation. When enabled, if both enable_custom_ca_trust and
+        disable_custom_ca_trust are specified, raise a MutuallyExclusiveArgumentError.
+
+        :return: bool
+        """
+        # read the original value passed by the command
+        disable_custom_ca_trust = self.raw_param.get("disable_custom_ca_trust")
+        # This option is not supported in create mode, so its value is not read from `agentpool`.
+
+        # this parameter does not need dynamic completion
+        # validation
+        if enable_validation:
+            if disable_custom_ca_trust and self._get_enable_custom_ca_trust(enable_validation=False):
+                raise MutuallyExclusiveArgumentError(
+                    'Cannot specify "--enable-custom-ca-trust" and "--disable-custom-ca-trust" at the same time'
+                )
+        return disable_custom_ca_trust
+
+    def get_disable_custom_ca_trust(self) -> bool:
+        """Obtain the value of disable_custom_ca_trust.
+
+        :return: bool
+        """
+        return self._get_disable_custom_ca_trust(enable_validation=True)
+
 
 class AKSPreviewAgentPoolAddDecorator(AKSAgentPoolAddDecorator):
     def __init__(
@@ -229,7 +288,7 @@ def set_up_motd(self, agentpool: AgentPool) -> AgentPool:
         agentpool.message_of_the_day = self.context.get_message_of_the_day()
         return agentpool
 
-    def set_up_gpu_propertes(self, agentpool: AgentPool) -> AgentPool:
+    def set_up_gpu_properties(self, agentpool: AgentPool) -> AgentPool:
         """Set up gpu related properties for the AgentPool object.
 
         :return: the AgentPool object
@@ -240,6 +299,16 @@ def set_up_gpu_propertes(self, agentpool: AgentPool) -> AgentPool:
         agentpool.workload_runtime = self.context.get_workload_runtime()
         return agentpool
 
+    def set_up_custom_ca_trust(self, agentpool: AgentPool) -> AgentPool:
+        """Set up custom ca trust property for the AgentPool object.
+
+        :return: the AgentPool object
+        """
+        self._ensure_agentpool(agentpool)
+
+        agentpool.enable_custom_ca_trust = self.context.get_enable_custom_ca_trust()
+        return agentpool
+
     def construct_agentpool_profile_preview(self) -> AgentPool:
         """The overall controller used to construct the preview AgentPool profile.
 
@@ -248,14 +317,17 @@ def construct_agentpool_profile_preview(self) -> AgentPool:
 
         :return: the AgentPool object
         """
-        # construct the default AgentPool profile
+        # DO NOT MOVE: keep this on top, construct the default AgentPool profile
         agentpool = self.construct_agentpool_profile_default(bypass_restore_defaults=True)
+
         # set up preview vm properties
         agentpool = self.set_up_preview_vm_properties(agentpool)
         # set up message of the day
         agentpool = self.set_up_motd(agentpool)
         # set up gpu profiles
-        agentpool = self.set_up_gpu_propertes(agentpool)
+        agentpool = self.set_up_gpu_properties(agentpool)
+        # set up custom ca trust
+        agentpool = self.set_up_custom_ca_trust(agentpool)
 
         # DO NOT MOVE: keep this at the bottom, restore defaults
         agentpool = self._restore_defaults_in_agentpool(agentpool)
@@ -295,6 +367,20 @@ def init_context(self) -> None:
             self.agentpool_decorator_mode,
         )
 
+    def update_custom_ca_trust(self, agentpool: AgentPool) -> AgentPool:
+        """Update custom ca trust property for the AgentPool object.
+
+        :return: the AgentPool object
+        """
+        self._ensure_agentpool(agentpool)
+
+        if self.context.get_enable_custom_ca_trust():
+            agentpool.enable_custom_ca_trust = True
+
+        if self.context.get_disable_custom_ca_trust():
+            agentpool.enable_custom_ca_trust = False
+        return agentpool
+
     def update_agentpool_profile_preview(self, agentpools: List[AgentPool] = None) -> AgentPool:
         """The overall controller used to update the preview AgentPool profile.
 
@@ -303,6 +389,9 @@ def update_agentpool_profile_preview(self, agentpools: List[AgentPool] = None) -
 
         :return: the AgentPool object
         """
-        # fetch and update the default AgentPool profile
+        # DO NOT MOVE: keep this on top, fetch and update the default AgentPool profile
         agentpool = self.update_agentpool_profile_default(agentpools)
+
+        # update custom ca trust
+        agentpool = self.update_custom_ca_trust(agentpool)
         return agentpool

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

@@ -54,15 +54,8 @@
 
 # type variables
 ContainerServiceClient = TypeVar("ContainerServiceClient")
-Identity = TypeVar("Identity")
 ManagedCluster = TypeVar("ManagedCluster")
-ManagedClusterLoadBalancerProfile = TypeVar("ManagedClusterLoadBalancerProfile")
-ManagedClusterPropertiesAutoScalerProfile = TypeVar("ManagedClusterPropertiesAutoScalerProfile")
-ResourceReference = TypeVar("ResourceReference")
 ManagedClusterAddonProfile = TypeVar("ManagedClusterAddonProfile")
-Snapshot = TypeVar("Snapshot")
-KubeletConfig = TypeVar("KubeletConfig")
-LinuxOSConfig = TypeVar("LinuxOSConfig")
 ManagedClusterHTTPProxyConfig = TypeVar("ManagedClusterHTTPProxyConfig")
 ManagedClusterSecurityProfileWorkloadIdentity = TypeVar("ManagedClusterSecurityProfileWorkloadIdentity")
 ManagedClusterOIDCIssuerProfile = TypeVar("ManagedClusterOIDCIssuerProfile")
@@ -71,6 +64,7 @@
 ManagedClusterStorageProfileDiskCSIDriver = TypeVar('ManagedClusterStorageProfileDiskCSIDriver')
 ManagedClusterStorageProfileFileCSIDriver = TypeVar('ManagedClusterStorageProfileFileCSIDriver')
 ManagedClusterStorageProfileSnapshotController = TypeVar('ManagedClusterStorageProfileSnapshotController')
+ManagedClusterIngressProfileWebAppRouting = TypeVar("ManagedClusterIngressProfileWebAppRouting")
 
 
 # pylint: disable=too-few-public-methods
@@ -232,8 +226,8 @@ def get_service_cidrs(self) -> Union[List[str], None]:
         # this parameter does not need validation
         return service_cidrs
 
-    def get_ip_families(self):
-        """Obtain the CIDR ranges for the service subnet.
+    def get_ip_families(self) -> Union[List[str], None]:
+        """Obtain the value of ip_families.
 
         :return: List[str] or None
         """
@@ -1026,6 +1020,26 @@ def get_apiserver_subnet_id(self) -> Union[str, None]:
         """
         return self._get_apiserver_subnet_id(enable_validation=True)
 
+    def get_dns_zone_resource_id(self) -> Union[str, None]:
+        """Obtain the value of ip_families.
+
+        :return: string or None
+        """
+        # read the original value passed by the command
+        dns_zone_resource_id = self.raw_param.get("dns_zone_resource_id")
+        # try to read the property value corresponding to the parameter from the `mc` object
+        if (
+            self.mc and
+            self.mc.ingress_profile and
+            self.mc.ingress_profile.web_app_routing and
+            self.mc.ingress_profile.web_app_routing.dns_zone_resource_id is not None
+        ):
+            dns_zone_resource_id = self.mc.ingress_profile.web_app_routing.dns_zone_resource_id
+
+        # this parameter does not need dynamic completion
+        # this parameter does not need validation
+        return dns_zone_resource_id
+
 
 class AKSPreviewManagedClusterCreateDecorator(AKSManagedClusterCreateDecorator):
     def __init__(
@@ -1272,6 +1286,22 @@ def set_up_storage_profile(self, mc: ManagedCluster) -> ManagedCluster:
 
         return mc
 
+    def set_up_ingress_web_app_routing(self, mc: ManagedCluster) -> ManagedCluster:
+        """Set up web app routing profile in ingress profile for the ManagedCluster object.
+
+        :return: the ManagedCluster object
+        """
+        addons = self.context.get_enable_addons()
+        if "web_application_routing" in addons:
+            if mc.ingress_profile is None:
+                mc.ingress_profile = self.models.ManagedClusterIngressProfile()
+            dns_zone_resource_id = self.context.get_dns_zone_resource_id()
+            mc.ingress_profile.web_app_routing = self.models.ManagedClusterIngressProfileWebAppRouting(
+                enabled=True,
+                dns_zone_resource_id=dns_zone_resource_id,
+            )
+        return mc
+
     def construct_mc_profile_preview(self, bypass_restore_defaults: bool = False) -> ManagedCluster:
         """The overall controller used to construct the default ManagedCluster profile.
 
@@ -1304,6 +1334,8 @@ def construct_mc_profile_preview(self, bypass_restore_defaults: bool = False) ->
         mc = self.set_up_creationdata_of_cluster_snapshot(mc)
         # set up storage profile
         mc = self.set_up_storage_profile(mc)
+        # set up ingress web app routing profile
+        mc = self.set_up_ingress_web_app_routing(mc)
 
         # DO NOT MOVE: keep this at the bottom, restore defaults
         mc = self._restore_defaults_in_mc(mc)