From a846d56b8145cb8cfcfe5691b5c951d7ebdda808 Mon Sep 17 00:00:00 2001
From: Mark Chappell <mchappel@redhat.com>
Date: Fri, 5 Feb 2021 09:43:09 +0100
Subject: [PATCH] Cleanup - use is_boto3_error_(message|code) (#268)

* Reorder imports
* Make use of is_boto3_error_message
* Mass-migration over to is_boto3_error_code
* Remove unused imports
* unused vars in exception
* Improve consistency around catching BotoCoreError and ClientError
* Remove unused imports
* Remove unused 'PolicyError' from iam_policy_info
* Avoid catching botocore.exceptions.ClientError when we only want some error codes
* Import camel_dict_to_snake_dict/snake_dict_to_camel_dict from ansible.module_utils.common.dict_transformations

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: https://github.com/ansible-collections/community.aws/commit/4cf52ef67682fd4f9ed2a707adfbafffe7b88f15
---
 plugins/modules/ec2_placement_group.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/plugins/modules/ec2_placement_group.py b/plugins/modules/ec2_placement_group.py
index 7d9a8004544..3ccb2c00802 100644
--- a/plugins/modules/ec2_placement_group.py
+++ b/plugins/modules/ec2_placement_group.py
@@ -87,13 +87,15 @@
 
 '''
 
-from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule
-from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry
 try:
-    from botocore.exceptions import (BotoCoreError, ClientError)
+    import botocore
 except ImportError:
     pass  # caught 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 AWSRetry
+
 
 @AWSRetry.exponential_backoff()
 def get_placement_group_details(connection, module):
@@ -104,7 +106,7 @@ def get_placement_group_details(connection, module):
                 "Name": "group-name",
                 "Values": [name]
             }])
-    except (BotoCoreError, ClientError) as e:
+    except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
         module.fail_json_aws(
             e,
             msg="Couldn't find placement group named [%s]" % name)
@@ -128,13 +130,13 @@ def create_placement_group(connection, module):
     try:
         connection.create_placement_group(
             GroupName=name, Strategy=strategy, DryRun=module.check_mode)
-    except (BotoCoreError, ClientError) as e:
-        if e.response['Error']['Code'] == "DryRunOperation":
-            module.exit_json(changed=True, placement_group={
-                "name": name,
-                "state": 'DryRun',
-                "strategy": strategy,
-            })
+    except is_boto3_error_code('DryRunOperation'):
+        module.exit_json(changed=True, placement_group={
+            "name": name,
+            "state": 'DryRun',
+            "strategy": strategy,
+        })
+    except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:  # pylint: disable=duplicate-except
         module.fail_json_aws(
             e,
             msg="Couldn't create placement group [%s]" % name)
@@ -152,7 +154,7 @@ def delete_placement_group(connection, module):
     try:
         connection.delete_placement_group(
             GroupName=name, DryRun=module.check_mode)
-    except (BotoCoreError, ClientError) as e:
+    except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
         module.fail_json_aws(
             e,
             msg="Couldn't delete placement group [%s]" % name)