fix code

Author: FumingZhang

src/aks-preview/azext_aks_preview/_natgateway.py

@@ -97,9 +97,9 @@ def configure_nat_gateway_profile(
         )
 
     if outbound_ip_prefix_ids is not None:
-        ManagedClusterNATGatewayProfileOutboundIPPrefixes = models.ManagedClusterNATGatewayProfileOutboundIPPrefixes
+        ManagedClusterNATGatewayProfileOutboundIpPrefixes = models.ManagedClusterNATGatewayProfileOutboundIpPrefixes
         prefix_id_list = [x.strip() for x in outbound_ip_prefix_ids.split(',') if x.strip()]
-        profile.outbound_ip_prefixes = ManagedClusterNATGatewayProfileOutboundIPPrefixes(
+        profile.outbound_ip_prefixes = ManagedClusterNATGatewayProfileOutboundIpPrefixes(
             public_ip_prefixes=prefix_id_list
         )
 

src/aks-preview/azext_aks_preview/agentpool_decorator.py

@@ -29,6 +29,7 @@
     read_file_content,
     sdk_no_wait,
 )
+from azure.core import MatchConditions
 from knack.log import get_logger
 from knack.prompting import prompt_y_n
 
@@ -59,6 +60,16 @@
 
 logger = get_logger(__name__)
 
+
+def _get_etag_match_condition(if_match, if_none_match):
+    """Convert if_match/if_none_match to etag/match_condition for the new SDK."""
+    if if_match is not None:
+        return if_match, MatchConditions.IfNotModified
+    if if_none_match is not None:
+        return if_none_match, MatchConditions.IfMissing
+    return None, None
+
+
 # type variables
 AgentPool = TypeVar("AgentPool")
 AgentPoolsOperations = TypeVar("AgentPoolsOperations")
