Skip to content

Make Fn::Sub regex match non-greedy #11

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

Make Fn::Sub regex match non-greedy #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95f1c18
Make Fn::Sub regex match non-greedy
dklawson Mar 16, 2020
0ef8923
Add test for Fn::Sub regex fix
dklawson Mar 17, 2020
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
11 changes: 10 additions & 1 deletion aws_parsecf/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,15 @@ def fn_sub(self, value):
"""
>>> from aws_parsecf.parser import Parser

>>> root = {'Parameters': {'Who': {'Type': 'String', 'Default': 'world'},
... 'When': {'Type': 'String', 'Default': 'NOW'}},
... 'Fn::Sub': 'hello-${Who} ${When}'}
>>> Functions(Parser(root, 'us-east-1'),
... root,
... 'us-east-1'
... ).fn_sub('hello-${Who} ${When}')
'hello-world NOW'

>>> root = {'Fn::Sub': ['hello-${Who} ${When}', {'Who': 'world', 'When': 'NOW'}]}
>>> Functions(Parser(root, 'us-east-1'),
... root,
Expand Down Expand Up @@ -385,7 +394,7 @@ def _find_att(self, current, key):
return result
raise KeyError(key)

SUB_VARIABLE_PATTERN = re.compile(r"\${(.+)}")
SUB_VARIABLE_PATTERN = re.compile(r"\${(.+?)}")
def _sub_variable(self, match):
variable = match.group(1)
if variable.startswith('!'):
Expand Down