fix(az aks list-vm-skus): filter out vm skus with AZ restrictions by default

Author: CustardTart32

src/aks-preview/azext_aks_preview/custom.py

@@ -3450,7 +3450,7 @@ def aks_list_vm_skus(cmd, client, location, size=None, zone=None, show_all=None)
     result = list(client.list(location))
 
     if not show_all:
-        result = [sku for sku in result if _aks_is_vm_sku_available(sku, zone)]
+        result = [sku for sku in result if _aks_is_vm_sku_available(sku)]
 
     if size:
         result = [sku for sku in result if sku.name and size.lower() in sku.name.lower()]

src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py

@@ -22721,7 +22721,6 @@ def test_aks_list_vm_skus(self):
         ).get_output_in_json()
         assert len(zonal) > 0, "expected zone-capable SKUs in eastus"
         for sku in zonal:
-            zones = (
-                (sku.get("locationInfo") or [{}])[0].get("zones") or []
-            )
+            loc_info = sku.get("locationInfo", [])
+            zones = loc_info[0].get("zones", []) if loc_info else []
             assert len(zones) > 0, f"SKU '{sku['name']}' has no zones despite --zone filter"

src/aks-preview/azext_aks_preview/tests/latest/test_vm_skus.py

@@ -56,76 +56,69 @@ class TestAksIsVmSkuAvailable(unittest.TestCase):
 
     def test_no_restrictions_returns_true(self):
         sku = _make_sku("Standard_D4s_v3", restrictions=[])
-        self.assertTrue(_aks_is_vm_sku_available(sku, zone=False))
+        self.assertTrue(_aks_is_vm_sku_available(sku))
 
     def test_none_restrictions_returns_true(self):
         sku = _make_sku("Standard_D4s_v3")
         sku.restrictions = None
-        self.assertTrue(_aks_is_vm_sku_available(sku, zone=False))
+        self.assertTrue(_aks_is_vm_sku_available(sku))
 
     def test_irrelevant_reason_code_is_ignored(self):
         # A restriction with a different reason_code should not affect availability.
         restriction = _make_restriction("Location", reason_code="ManuallyExcluded",
                                         locations=["eastus"])
         sku = _make_sku("Standard_D4s_v3", location="eastus",
                         restrictions=[restriction])
-        self.assertTrue(_aks_is_vm_sku_available(sku, zone=False))
+        self.assertTrue(_aks_is_vm_sku_available(sku))
 
     def test_location_restriction_matching_location_returns_false(self):
         restriction = _make_restriction("Location", locations=["eastus"])
         sku = _make_sku("Standard_D4s_v3", location="eastus",
                         restrictions=[restriction])
-        self.assertFalse(_aks_is_vm_sku_available(sku, zone=False))
+        self.assertFalse(_aks_is_vm_sku_available(sku))
 
     def test_location_restriction_non_matching_location_returns_true(self):
         restriction = _make_restriction("Location", locations=["westus"])
         sku = _make_sku("Standard_D4s_v3", location="eastus",
                         restrictions=[restriction])
-        self.assertTrue(_aks_is_vm_sku_available(sku, zone=False))
+        self.assertTrue(_aks_is_vm_sku_available(sku))
 
-    def test_zone_restriction_all_zones_restricted_with_zone_flag_returns_false(self):
-        # All three zones are restricted and caller requests zone-aware filtering.
+    def test_zone_restriction_all_zones_restricted_returns_false(self):
+        # All three zones are restricted — SKU is unavailable.
         restriction = _make_restriction("Zone", zones=["1", "2", "3"])
         sku = _make_sku("Standard_D4s_v3", zones=["1", "2", "3"],
                         restrictions=[restriction])
-        self.assertFalse(_aks_is_vm_sku_available(sku, zone=True))
+        self.assertFalse(_aks_is_vm_sku_available(sku))
 
     def test_zone_restriction_partial_zones_restricted_returns_true(self):
         # Only zones 1 and 2 are restricted, but zone 3 is still available.
         restriction = _make_restriction("Zone", zones=["1", "2"])
         sku = _make_sku("Standard_D4s_v3", zones=["1", "2", "3"],
                         restrictions=[restriction])
-        self.assertTrue(_aks_is_vm_sku_available(sku, zone=True))
-
-    def test_zone_restriction_ignored_when_zone_flag_false(self):
-        # Even if all zones are restricted, without --zone the SKU is available.
-        restriction = _make_restriction("Zone", zones=["1", "2", "3"])
-        sku = _make_sku("Standard_D4s_v3", zones=["1", "2", "3"],
-                        restrictions=[restriction])
-        self.assertTrue(_aks_is_vm_sku_available(sku, zone=False))
+        self.assertTrue(_aks_is_vm_sku_available(sku))
 
     def test_location_restriction_with_empty_locations_list_returns_true(self):
         # restriction_info.locations is present but empty – current region is not listed.
         restriction = _make_restriction("Location", locations=[])
         sku = _make_sku("Standard_D4s_v3", location="eastus",
                         restrictions=[restriction])
-        self.assertTrue(_aks_is_vm_sku_available(sku, zone=False))
+        self.assertTrue(_aks_is_vm_sku_available(sku))
 
     def test_multiple_restrictions_one_location_match_returns_false(self):
         # One restriction is unrelated; the second blocks the current location.
         r1 = _make_restriction("Zone", zones=["1"])
         r2 = _make_restriction("Location", locations=["eastus"])
         sku = _make_sku("Standard_D4s_v3", location="eastus",
                         zones=["1", "2", "3"], restrictions=[r1, r2])
-        self.assertFalse(_aks_is_vm_sku_available(sku, zone=False))
+        self.assertFalse(_aks_is_vm_sku_available(sku))
 
     def test_none_restriction_info_is_handled_gracefully(self):
         restriction = _make_restriction("Location", locations=["eastus"])
         restriction.restriction_info = None
         sku = _make_sku("Standard_D4s_v3", location="eastus",
                         restrictions=[restriction])
         # With restriction_info=None the locations list defaults to [], so no match.
-        self.assertTrue(_aks_is_vm_sku_available(sku, zone=False))
+        self.assertTrue(_aks_is_vm_sku_available(sku))
 
 
 if __name__ == '__main__':

src/aks-preview/azext_aks_preview/vm_skus_util.py

@@ -5,12 +5,12 @@
 """Helpers for the `az aks list-vm-skus` command."""
 
 
-def _aks_is_vm_sku_available(sku, zone):
+def _aks_is_vm_sku_available(sku):
     """Return True if the SKU is available for the current subscription.
 
     A SKU is considered unavailable when:
     1. It has a Location restriction that covers this region, or
-    2. The --zone flag is set AND all availability zones in the region are restricted.
+    2. All availability zones in the region are restricted.
     """
     if not sku.restrictions:
         return True
@@ -22,13 +22,14 @@ def _aks_is_vm_sku_available(sku, zone):
         restriction_type = restriction.type
         restriction_info = restriction.restriction_info
 
+        # NOTE: Should already filtered at the API level
         if restriction_type == "Location":
             restricted_locations = (restriction_info.locations or []) if restriction_info else []
             location_info = sku.location_info[0] if sku.location_info else None
             if location_info and location_info.location in restricted_locations:
                 return False
 
-        if restriction_type == "Zone" and zone:
+        if restriction_type == "Zone":
             location_info = sku.location_info[0] if sku.location_info else None
             if location_info:
                 available_zones = set(location_info.zones or [])