[7.0.0] sort imports (ansible-collections#1771)

* Add tox labels for lint, format and unit tests

* [7.0.0] Apply isort to imports

* Add isort to tox

* Update workflow to run isort tests

* changelog

.github/workflows/changelog_and_linters.yml

@@ -7,4 +7,7 @@ jobs:
   changelog:
     uses: ansible-network/github_actions/.github/workflows/changelog.yml@main
   linters:
-    uses: ansible-network/github_actions/.github/workflows/tox-linters.yml@main
+    uses: ansible-network/github_actions/.github/workflows/tox.yml@main
+    with:
+      envname: ""
+      labelname: "lint"

changelogs/fragments/1771-isort.yml

@@ -0,0 +1,2 @@
+minor_changes:
+- amazon.aws collection - apply isort code formatting to ensure consistent formatting of code (https://github.com/ansible-collections/amazon.aws/pull/1771).

plugins/action/s3_object.py

@@ -6,7 +6,10 @@
 
 import os
 
-from ansible.errors import AnsibleError, AnsibleAction, AnsibleActionFail, AnsibleFileNotFound
+from ansible.errors import AnsibleAction
+from ansible.errors import AnsibleActionFail
+from ansible.errors import AnsibleError
+from ansible.errors import AnsibleFileNotFound
 from ansible.module_utils._text import to_text
 from ansible.plugins.action import ActionBase
 from ansible.utils.vars import merge_hash

plugins/callback/aws_resource_actions.py

@@ -33,8 +33,8 @@
 #
 """
 
-from ansible.plugins.callback import CallbackBase
 from ansible.module_utils._text import to_native
+from ansible.plugins.callback import CallbackBase
 
 
 class CallbackModule(CallbackBase):

plugins/inventory/aws_ec2.py

@@ -275,13 +275,11 @@
 from ansible.module_utils._text import to_text
 from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
 
-
 from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code
-from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list
 from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict
+from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list
 from ansible_collections.amazon.aws.plugins.plugin_utils.inventory import AWSInventoryBase
 
-
 # The mappings give an array of keys to get from the filter name to the value
 # returned by boto3's EC2 describe_instances method.
 

plugins/inventory/aws_rds.py

@@ -87,9 +87,8 @@
 from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
 
 from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code
-from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list
 from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict
-
+from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list
 from ansible_collections.amazon.aws.plugins.plugin_utils.inventory import AWSInventoryBase
 
 

plugins/lookup/aws_service_ip_ranges.py

@@ -46,12 +46,12 @@
 import json
 
 from ansible.errors import AnsibleLookupError
+from ansible.module_utils._text import to_native
 from ansible.module_utils.six.moves.urllib.error import HTTPError
 from ansible.module_utils.six.moves.urllib.error import URLError
-from ansible.module_utils._text import to_native
 from ansible.module_utils.urls import ConnectionError
-from ansible.module_utils.urls import open_url
 from ansible.module_utils.urls import SSLValidationError
+from ansible.module_utils.urls import open_url
 from ansible.plugins.lookup import LookupBase
 
 

plugins/lookup/secretsmanager_secret.py

@@ -127,13 +127,12 @@
     pass  # Handled by AWSLookupBase
 
 from ansible.errors import AnsibleLookupError
-from ansible.module_utils.six import string_types
 from ansible.module_utils._text import to_native
+from ansible.module_utils.six import string_types
 
 from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code
 from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_message
 from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry
-
 from ansible_collections.amazon.aws.plugins.plugin_utils.lookup import AWSLookupBase
 
 

plugins/lookup/ssm_parameter.py

@@ -132,13 +132,12 @@
 
 from ansible.errors import AnsibleLookupError
 from ansible.module_utils._text import to_native
-from ansible.utils.display import Display
 from ansible.module_utils.six import string_types
+from ansible.utils.display import Display
 
 from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code
-from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict
 from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry
-
+from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict
 from ansible_collections.amazon.aws.plugins.plugin_utils.lookup import AWSLookupBase
 
 display = Display()

plugins/module_utils/acm.py

@@ -16,7 +16,8 @@
 """
 
 try:
-    from botocore.exceptions import BotoCoreError, ClientError
+    from botocore.exceptions import BotoCoreError
+    from botocore.exceptions import ClientError
 except ImportError:
     pass
 

plugins/module_utils/backup.py

@@ -10,6 +10,7 @@
     pass  # Handled by HAS_BOTO3
 
 from typing import Union
+
 from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
 
 

plugins/module_utils/botocore.py

@@ -60,9 +60,9 @@
 from ansible.module_utils.six import binary_type
 from ansible.module_utils.six import text_type
 
+from .common import get_collection_info
 from .exceptions import AnsibleBotocoreError
 from .retries import AWSRetry
-from .common import get_collection_info
 
 MINIMUM_BOTOCORE_VERSION = "1.29.0"
 MINIMUM_BOTO3_VERSION = "1.26.0"
@@ -412,6 +412,7 @@ def enable_placebo(session):
         pill.record()
     if "_ANSIBLE_PLACEBO_REPLAY" in os.environ:
         import shutil
+
         import placebo
 
         existing_entries = sorted([int(i) for i in os.listdir(os.environ["_ANSIBLE_PLACEBO_REPLAY"])])

plugins/module_utils/cloud.py

@@ -27,9 +27,9 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import time
 import functools
 import random
+import time
 
 
 class BackoffIterator:

plugins/module_utils/cloudfront_facts.py

@@ -22,9 +22,10 @@
 except ImportError:
     pass
 
+from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict
+
 from .retries import AWSRetry
 from .tagging import boto3_tag_list_to_ansible_dict
-from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict
 
 
 class CloudFrontFactsServiceManagerFailure(Exception):

plugins/module_utils/core.py

@@ -42,9 +42,9 @@
 
 # Used to live here, moved into ansible_collections.amazon.aws.plugins.module_utils.botocore
 from .botocore import HAS_BOTO3  # pylint: disable=unused-import
+from .botocore import get_boto3_client_method_parameters  # pylint: disable=unused-import
 from .botocore import is_boto3_error_code  # pylint: disable=unused-import
 from .botocore import is_boto3_error_message  # pylint: disable=unused-import
-from .botocore import get_boto3_client_method_parameters  # pylint: disable=unused-import
 from .botocore import normalize_boto3_result  # pylint: disable=unused-import
 
 # Used to live here, moved into ansible_collections.amazon.aws.plugins.module_utils.exceptions

plugins/module_utils/ec2.py

@@ -40,26 +40,25 @@
 import re
 
 from ansible.module_utils.ansible_release import __version__
-from ansible.module_utils.six import string_types
-from ansible.module_utils.six import integer_types
 
 # Used to live here, moved into ansible.module_utils.common.dict_transformations
 from ansible.module_utils.common.dict_transformations import _camel_to_snake  # pylint: disable=unused-import
 from ansible.module_utils.common.dict_transformations import _snake_to_camel  # pylint: disable=unused-import
 from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict  # pylint: disable=unused-import
 from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict  # pylint: disable=unused-import
+from ansible.module_utils.six import integer_types
+from ansible.module_utils.six import string_types
 
-# Used to live here, moved into # ansible_collections.amazon.aws.plugins.module_utils.arn
+# Used to live here, moved into ansible_collections.amazon.aws.plugins.module_utils.arn
 from .arn import is_outpost_arn as is_outposts_arn  # pylint: disable=unused-import
 
 # Used to live here, moved into ansible_collections.amazon.aws.plugins.module_utils.botocore
 from .botocore import HAS_BOTO3  # pylint: disable=unused-import
 from .botocore import boto3_conn  # pylint: disable=unused-import
 from .botocore import boto3_inventory_conn  # pylint: disable=unused-import
 from .botocore import boto_exception  # pylint: disable=unused-import
-from .botocore import get_aws_region  # pylint: disable=unused-import
 from .botocore import get_aws_connection_info  # pylint: disable=unused-import
-
+from .botocore import get_aws_region  # pylint: disable=unused-import
 from .botocore import paginated_query_with_retries
 
 # Used to live here, moved into ansible_collections.amazon.aws.plugins.module_utils.exceptions
@@ -70,6 +69,14 @@
 from .modules import _aws_common_argument_spec as aws_common_argument_spec  # pylint: disable=unused-import
 from .modules import aws_argument_spec as ec2_argument_spec  # pylint: disable=unused-import
 
+# Used to live here, moved into ansible_collections.amazon.aws.plugins.module_utils.policy
+from .policy import _py3cmp as py3cmp  # pylint: disable=unused-import
+from .policy import compare_policies  # pylint: disable=unused-import
+from .policy import sort_json_policy_dict  # pylint: disable=unused-import
+
+# Used to live here, moved into ansible_collections.amazon.aws.plugins.module_utils.retries
+from .retries import AWSRetry  # pylint: disable=unused-import
+
 # Used to live here, moved into ansible_collections.amazon.aws.plugins.module_utils.tagging
 from .tagging import ansible_dict_to_boto3_tag_list  # pylint: disable=unused-import
 from .tagging import boto3_tag_list_to_ansible_dict  # pylint: disable=unused-import
@@ -79,14 +86,6 @@
 from .transformation import ansible_dict_to_boto3_filter_list  # pylint: disable=unused-import
 from .transformation import map_complex_type  # pylint: disable=unused-import
 
-# Used to live here, moved into # ansible_collections.amazon.aws.plugins.module_utils.policy
-from .policy import _py3cmp as py3cmp  # pylint: disable=unused-import
-from .policy import compare_policies  # pylint: disable=unused-import
-from .policy import sort_json_policy_dict  # pylint: disable=unused-import
-
-# Used to live here, moved into # ansible_collections.amazon.aws.plugins.module_utils.retries
-from .retries import AWSRetry  # pylint: disable=unused-import
-
 try:
     import botocore
 except ImportError:

plugins/module_utils/elb_utils.py

@@ -4,7 +4,8 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 try:
-    from botocore.exceptions import BotoCoreError, ClientError
+    from botocore.exceptions import BotoCoreError
+    from botocore.exceptions import ClientError
 except ImportError:
     pass
 

plugins/module_utils/elbv2.py

@@ -7,17 +7,18 @@
 from copy import deepcopy
 
 try:
-    from botocore.exceptions import BotoCoreError, ClientError
+    from botocore.exceptions import BotoCoreError
+    from botocore.exceptions import ClientError
 except ImportError:
     pass
 
-from .retries import AWSRetry
-from .tagging import ansible_dict_to_boto3_tag_list
-from .tagging import boto3_tag_list_to_ansible_dict
 from .ec2 import get_ec2_security_group_ids_from_names
 from .elb_utils import convert_tg_name_to_arn
 from .elb_utils import get_elb
 from .elb_utils import get_elb_listener
+from .retries import AWSRetry
+from .tagging import ansible_dict_to_boto3_tag_list
+from .tagging import boto3_tag_list_to_ansible_dict
 from .waiters import get_waiter
 
 

plugins/module_utils/modules.py

@@ -48,19 +48,19 @@
     # Python 3
     from io import StringIO
 
+from ansible.module_utils._text import to_native
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.basic import env_fallback
 from ansible.module_utils.basic import missing_required_lib
 from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
-from ansible.module_utils._text import to_native
 
-from .botocore import boto3_conn
 from .botocore import boto3_at_least
+from .botocore import boto3_conn
 from .botocore import botocore_at_least
 from .botocore import check_sdk_version_supported
+from .botocore import gather_sdk_versions
 from .botocore import get_aws_connection_info
 from .botocore import get_aws_region
-from .botocore import gather_sdk_versions
 from .exceptions import AnsibleBotocoreError
 from .retries import RetryingBotoClientWrapper
 

plugins/module_utils/policy.py

@@ -30,12 +30,11 @@
 
 from functools import cmp_to_key
 
+import ansible.module_utils.common.warnings as ansible_warnings
 from ansible.module_utils._text import to_text
 from ansible.module_utils.six import binary_type
 from ansible.module_utils.six import string_types
 
-import ansible.module_utils.common.warnings as ansible_warnings
-
 
 def _canonify_root_arn(arn):
     # There are multiple ways to specifiy delegation of access to an account

plugins/module_utils/rds.py

@@ -7,7 +7,9 @@
 from time import sleep
 
 try:
-    from botocore.exceptions import BotoCoreError, ClientError, WaiterError
+    from botocore.exceptions import BotoCoreError
+    from botocore.exceptions import ClientError
+    from botocore.exceptions import WaiterError
 except ImportError:
     pass
 

plugins/module_utils/transformation.py

@@ -28,8 +28,8 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ansible.module_utils.six import string_types
 from ansible.module_utils.six import integer_types
+from ansible.module_utils.six import string_types
 
 
 def ansible_dict_to_boto3_filter_list(filters_dict):

plugins/module_utils/waf.py

@@ -41,7 +41,6 @@
 from .retries import AWSRetry
 from .waiters import get_waiter
 
-
 MATCH_LOOKUP = {
     "byte": {
         "method": "byte_match_set",

plugins/module_utils/waiters.py

@@ -12,7 +12,6 @@
 
 from ansible_collections.amazon.aws.plugins.module_utils.retries import RetryingBotoClientWrapper
 
-
 ec2_data = {
     "version": 2,
     "waiters": {

plugins/modules/autoscaling_group.py

@@ -660,13 +660,13 @@
     pass  # Handled by AnsibleAWSModule
 
 from ansible.module_utils._text import to_native
+from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
+from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict
 
-from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
 from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code
-from ansible_collections.amazon.aws.plugins.module_utils.transformation import scrub_none_parameters
+from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
 from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry
-from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict
-from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
+from ansible_collections.amazon.aws.plugins.module_utils.transformation import scrub_none_parameters
 
 ASG_ATTRIBUTES = (
     "AvailabilityZones",

plugins/modules/autoscaling_group_info.py

@@ -247,8 +247,8 @@
 
 from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
 
-from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
 from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_code
+from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
 
 
 def match_asg_tags(tags_to_match, asg):

plugins/modules/aws_az_info.py

@@ -142,7 +142,8 @@
 """
 
 try:
-    from botocore.exceptions import ClientError, BotoCoreError
+    from botocore.exceptions import BotoCoreError
+    from botocore.exceptions import ClientError
 except ImportError:
     pass  # Handled by AnsibleAWSModule
 

plugins/modules/aws_caller_info.py

@@ -57,7 +57,8 @@
 """
 
 try:
-    from botocore.exceptions import BotoCoreError, ClientError
+    from botocore.exceptions import BotoCoreError
+    from botocore.exceptions import ClientError
 except ImportError:
     pass  # Handled by AnsibleAWSModule