cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Implement AND'd filters in ec2.py/ini (#30272)

Browse source 
* Implement AND'd filters in ec2.py/ini

remove debug print

* Adjusting code to changed filters' data structure
This commit is contained in:
Martin Krizek 2017-09-21 18:06:56 +02:00 committed by Sloane Hertel
parent 2295494fa5
commit d804ac6f4b
2 changed files with 65 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
contrib/inventory/ec2.ini
View file

@ -159,7 +159,9 @@ group_by_elasticache_replication_group = True
# inventory. For the full list of possible filters, please read the EC2 API # inventory. For the full list of possible filters, please read the EC2 API
# docs: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html#query-DescribeInstances-filters # docs: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html#query-DescribeInstances-filters
# Filters are key/value pairs separated by '=', to list multiple filters use # Filters are key/value pairs separated by '=', to list multiple filters use
# a list separated by commas. See examples below. # a list separated by commas. To "AND" criteria together, use "&". Note that
# the "AND" is not useful along with stack_filters and so such usage is not allowed.
# See examples below.
# If you want to apply multiple filters simultaneously, set stack_filters to # If you want to apply multiple filters simultaneously, set stack_filters to
# True. Default behaviour is to combine the results of all filters. Stacking # True. Default behaviour is to combine the results of all filters. Stacking
@ -181,6 +183,13 @@ stack_filters = False
# (ex. webservers15, webservers1a, webservers123 etc) # (ex. webservers15, webservers1a, webservers123 etc)
# instance_filters = tag:Name=webservers1* # instance_filters = tag:Name=webservers1*
# Retrieve only instances of type t1.micro that also have tag env=stage
# instance_filters = instance-type=t1.micro&tag:env=stage
# Retrieve instances of type t1.micro AND tag env=stage, as well as any instance
# that are of type m3.large, regardless of env tag
# instance_filters = instance-type=t1.micro&tag:env=stage,instance-type=m3.large
# An IAM role can be assumed, so all requests are run as that role. # An IAM role can be assumed, so all requests are run as that role.
# This can be useful for connecting across different accounts, or to limit user # This can be useful for connecting across different accounts, or to limit user
# access # access

55
contrib/inventory/ec2.py
View file

