ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Adds a check for 'not None' values when iterating ElastiCache SecurityGroups keys

Browse source
This commit is contained in:
Victor Schröder 2015-06-29 21:56:36 +02:00
parent d164c9c7a0
commit d88a42570e
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/inventory/ec2.py
View file

@ -791,7 +791,11 @@ class Ec2Inventory(object):
# Inventory: Group by security group # Inventory: Group by security group
if self.group_by_security_group and not is_redis: if self.group_by_security_group and not is_redis:
if 'SecurityGroups' in cluster:
# Check for the existance of the 'SecurityGroups' key and also if
# this key has some value. When the cluster is not placed in a SG
# the query can return None here and cause an error.
if 'SecurityGroups' in cluster and cluster['SecurityGroups'] is not None:
for security_group in cluster['SecurityGroups']: for security_group in cluster['SecurityGroups']:
key = self.to_safe("security_group_" + security_group['SecurityGroupId']) key = self.to_safe("security_group_" + security_group['SecurityGroupId'])
self.push(self.inventory, key, dest) self.push(self.inventory, key, dest)
@ -879,7 +883,11 @@ class Ec2Inventory(object):
# Inventory: Group by security group # Inventory: Group by security group
if self.group_by_security_group: if self.group_by_security_group:
if 'SecurityGroups' in cluster:
# Check for the existance of the 'SecurityGroups' key and also if
# this key has some value. When the cluster is not placed in a SG
# the query can return None here and cause an error.
if 'SecurityGroups' in cluster and cluster['SecurityGroups'] is not None:
for security_group in cluster['SecurityGroups']: for security_group in cluster['SecurityGroups']:
key = self.to_safe("security_group_" + security_group['SecurityGroupId']) key = self.to_safe("security_group_" + security_group['SecurityGroupId'])
self.push(self.inventory, key, dest) self.push(self.inventory, key, dest)