Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ArfiArfath21 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions kubernetes/e2e_test/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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")
)
Expand Down
9 changes: 6 additions & 3 deletions kubernetes/utils/quantity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down Expand Up @@ -74,8 +77,8 @@ def parse_quantity(quantity):
else:
raise ValueError("{} has unknown suffix".format(quantity))

# handle SI inconsistency
if suffix == "ki":
# handle SI inconsistency: "ki", "mi", "ni" and "ui" are not valid binary suffixes
if base == 1024 and suffix[0] not in _BINARY_PREFIXES:
raise ValueError("{} has unknown suffix".format(quantity))

if suffix[0] not in _EXPONENTS:
Expand Down Expand Up @@ -133,7 +136,7 @@ def format_quantity(quantity_value, suffix, quantize=None) -> str:
else:
raise ValueError(f"{quantity_value} has unknown suffix")

if suffix == "ki":
if base == 1024 and suffix[0] not in _BINARY_PREFIXES:
raise ValueError(f"{quantity_value} has unknown suffix")

if suffix[0] not in _EXPONENTS:
Expand Down