@ -488,19 +488,27 @@ class Ec2Inventory(object):
self.stack_filters = False self.stack_filters = False
# Instance filters (see boto and EC2 API docs). Ignore invalid filters. # Instance filters (see boto and EC2 API docs). Ignore invalid filters.
self.ec2_instance_filters = defaultdict(list) self.ec2_instance_filters = []
if config.has_option('ec2', 'instance_filters'): if config.has_option('ec2', 'instance_filters'):
filters = config.get('ec2', 'instance_filters')
filters = [f for f in config.get('ec2', 'instance_filters').split(',') if f] if self.stack_filters and '&' in filters:
self.fail_with_error("AND filters along with stack_filter enabled is not supported.\n")
for instance_filter in filters: filter_sets = [f for f in filters.split(',') if f]
for filter_set in filter_sets:
filters = {}
filter_set = filter_set.strip()
for instance_filter in filter_set.split("&"):
instance_filter = instance_filter.strip() instance_filter = instance_filter.strip()
if not instance_filter or '=' not in instance_filter: if not instance_filter or '=' not in instance_filter:
continue continue
filter_key, filter_value = [x.strip() for x in instance_filter.split('=', 1)] filter_key, filter_value = [x.strip() for x in instance_filter.split('=', 1)]
if not filter_key: if not filter_key:
continue continue
self.ec2_instance_filters[filter_key].append(filter_value) filters[filter_key] = filter_value
self.ec2_instance_filters.append(filters.copy())
def parse_cli_args(self): def parse_cli_args(self):
''' Command line argument processing ''' ''' Command line argument processing '''
@ -582,12 +590,12 @@ class Ec2Inventory(object):
if self.ec2_instance_filters: if self.ec2_instance_filters:
if self.stack_filters: if self.stack_filters:
filters_dict = {} filters_dict = {}
for filter_key, filter_values in self.ec2_instance_filters.items(): for filters in self.ec2_instance_filters:
filters_dict[filter_key] = filter_values filters_dict.update(filters)
reservations.extend(conn.get_all_instances(filters=filters_dict)) reservations.extend(conn.get_all_instances(filters=filters_dict))
else: else:
for filter_key, filter_values in self.ec2_instance_filters.items(): for filters in self.ec2_instance_filters:
reservations.extend(conn.get_all_instances(filters={filter_key: filter_values})) reservations.extend(conn.get_all_instances(filters=filters))
else: else:
reservations = conn.get_all_instances() reservations = conn.get_all_instances()
@ -627,31 +635,28 @@ class Ec2Inventory(object):
''' return True if given tags match configured filters ''' ''' return True if given tags match configured filters '''
if not self.ec2_instance_filters: if not self.ec2_instance_filters:
return True return True
match = self.stack_filters
for filter_name, filter_value in self.ec2_instance_filters.items(): for filters in self.ec2_instance_filters:
for filter_name, filter_value in filters.items():
if filter_name[:4] != 'tag:': if filter_name[:4] != 'tag:':
continue continue
filter_name = filter_name[4:] filter_name = filter_name[4:]
if filter_name not in tags: if filter_name not in tags:
if self.stack_filters: if self.stack_filters:
match = False return False
break
continue continue
if isinstance(filter_value, list): if isinstance(filter_value, list):
if self.stack_filters and tags[filter_name] not in filter_value: if self.stack_filters and tags[filter_name] not in filter_value:
match = False return False
break
if not self.stack_filters and tags[filter_name] in filter_value: if not self.stack_filters and tags[filter_name] in filter_value:
match = True return True
break
if isinstance(filter_value, six.string_types): if isinstance(filter_value, six.string_types):
if self.stack_filters and tags[filter_name] != filter_value: if self.stack_filters and tags[filter_name] != filter_value:
match = False return False
break
if not self.stack_filters and tags[filter_name] == filter_value: if not self.stack_filters and tags[filter_name] == filter_value:
match = True return True
break
return match return self.stack_filters
def get_rds_instances_by_region(self, region): def get_rds_instances_by_region(self, region):
''' Makes an AWS API call to the list of RDS instances in a particular ''' Makes an AWS API call to the list of RDS instances in a particular
@ -718,7 +723,7 @@ class Ec2Inventory(object):
if 'LatestRestorableTime' in c: if 'LatestRestorableTime' in c:
del c['LatestRestorableTime'] del c['LatestRestorableTime']
if self.ec2_instance_filters == {}: if not self.ec2_instance_filters:
matches_filter = True matches_filter = True
else: else:
matches_filter = False matches_filter = False
@ -730,7 +735,8 @@ class Ec2Inventory(object):
c['Tags'] = tags['TagList'] c['Tags'] = tags['TagList']
if self.ec2_instance_filters: if self.ec2_instance_filters:
for filter_key, filter_values in self.ec2_instance_filters.items(): for filters in self.ec2_instance_filters:
for filter_key, filter_values in filters.items():
# get AWS tag key e.g. tag:env will be 'env' # get AWS tag key e.g. tag:env will be 'env'
tag_name = filter_key.split(":", 1)[1] tag_name = filter_key.split(":", 1)[1]
# Filter values is a list (if you put multiple values for the same tag name) # Filter values is a list (if you put multiple values for the same tag name)
@ -740,6 +746,9 @@ class Ec2Inventory(object):
# it matches a filter, so stop looking for further matches # it matches a filter, so stop looking for further matches
break break
if matches_filter:
break
except Exception as e: except Exception as e:
if e.message.find('DBInstanceNotFound') >= 0: if e.message.find('DBInstanceNotFound') >= 0:
# AWS RDS bug (2016-01-06) means deletion does not fully complete and leave an 'empty' cluster. # AWS RDS bug (2016-01-06) means deletion does not fully complete and leave an 'empty' cluster.