diff --git a/plugins/modules/ec2_asg.py b/plugins/modules/ec2_asg.py index d9849a78217..2d54debffc0 100644 --- a/plugins/modules/ec2_asg.py +++ b/plugins/modules/ec2_asg.py @@ -536,7 +536,6 @@ from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict ASG_ATTRIBUTES = ('AvailabilityZones', 'DefaultCooldown', 'DesiredCapacity', 'HealthCheckGracePeriod', 'HealthCheckType', 'LaunchConfigurationName', diff --git a/plugins/modules/ec2_instance.py b/plugins/modules/ec2_instance.py index a4fc9b5f367..720b28f31d1 100644 --- a/plugins/modules/ec2_instance.py +++ b/plugins/modules/ec2_instance.py @@ -803,7 +803,6 @@ from collections import namedtuple try: - import boto3 import botocore.exceptions except ImportError: pass # caught by AnsibleAWSModule diff --git a/plugins/modules/ec2_vpc_nacl_info.py b/plugins/modules/ec2_vpc_nacl_info.py index 67d394ad393..1fde4da3edc 100644 --- a/plugins/modules/ec2_vpc_nacl_info.py +++ b/plugins/modules/ec2_vpc_nacl_info.py @@ -109,7 +109,6 @@ except ImportError: pass # caught by AnsibleAWSModule -from ansible.module_utils._text import to_native from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry diff --git a/plugins/modules/elasticache.py b/plugins/modules/elasticache.py index 85ecae3b6a0..cd907d89dc5 100644 --- a/plugins/modules/elasticache.py +++ b/plugins/modules/elasticache.py @@ -129,14 +129,12 @@ from time import sleep try: - import boto3 import botocore except ImportError: pass # Handled by AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code -from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_aws_connection_info diff --git a/plugins/modules/elasticache_snapshot.py b/plugins/modules/elasticache_snapshot.py index 77c71e1cfb1..ab827b62d88 100644 --- a/plugins/modules/elasticache_snapshot.py +++ b/plugins/modules/elasticache_snapshot.py @@ -112,7 +112,6 @@ """ try: - import boto3 import botocore except ImportError: pass # Handled by AnsibleAWSModule diff --git a/plugins/modules/execute_lambda.py b/plugins/modules/execute_lambda.py index ee4f7d2d6ea..e5e21eacb61 100644 --- a/plugins/modules/execute_lambda.py +++ b/plugins/modules/execute_lambda.py @@ -135,8 +135,6 @@ except ImportError: pass # Handled by AnsibleAWSModule -from ansible.module_utils._text import to_native - from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code diff --git a/plugins/modules/iam_policy_info.py b/plugins/modules/iam_policy_info.py index f03928ad3e9..26372b63ba7 100644 --- a/plugins/modules/iam_policy_info.py +++ b/plugins/modules/iam_policy_info.py @@ -77,15 +77,11 @@ type: list ''' -import json - try: from botocore.exceptions import BotoCoreError, ClientError except ImportError: pass -from ansible.module_utils.six import string_types - from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code diff --git a/plugins/modules/lambda_alias.py b/plugins/modules/lambda_alias.py index 5df562a9c6b..619a8b9b72f 100644 --- a/plugins/modules/lambda_alias.py +++ b/plugins/modules/lambda_alias.py @@ -144,7 +144,6 @@ import re try: - import boto3 from botocore.exceptions import ClientError, BotoCoreError except ImportError: pass # Handled by AnsibleAWSModule diff --git a/plugins/modules/rds_instance.py b/plugins/modules/rds_instance.py index 617513518c8..ddc42906eb5 100644 --- a/plugins/modules/rds_instance.py +++ b/plugins/modules/rds_instance.py @@ -750,7 +750,6 @@ try: from botocore.exceptions import ClientError from botocore.exceptions import BotoCoreError - from botocore.exceptions import WaiterError except ImportError: pass # caught by AnsibleAWSModule diff --git a/plugins/modules/s3_lifecycle.py b/plugins/modules/s3_lifecycle.py index 0319d78ce12..53395ed4f47 100644 --- a/plugins/modules/s3_lifecycle.py +++ b/plugins/modules/s3_lifecycle.py @@ -17,8 +17,6 @@ notes: - If specifying expiration time as days then transition time must also be specified in days - If specifying expiration time as a date then transition time must also be specified as a date -requirements: - - python-dateutil options: name: description: @@ -195,12 +193,6 @@ from copy import deepcopy import datetime -try: - import dateutil.parser - HAS_DATEUTIL = True -except ImportError: - HAS_DATEUTIL = False - try: from botocore.exceptions import BotoCoreError, ClientError except ImportError: @@ -463,9 +455,6 @@ def main(): ['noncurrent_version_transition_days', 'noncurrent_version_transitions'], ],) - if not HAS_DATEUTIL: - module.fail_json(msg='dateutil required for this module') - client = module.client('s3') expiration_date = module.params.get("expiration_date")