@@ -1184,7 +1195,7 @@ def get_update_enable_disable_cluster_autoscaler_and_min_max_count_vmsize_vms(
         # if vm_size is not specified, use the size from the existing agentpool profile
         if vm_size is None:
             if autoscale_profile:
-                vm_size = autoscale_profile.size
+                vm_size = autoscale_profile[0].size
 
             if manual_scale_profile:
                 vm_size = manual_scale_profile[0].size
@@ -1481,11 +1492,11 @@ def set_up_virtual_machines_profile(self, agentpool: AgentPool) -> AgentPool:
         if enable_auto_scaling:
             agentpool.virtual_machines_profile = self.models.VirtualMachinesProfile(
                 scale=self.models.ScaleProfile(
-                    autoscale=self.models.AutoScaleProfile(
+                    autoscale=[self.models.AutoScaleProfile(
                         size=sizes[0],
                         min_count=min_count,
                         max_count=max_count,
-                    )
+                    )]
                 )
             )
         else:
@@ -1710,15 +1721,18 @@ def set_up_blue_green_upgrade_settings(self, agentpool: AgentPool) -> AgentPool:
     def add_agentpool(self, agentpool: AgentPool) -> AgentPool:
         """Send request to add a new agentpool."""
         self._ensure_agentpool(agentpool)
+        etag, match_condition = _get_etag_match_condition(
+            self.context.get_if_match(), self.context.get_if_none_match()
+        )
         return sdk_no_wait(
             self.context.get_no_wait(),
             self.client.begin_create_or_update,
             self.context.get_resource_group_name(),
             self.context.get_cluster_name(),
             self.context._get_nodepool_name(enable_validation=False),
             agentpool,
-            if_match=self.context.get_if_match(),
-            if_none_match=self.context.get_if_none_match(),
+            etag=etag,
+            match_condition=match_condition,
             headers=self.context.get_aks_custom_headers(),
         )
 
@@ -2065,11 +2079,11 @@ def update_auto_scaler_properties_vms(self, agentpool: AgentPool) -> AgentPool:
         if update_cluster_autoscaler or enable_cluster_autoscaler:
             agentpool.virtual_machines_profile = self.models.VirtualMachinesProfile(
                 scale=self.models.ScaleProfile(
-                    autoscale=self.models.AutoScaleProfile(
+                    autoscale=[self.models.AutoScaleProfile(
                         size=vm_size,
                         min_count=min_count,
                         max_count=max_count,
-                    )
+                    )]
                 )
             )
 
@@ -2182,15 +2196,18 @@ def update_agentpool(self, agentpool: AgentPool) -> AgentPool:
         """
         self._ensure_agentpool(agentpool)
 
+        etag, match_condition = _get_etag_match_condition(
+            self.context.get_if_match(), self.context.get_if_none_match()
+        )
         return sdk_no_wait(
             self.context.get_no_wait(),
             self.client.begin_create_or_update,
             self.context.get_resource_group_name(),
             self.context.get_cluster_name(),
             self.context.get_nodepool_name(),
             agentpool,
-            if_match=self.context.get_if_match(),
-            if_none_match=self.context.get_if_none_match(),
+            etag=etag,
+            match_condition=match_condition,
             headers=self.context.get_aks_custom_headers(),
         )
 
@@ -2205,6 +2222,9 @@ def add_agentpool(self, agentpool: AgentPool) -> AgentPool:
         """
         self._ensure_agentpool(agentpool)
 
+        etag, match_condition = _get_etag_match_condition(
+            self.context.get_if_match(), self.context.get_if_none_match()
+        )
         return sdk_no_wait(
             self.context.get_no_wait(),
             self.client.begin_create_or_update,
@@ -2213,7 +2233,7 @@ def add_agentpool(self, agentpool: AgentPool) -> AgentPool:
             # validated in "init_agentpool", skip to avoid duplicate api calls
             self.context._get_nodepool_name(enable_validation=False),
             agentpool,
-            if_match=self.context.get_if_match(),
-            if_none_match=self.context.get_if_none_match(),
+            etag=etag,
+            match_condition=match_condition,
             headers=self.context.get_aks_custom_headers(),
         )

src/aks-preview/azext_aks_preview/commands.py

@@ -100,62 +100,62 @@ def _patch_custom_cas_in_security_profile(security_profile):
 def load_command_table(self, _):
     managed_clusters_sdk = CliCommandType(
         operations_tmpl="azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks."
-        "operations._managed_clusters_operations#ManagedClustersOperations.{}",
+        "operations._operations#ManagedClustersOperations.{}",
         operation_group="managed_clusters",
         client_factory=cf_managed_clusters,
     )
 
     agent_pools_sdk = CliCommandType(
         operations_tmpl="azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks."
-        "operations._agent_pools_operations#AgentPoolsOperations.{}",
+        "operations._operations#AgentPoolsOperations.{}",
         client_factory=cf_managed_clusters,
     )
 
     managed_namespaces_sdk = CliCommandType(
         operations_tmpl="azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks."
-        "operations._managed_namespaces_operations#ManagedNamespacesOperations.{}",
+        "operations._operations#ManagedNamespacesOperations.{}",
         client_factory=cf_managed_namespaces,
     )
 
     machines_sdk = CliCommandType(
         operations_tmpl="azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks."
-        "operations._machine_operations#MachinesOperations.{}",
+        "operations._operations#MachinesOperations.{}",
         client_factory=cf_managed_clusters,
     )
 
     operations_sdk = CliCommandType(
         operations_tmpl="azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks."
-        "operations._operationstatusresult_operations#OperationStatusResultOperations.{}",
+        "operations._operations#OperationStatusResultOperations.{}",
         client_factory=cf_operations,
     )
 
     maintenance_configuration_sdk = CliCommandType(
         operations_tmpl="azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks."
-        "operations._maintenance_configurations_operations#MaintenanceConfigurationsOperations.{}",
+        "operations._operations#MaintenanceConfigurationsOperations.{}",
         client_factory=cf_maintenance_configurations,
     )
 
     nodepool_snapshot_sdk = CliCommandType(
         operations_tmpl="azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks."
-        "operations._snapshots_operations#SnapshotsOperations.{}",
+        "operations._operations#SnapshotsOperations.{}",
         client_factory=cf_nodepool_snapshots,
     )
 
     mc_snapshot_sdk = CliCommandType(
         operations_tmpl="azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks."
-        "operations._managed_clusters_snapshots_operations#ManagedClusterSnapshotsOperations.{}",
+        "operations._operations#ManagedClusterSnapshotsOperations.{}",
         client_factory=cf_mc_snapshots,
     )
 
     jwt_authenticators_sdk = CliCommandType(
         operations_tmpl="azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks."
-        "operations._jwt_authenticators_operations#JWTAuthenticatorsOperations.{}",
+        "operations._operations#JWTAuthenticatorsOperations.{}",
         client_factory=cf_jwt_authenticators,
     )
 
     vm_skus_sdk = CliCommandType(
         operations_tmpl="azext_aks_preview.vendored_sdks.azure_mgmt_preview_aks."
-        "operations._vm_skus_operations#VmSkusOperations.{}",
+        "operations._operations#VmSkusOperations.{}",
         client_factory=cf_vm_skus,
     )
 

src/aks-preview/azext_aks_preview/custom.py

@@ -170,6 +170,7 @@
     send_raw_request,
     shell_safe_json_parse,
 )
