ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-10-06 16:34:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Feature/aws helper function for tags (#23387)

Browse source 
* Add new helper function for comparing AWS tag key pair dicts. Also modify boto3_tag_list_to_ansible_dict function to be more generic when looking for key names because AWS sometimes uses 'Key', sometimes 'TagKey' and who knows what the future holds! Fixed modules to work with changes.

* Review changes

* Add some more doc to GUIDELINES for tags and fix var name for snaked values in ec2_group_facts
This commit is contained in:
Rob 2017-05-11 16:39:51 +10:00 • committed by John R Barker
commit fd1debb869
6 changed files with 76 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/modules/cloud/amazon/ec2_eni_facts.py
View file

@ -73,7 +73,7 @@ from ansible.module_utils.ec2 import (AnsibleAWSError,
connect_to_aws, ec2_argument_spec, get_aws_connection_info)
def list_ec2_snapshots_boto3(connection, module):
def list_ec2_eni_boto3(connection, module):
if module.params.get("filters") is None:
filters = []
@ -81,16 +81,17 @@ def list_ec2_snapshots_boto3(connection, module):
filters = ansible_dict_to_boto3_filter_list(module.params.get("filters"))
try:
network_interfaces_result = connection.describe_network_interfaces(Filters=filters)
network_interfaces_result = connection.describe_network_interfaces(Filters=filters)['NetworkInterfaces']
except (ClientError, NoCredentialsError) as e:
module.fail_json(msg=e.message)
# Turn the boto3 result in to ansible_friendly_snaked_names
snaked_network_interfaces_result = camel_dict_to_snake_dict(network_interfaces_result)
for network_interfaces in snaked_network_interfaces_result['network_interfaces']:
network_interfaces['tag_set'] = boto3_tag_list_to_ansible_dict(network_interfaces['tag_set'])
# Modify boto3 tags list to be ansible friendly dict and then camel_case
camel_network_interfaces = []
for network_interface in network_interfaces_result:
network_interface['TagSet'] = boto3_tag_list_to_ansible_dict(network_interface['TagSet'])
camel_network_interfaces.append(camel_dict_to_snake_dict(network_interface))
module.exit_json(**snaked_network_interfaces_result)
module.exit_json(network_interfaces=camel_network_interfaces)
def get_eni_info(interface):
@ -168,7 +169,7 @@ def main():
else:
module.fail_json(msg="region must be specified")
list_ec2_snapshots_boto3(connection, module)
list_ec2_eni_boto3(connection, module)
else:
region, ec2_url, aws_connect_params = get_aws_connection_info(module)