Skip to content
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.

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

Skip EnsureRenderedStringPattern preprocessor if parameter has verbatim directives #19

Merged
merged 2 commits into from
Jan 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 16 additions & 8 deletions boundary_layer_default_plugin/preprocessors.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,23 @@ def process_arg(self, arg, node, raw_args):
regex.pattern)
return arg

if not regex.match(rendered_arg):
raise Exception(
'Invalid argument `{}`: does not match expected pattern `{}`'.format(
rendered_arg,
regex.pattern))
if regex.match(rendered_arg):
# return the original arg, not the rendered arg, because we are not
# actually transforming anything, just validating
return arg

VERBATIM_REGEX = '<<.+>>'
if re.compile(VERBATIM_REGEX).search(rendered_arg):
logger.warning(
'Argument generated from `%s` may not match the required pattern `%s` and fail.',
rendered_arg,
regex.pattern)
return arg

# return the original arg, not the rendered arg, because we are not
# actually transforming anything, just validating
return arg
raise Exception(
'Invalid argument `{}`: does not match expected pattern `{}`'.format(
rendered_arg,
regex.pattern))

@property
def pattern(self):
Expand Down
18 changes: 18 additions & 0 deletions test/default_plugin/test_preprocessors.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,21 @@ def test_ensure_rendered_string_pattern(mocker):
) == "my-cluster-{{unknown_var.task_id}}"
warning_mock.assert_called_once()


warning_mock = Mock()
mocker.patch.object(logger, 'warning', new=warning_mock)
assert renderer.process_arg(
"my-<<item_name>>-cluster", None, {},
) == "my-<<item_name>>-cluster"
warning_mock.assert_called_once()

warning_mock = Mock()
mocker.patch.object(logger, 'warning', new=warning_mock)
assert renderer.process_arg(
"my-cluster-<<item.value>>", None, {},
) == "my-cluster-<<item.value>>"
warning_mock.assert_called_once()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice tests, thanks!


with pytest.raises(Exception):
renderer.process_arg("my-cluster-", None, {})

Expand All @@ -46,3 +61,6 @@ def test_ensure_rendered_string_pattern(mocker):
"my-cluster-{{execution_date.strftime('%Y_%m_%d')}}",
None,
{})

with pytest.raises(Exception):
renderer.process_arg("My-<item.value>-cluster", None, {})