Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tag_filter_matches now uses regex for key/value matches

Browse Source
This commit is contained in:
Kieran Doonan 2016-07-05 11:28:35 +01:00
parent 20e00dd095
commit d3dcb8d3b5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/ec2/utils.py
View File

@ -348,8 +348,10 @@ def tag_filter_matches(obj, filter_name, filter_values):
tag_values = get_obj_tag_values(obj) tag_values = get_obj_tag_values(obj)
return len(set(filter_values).intersection(tag_values)) > 0 return len(set(filter_values).intersection(tag_values)) > 0
else: else:
tag_value = get_obj_tag(obj, filter_name) import re
return tag_value in filter_values tag_value = get_obj_tag(obj, filter_name) or ''
regex_filters = [re.compile(simple_aws_filter_to_re(f)) for f in filter_values]
return any(regex.match(tag_value) for regex in regex_filters)
filter_dict_attribute_mapping = { filter_dict_attribute_mapping = {