catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #659 from kierandoonan/fix-tag-filter

Browse source 
Fix tag filter
This commit is contained in:
Steve Pulec 2016-07-09 21:11:12 -04:00 • committed by GitHub
commit c34481a476
2 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
moto/ec2/utils.py
View file

@ -341,15 +341,19 @@ def get_obj_tag_values(obj):
return tags
def tag_filter_matches(obj, filter_name, filter_values):
regex_filters = [re.compile(simple_aws_filter_to_re(f)) for f in filter_values]
if filter_name == 'tag-key':
tag_names = get_obj_tag_names(obj)
return len(set(filter_values).intersection(tag_names)) > 0
tag_values = get_obj_tag_names(obj)
elif filter_name == 'tag-value':
tag_values = get_obj_tag_values(obj)
return len(set(filter_values).intersection(tag_values)) > 0
else:
tag_value = get_obj_tag(obj, filter_name)
return tag_value in filter_values
tag_values = [get_obj_tag(obj, filter_name) or '']
for tag_value in tag_values:
if any(regex.match(tag_value) for regex in regex_filters):
return True
return False
filter_dict_attribute_mapping = {