Import HAS_BOTO3 from module_utils.ec2 for consistency with our other…

… BOTO3 handling
ansible-collections · Mar 5, 2021 · f4f5e04 · f4f5e04
1 parent 45d7bb6
commit f4f5e04
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/plugins/inventory/aws_ec2.py b/plugins/inventory/aws_ec2.py
@@ -155,15 +155,15 @@
 try:
     import boto3
     import botocore
-    HAS_BOTO3 = True
 except ImportError:
-    HAS_BOTO3 = False
+    pass  # will be captured by imported HAS_BOTO3
 
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_native
 from ansible.module_utils._text import to_text
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
 
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict

diff --git a/plugins/inventory/aws_rds.py b/plugins/inventory/aws_rds.py
@@ -67,9 +67,8 @@
 try:
     import boto3
     import botocore
-    HAS_BOTO3 = True
 except ImportError:
-    HAS_BOTO3 = False
+    pass  # will be captured by imported HAS_BOTO3
 
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_native
@@ -78,6 +77,7 @@
 from ansible.plugins.inventory import Constructable
 
 from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict

diff --git a/plugins/lookup/aws_account_attribute.py b/plugins/lookup/aws_account_attribute.py
@@ -51,17 +51,19 @@
     Returns a boolean when I(attribute) is check_ec2_classic. Otherwise returns the value(s) of the attribute
     (or all attributes if one is not specified).
 """
+
 try:
     import boto3
     import botocore
-    HAS_BOTO3 = True
 except ImportError:
-    HAS_BOTO3 = False
+    pass  # will be captured by imported HAS_BOTO3
 
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_native
 from ansible.plugins.lookup import LookupBase
 
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3
+
 
 def _boto3_conn(region, credentials):
     boto_profile = credentials.pop('aws_profile', None)

diff --git a/plugins/lookup/aws_secret.py b/plugins/lookup/aws_secret.py
@@ -107,9 +107,8 @@
 try:
     import boto3
     import botocore
-    HAS_BOTO3 = True
 except ImportError:
-    HAS_BOTO3 = False
+    pass  # will be captured by imported HAS_BOTO3
 
 from ansible.errors import AnsibleError
 from ansible.module_utils.six import string_types