+from azure.core import MatchConditions
 from azure.core.exceptions import (
     ResourceNotFoundError,
     HttpResponseError,
@@ -184,6 +185,15 @@
 logger = get_logger(__name__)
 
 
+def _get_etag_match_condition(if_match, if_none_match):
+    """Convert if_match/if_none_match to etag/match_condition for the new SDK."""
+    if if_match is not None:
+        return if_match, MatchConditions.IfNotModified
+    if if_none_match is not None:
+        return if_none_match, MatchConditions.IfMissing
+    return None, None
+
+
 def wait_then_open(url):
     """
     Waits for a bit then opens a URL.  Useful for waiting for a proxy to come up, and then open the URL.
@@ -1463,12 +1473,15 @@ def aks_delete(cmd, client, resource_group_name, name, no_wait=False,
         logger.warning(
             "The '--if-none-match' option is not applicable to delete operations and will be ignored."
         )
+    etag = if_match
+    match_condition = MatchConditions.IfNotModified if if_match is not None else None
     return sdk_no_wait(
         no_wait,
         client.begin_delete,
         resource_group_name,
         name,
-        if_match=if_match,
+        etag=etag,
+        match_condition=match_condition,
         ignore_pod_disruption_budget=ignore_pod_disruption_budget,
     )
 
@@ -1509,15 +1522,24 @@ def _remove_nulls(managed_clusters):
     for managed_cluster in managed_clusters:
         for attr in attrs:
             if getattr(managed_cluster, attr, None) is None:
-                delattr(managed_cluster, attr)
+                try:
+                    delattr(managed_cluster, attr)
+                except AttributeError:
+                    pass
         if managed_cluster.agent_pool_profiles is not None:
             for ap_profile in managed_cluster.agent_pool_profiles:
                 for attr in ap_attrs:
                     if getattr(ap_profile, attr, None) is None:
-                        delattr(ap_profile, attr)
+                        try:
+                            delattr(ap_profile, attr)
+                        except AttributeError:
+                            pass
         for attr in sp_attrs:
             if getattr(managed_cluster.service_principal_profile, attr, None) is None:
-                delattr(managed_cluster.service_principal_profile, attr)
+                try:
+                    delattr(managed_cluster.service_principal_profile, attr)
+                except AttributeError:
+                    pass
     return managed_clusters
 
 
@@ -1546,14 +1568,14 @@ def aks_get_credentials(
             raise InvalidArgumentValueError("--format can only be specified when requesting clusterUser credential.")
     if admin:
         credentialResults = client.list_cluster_admin_credentials(
-            resource_group_name, name, serverType, headers=headers)
+            resource_group_name, name, server_fqdn=serverType, headers=headers)
     else:
         if user.lower() == 'clusteruser':
             credentialResults = client.list_cluster_user_credentials(
-                resource_group_name, name, serverType, credential_format, headers=headers)
+                resource_group_name, name, server_fqdn=serverType, format=credential_format, headers=headers)
         elif user.lower() == 'clustermonitoringuser':
             credentialResults = client.list_cluster_monitoring_user_credentials(
-                resource_group_name, name, serverType, headers=headers)
+                resource_group_name, name, server_fqdn=serverType, headers=headers)
         else:
             raise InvalidArgumentValueError("The value of option --user is invalid.")
 
@@ -1769,15 +1791,16 @@ def aks_upgrade(cmd,
 
     headers = get_aks_custom_headers(aks_custom_headers)
 
+    etag, match_condition = _get_etag_match_condition(if_match, if_none_match)
     return sdk_no_wait(
         no_wait,
         client.begin_create_or_update,
         resource_group_name,
         name,
         instance,
         headers=headers,
-        if_match=if_match,
-        if_none_match=if_none_match)
+        etag=etag,
+        match_condition=match_condition)
 
 
 def _update_upgrade_settings(cmd, instance,
@@ -2245,6 +2268,7 @@ def aks_agentpool_upgrade(cmd,
         allow_appending_values_to_same_key=True,
     )
 
+    etag, match_condition = _get_etag_match_condition(if_match, if_none_match)
     return sdk_no_wait(
         no_wait,
         client.begin_create_or_update,
@@ -2253,8 +2277,8 @@ def aks_agentpool_upgrade(cmd,
         nodepool_name,
         instance,
         headers=aks_custom_headers,
-        if_match=if_match,
-        if_none_match=if_none_match,
+        etag=etag,
+        match_condition=match_condition,
     )
 
 
@@ -2481,13 +2505,16 @@ def aks_agentpool_delete(cmd,   # pylint: disable=unused-argument
             "use 'aks nodepool list' to get current node pool list"
         )
 
+    etag = if_match
+    match_condition = MatchConditions.IfNotModified if if_match is not None else None
     return sdk_no_wait(
         no_wait,
         client.begin_delete,
         resource_group_name,
         cluster_name,
         nodepool_name,
-        if_match=if_match,
+        etag=etag,
+        match_condition=match_condition,
         ignore_pod_disruption_budget=ignore_pod_disruption_budget,
     )
 

src/aks-preview/azext_aks_preview/jwtauthenticator.py

@@ -114,7 +114,10 @@ def construct_jwt_authenticator(cmd, raw_parameters):
 
     # Create JWT authenticator properties from config
     try:
-        properties = JWTAuthenticatorProperties.from_dict(config)
+        if hasattr(JWTAuthenticatorProperties, 'from_dict'):
+            properties = JWTAuthenticatorProperties.from_dict(config)
+        else:
+            properties = JWTAuthenticatorProperties(config)
     except AttributeError as e:
         raise InvalidArgumentValueError(
             f"JWT authenticator model does not support from_dict method: {str(e)}"