ec2_vpc_igw - dont user filters to paginate to fix NoneType error (#766)

ec2_vpc_igw - dont user filters to paginate to fix NoneType error Depends-On: ansible/ansible-zuul-jobs#1498 SUMMARY Use gateway id when describing gateway instances as opposed to filters if possible to avoid bug of no gateways found. Fixes #647 ISSUE TYPE Bugfix Pull Request COMPONENT NAME ec2_vpc_igw Reviewed-by: Gonéri Le Bouder <[email protected]> Reviewed-by: Mark Chappell <None> Reviewed-by: Joseph Torcasso <None> Reviewed-by: Alina Buzachis <None>
ansible-collections · Apr 22, 2022 · cbbf3fb · cbbf3fb
1 parent 047cd65
commit cbbf3fb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/changelogs/fragments/766-ec2_vpc_igw-use-InternetGatewayIds-not-filters.yml b/changelogs/fragments/766-ec2_vpc_igw-use-InternetGatewayIds-not-filters.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - ec2_vpc_igw - use gateway_id rather than filters to paginate if possible to fix 'NoneType' object is not subscriptable error (https://github.com/ansible-collections/amazon.aws/pull/766).
diff --git a/plugins/modules/ec2_vpc_igw.py b/plugins/modules/ec2_vpc_igw.py
@@ -139,10 +139,23 @@ def process(self):
         elif state == 'absent':
             self.ensure_igw_absent(vpc_id)
 
-    def get_matching_igw(self, vpc_id):
+    def get_matching_igw(self, vpc_id, gateway_id=None):
+        '''
+        Returns the internet gateway found.
+            Parameters:
+                vpc_id (str): VPC ID
+                gateway_id (str): Internet Gateway ID, if specified
+            Returns:
+                igw (dict): dict of igw found, None if none found
+        '''
         filters = ansible_dict_to_boto3_filter_list({'attachment.vpc-id': vpc_id})
         try:
-            igws = describe_igws_with_backoff(self._connection, Filters=filters)
+            # If we know the gateway_id, use it to avoid bugs with using filters
+            # See https://github.com/ansible-collections/amazon.aws/pull/766
+            if not gateway_id:
+                igws = describe_igws_with_backoff(self._connection, Filters=filters)
+            else:
+                igws = describe_igws_with_backoff(self._connection, InternetGatewayIds=[gateway_id])
         except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
             self._module.fail_json_aws(e)
 
@@ -229,7 +242,7 @@ def ensure_igw_present(self, vpc_id, tags, purge_tags):
         )
 
         # Update igw
-        igw = self.get_matching_igw(vpc_id)
+        igw = self.get_matching_igw(vpc_id, gateway_id=igw['internet_gateway_id'])
         igw_info = self.get_igw_info(igw, vpc_id)
         self._results.update(igw_info)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- ec2_vpc_igw - use gateway_id rather than filters to paginate if possible to fix 'NoneType' object is not subscriptable error (https://github.com/ansible-collections/amazon.aws/pull/766).