catch ImportError rather than Exception when testing Boto3 imports (#267

)
ansible-collections · Oct 19, 2020 · e83d579 · e83d579
1 parent 6eab8b0
commit e83d579
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 16 deletions.
diff --git a/plugins/modules/aws_direct_connect_confirm_connection.py b/plugins/modules/aws_direct_connect_confirm_connection.py
@@ -67,9 +67,8 @@
 
 try:
     from botocore.exceptions import BotoCoreError, ClientError
-except Exception:
-    pass
-    # handled by imported AnsibleAWSModule
+except ImportError:
+    pass  # handled by imported AnsibleAWSModule
 
 retry_params = {"tries": 10, "delay": 5, "backoff": 1.2, "catch_extra_error_codes": ["DirectConnectClientException"]}
 

diff --git a/plugins/modules/aws_direct_connect_connection.py b/plugins/modules/aws_direct_connect_connection.py
@@ -166,9 +166,8 @@
 
 try:
     from botocore.exceptions import BotoCoreError, ClientError
-except Exception:
-    pass
-    # handled by imported AnsibleAWSModule
+except ImportError:
+    pass  # handled by imported AnsibleAWSModule
 
 retry_params = {"tries": 10, "delay": 5, "backoff": 1.2, "catch_extra_error_codes": ["DirectConnectClientException"]}
 

diff --git a/plugins/modules/aws_direct_connect_link_aggregation_group.py b/plugins/modules/aws_direct_connect_link_aggregation_group.py
@@ -166,7 +166,7 @@
 
 try:
     import botocore
-except Exception:
+except ImportError:
     pass  # Handled by AnsibleAWSModule
 
 from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule

diff --git a/plugins/modules/aws_s3_cors.py b/plugins/modules/aws_s3_cors.py
@@ -97,7 +97,7 @@
 
 try:
     from botocore.exceptions import ClientError, BotoCoreError
-except Exception:
+except ImportError:
     pass  # Handled by AnsibleAWSModule
 
 from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule

diff --git a/plugins/modules/ec2_transit_gateway.py b/plugins/modules/ec2_transit_gateway.py
@@ -222,9 +222,8 @@
 
 try:
     from botocore.exceptions import BotoCoreError, ClientError
-except Exception:
-    pass
-    # handled by imported AnsibleAWSModule
+except ImportError:
+    pass  # handled by imported AnsibleAWSModule
 
 from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule
 from time import sleep, time

diff --git a/plugins/modules/ec2_transit_gateway_info.py b/plugins/modules/ec2_transit_gateway_info.py
@@ -166,9 +166,8 @@
 
 try:
     from botocore.exceptions import BotoCoreError, ClientError
-except Exception:
-    pass
-    # handled by imported AnsibleAWSModule
+except ImportError:
+    pass  # handled by imported AnsibleAWSModule
 
 from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (

diff --git a/plugins/modules/lambda_policy.py b/plugins/modules/lambda_policy.py
@@ -139,7 +139,7 @@
 
 try:
     from botocore.exceptions import ClientError
-except Exception:
+except ImportError:
     pass  # caught by AnsibleAWSModule
 
 

diff --git a/plugins/modules/rds_snapshot_info.py b/plugins/modules/rds_snapshot_info.py
@@ -298,7 +298,7 @@
 
 try:
     import botocore
-except Exception:
+except ImportError:
     pass  # caught by AnsibleAWSModule