Skip to content

Fix UUID pattern anchoring #1116

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
fallintoplace wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix UUID pattern anchoring #1116

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
2 changes: 1 addition & 1 deletion src/lib/utils/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
UuidPattern = Annotated[
str,
pydantic.Field(
pattern=f'^{UUID_REGEX}|{OLD_UUID_REGEX}|{GROUP_UUID_REGEX}$')]
pattern=f'^(?:{UUID_REGEX}|{OLD_UUID_REGEX}|{GROUP_UUID_REGEX})$')]

WFID_REGEX = r'[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9])?-\d+$'
RESOURCE_REGEX = r'(?P<size>(\d+(?:\.\d+)?))(?P<unit>([a-zA-Z]*))'
Expand Down
27 changes: 27 additions & 0 deletions src/lib/utils/tests/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,33 @@ def test_truncated(self):
self.assertEqual(len(uid), 8)


class TestUuidPattern(unittest.TestCase):
""" Tests for UUID validation. """

def test_accepts_supported_uuid_formats(self):
adapter = pydantic.TypeAdapter(common.UuidPattern)

for uuid_value in [
'a' * 32,
'osmo-' + 'a' * 32,
'abcdefghijklmnopqrstuvwxyz',
]:
with self.subTest(uuid_value=uuid_value):
self.assertEqual(adapter.validate_python(uuid_value), uuid_value)

def test_rejects_partial_or_uppercase_uuid_values(self):
adapter = pydantic.TypeAdapter(common.UuidPattern)

for uuid_value in [
'a' * 32 + '-junk',
'xxxabcdefghijklmnopqrstuvwxyzyyy',
'A' * 32,
]:
with self.subTest(uuid_value=uuid_value):
with self.assertRaises(pydantic.ValidationError):
adapter.validate_python(uuid_value)


class TestConvertCpuUnit(unittest.TestCase):
""" Tests for convert_cpu_unit. """

Expand Down