fix(utils): reject mi, ni and ui as quantity suffixes

kubernetes/e2e_test/test_utils.py

@@ -688,6 +688,11 @@ def test_parse_quantity(self):
         self.assertRaises(
             ValueError, lambda: quantity.parse_quantity("1000ki")
         )
+        # "m", "n" and "u" are base 1000 only; there is no mi, ni or ui
+        for invalid in ("1mi", "1ni", "1ui"):
+            self.assertRaises(
+                ValueError, lambda: quantity.parse_quantity(invalid)
+            )
         self.assertRaises(ValueError, lambda: quantity.parse_quantity("1000foo"))
         self.assertRaises(ValueError, lambda: quantity.parse_quantity("foo"))
         self.assertRaises(
@@ -732,6 +737,10 @@ def test_format_quantity(self):
         self.assertRaises(
             ValueError, lambda: quantity.format_quantity(Decimal(1_000), "ki")
         )
+        for invalid in ("mi", "ni", "ui"):
+            self.assertRaises(
+                ValueError, lambda: quantity.format_quantity(Decimal(1_000), invalid)
+            )
         self.assertRaises(
             ValueError, lambda: quantity.format_quantity(Decimal(1_000), "foo")
         )

kubernetes/utils/quantity.py

@@ -26,6 +26,9 @@
     "E": 6,
 }
 
+# Only these prefixes exist in base 1024 (Ki, Mi, Gi, Ti, Pi, Ei).
+_BINARY_PREFIXES = "KMGTPE"
+
 
 def parse_quantity(quantity):
     """
@@ -68,16 +71,15 @@ def parse_quantity(quantity):
         return number
 
     if suffix.endswith("i"):
+        # handle SI inconsistency: "ki", "mi", "ni" and "ui" are not valid binary suffixes
+        if suffix[0] not in _BINARY_PREFIXES:
+            raise ValueError("{} has unknown suffix".format(quantity))
         base = 1024
     elif len(suffix) == 1:
         base = 1000
     else:
         raise ValueError("{} has unknown suffix".format(quantity))
 
-    # handle SI inconsistency
-    if suffix == "ki":
-        raise ValueError("{} has unknown suffix".format(quantity))
-
     if suffix[0] not in _EXPONENTS:
         raise ValueError("{} has unknown suffix".format(quantity))
 
@@ -127,15 +129,14 @@ def format_quantity(quantity_value, suffix, quantize=None) -> str:
         return str(quantity_value)
 
     if suffix.endswith("i"):
+        if suffix[0] not in _BINARY_PREFIXES:
+            raise ValueError(f"{quantity_value} has unknown suffix")
         base = 1024
     elif len(suffix) == 1:
         base = 1000
     else:
         raise ValueError(f"{quantity_value} has unknown suffix")
 
-    if suffix == "ki":
-        raise ValueError(f"{quantity_value} has unknown suffix")
-
     if suffix[0] not in _EXPONENTS:
         raise ValueError(f"{quantity_value} has unknown suffix")