Skip to content

fix: do not fail on bool docker opts when substituting #969

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
bertbesser wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: do not fail on bool docker opts when substituting #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1081785
fix: do not fail on bool docker opts when substituting
bertbesser Feb 21, 2021
c27032d
test: fix tests
bertbesser Apr 17, 2021
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
7 changes: 5 additions & 2 deletions src/popper/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,17 @@ def __apply_substitution(wf_element, k, v, used_registry):
used_registry[k] = 1

elif isinstance(wf_element, dict):
# we assume map of strings
for ek in wf_element:
if k in ek:
log.fail("Substitutions not allowed on dictionary keys")
if k in wf_element[ek]:
if type(wf_element[ek]) == str and k in wf_element[ek]:
log.debug(f"Applying substitution to value associated to key {k}")
wf_element[ek] = wf_element[ek].replace(k, v)
used_registry[k] = 1
else:
wf_element[ek] = WorkflowParser.__apply_substitution(
wf_element[ek], k, v, used_registry
)

return wf_element

Expand Down
25 changes: 25 additions & 0 deletions src/test/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,31 @@ def test_substitutions(self):
**{"wf_data": wf_data, "substitutions": ["SUB1=WRONG"]}
)

# allow non-str values
wf_data = {
"steps": [
{
"uses": "some_image",
"id": "some_$_DUMMY",
"env": {"FOO": "BAR"},
"secrets": ["a-secret"],
"options": {"auto_remove": True},
}
]
}
substitutions = [
"_DUMMY=dummy",
]
wf = WorkflowParser.parse(
wf_data=wf_data, substitutions=substitutions, allow_loose=True
)
step = wf.steps[0]
self.assertEqual("some_image", step.uses)
self.assertEqual("some_dummy", step.id)
self.assertEqual("BAR", step.env["FOO"])
self.assertEqual(("a-secret",), step.secrets)
self.assertEqual({"auto_remove": True}, step.options)

# expect error when not all given subs are used
wf_data = {
"steps": [
Expand Down