Skip to content

GH-7196: More lenient regex for container image templating #3421

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

Merged
pingsutw merged 5 commits into from
Apr 10, 2026
Merged

GH-7196: More lenient regex for container image templating #3421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
398de4b
Add tests
Tom-Newton Apr 10, 2026
cf81126
Update regex
Tom-Newton Apr 10, 2026
11af75b
Fix other test
Tom-Newton Apr 10, 2026
a3a26d5
Move tests somewhere more appropriate
Tom-Newton Apr 10, 2026
b028292
Autoformat
Tom-Newton Apr 10, 2026
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
5 changes: 4 additions & 1 deletion flytekit/core/python_auto_container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,4 +489,7 @@ def get_registerable_container_image(img: Optional[Union[str, ImageSpec]], cfg:
# fqn will access the fully qualified name of the image (e.g. registry/imagename:version -> registry/imagename)
# version will access the version part of the image (e.g. registry/imagename:version -> version)
# With empty attribute, it'll access the full image path (e.g. registry/imagename:version -> registry/imagename:version)
_IMAGE_REPLACE_REGEX = re.compile(r"({{\s*\.image[s]?(?:\.([a-zA-Z0-9_]+))(?:\.([a-zA-Z0-9_]+))?\s*}})", re.IGNORECASE)
_IMAGE_TEMPLATE_SUBSTRING_REGEX = r"(?:\.([a-zA-Z0-9_-]+))"
_IMAGE_REPLACE_REGEX = re.compile(
rf"({{{{\s*\.image[s]?{_IMAGE_TEMPLATE_SUBSTRING_REGEX}{_IMAGE_TEMPLATE_SUBSTRING_REGEX}?\s*}}}})", re.IGNORECASE
)
21 changes: 20 additions & 1 deletion tests/flytekit/unit/core/test_python_function_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,17 @@ def test_container_image_conversion(mock_image_spec_builder):
name="other3",
fqn="xyz.com/other3",
)
cfg = ImageConfig(default_image=default_img, images=[default_img, other_img, other_img2, other_img3])
other_img4 = Image(
name="other-4",
fqn="other4",
tag="tag4"
)
other_img5 = Image(
name="other_5",
fqn="xyz.com/other5",
tag="tag5"
)
cfg = ImageConfig(default_image=default_img, images=[default_img, other_img, other_img2, other_img3, other_img4, other_img5])
assert get_registerable_container_image(None, cfg) == "xyz.com/abc:tag1"
assert get_registerable_container_image("", cfg) == "xyz.com/abc:tag1"
assert get_registerable_container_image("abc", cfg) == "abc"
Expand All @@ -72,6 +82,15 @@ def test_container_image_conversion(mock_image_spec_builder):
get_registerable_container_image("{{.image.other3.fqn}}:{{.image.other3.version}}", cfg)
== "xyz.com/other3:tag1"
)
assert (
get_registerable_container_image("{{.image.other-4.fqn}}:{{.image.other-4.version}}", cfg)
== "other4:tag4"
)
assert (
get_registerable_container_image("{{.image.other_5.fqn}}:{{.image.other_5.version}}", cfg)
== "xyz.com/other5:tag5"
)

assert get_registerable_container_image("{{.image.other.fqn}}", cfg) == "xyz.com/other"
# Works with images instead of just image
assert get_registerable_container_image("{{.images.other.fqn}}", cfg) == "xyz.com/other"
Expand Down
Loading