Core parameter sanity test cleanup (breaking change) (ansible-collect…

…ions#290) Core parameter sanity test cleanup (breaking change) Reviewed-by: https://github.com/apps/ansible-zuul
alinabuzachis · May 19, 2021 · b6c0672 · b6c0672
1 parent 76b04f8
commit b6c0672
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/changelogs/fragments/290-lint-cleanup.yml b/changelogs/fragments/290-lint-cleanup.yml
@@ -0,0 +1,2 @@
+breaking_changes:
+- module_utils.core - The boto3 switch has been removed from the region parameter (https://github.com/ansible-collections/amazon.aws/pull/287).
diff --git a/plugins/module_utils/core.py b/plugins/module_utils/core.py
@@ -190,8 +190,8 @@ def resource(self, service):
                           region=region, endpoint=ec2_url, **aws_connect_kwargs)
 
     @property
-    def region(self, boto3=True):
-        return get_aws_region(self, boto3)
+    def region(self):
+        return get_aws_region(self, True)
 
     def fail_json_aws(self, exception, msg=None, **kwargs):
         """call fail_json with processed exception

diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt
@@ -2,4 +2,3 @@ plugins/modules/ec2_tag.py validate-modules:parameter-state-invalid-choice  # De
 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
-plugins/module_utils/core.py pylint:property-with-parameters  # Breaking change required to fix - https://github.com/ansible-collections/amazon.aws/pull/290
diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt
@@ -2,4 +2,3 @@ plugins/modules/ec2_tag.py validate-modules:parameter-state-invalid-choice  # De
 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
-plugins/module_utils/core.py pylint:property-with-parameters  # Breaking change required to fix - https://github.com/ansible-collections/amazon.aws/pull/290
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		breaking_changes:
		- module_utils.core - The boto3 switch has been removed from the region parameter (https://github.com/ansible-collections/amazon.aws/pull/287).