From ccbfd2fff37b972b7a208b2945f6f8d1ab96638d 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/iam_user.py | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/plugins/modules/iam_user.py b/plugins/modules/iam_user.py
index 7bd8ebda423..531ae6ba9ae 100644
--- a/plugins/modules/iam_user.py
+++ b/plugins/modules/iam_user.py
@@ -111,10 +111,10 @@
 except ImportError:
     pass  # caught 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_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule
+from ansible_collections.amazon.aws.plugins.module_utils.core import is_boto3_error_code
 
 
 def compare_attached_policies(current_attached_policies, new_attached_policies):
@@ -297,34 +297,30 @@ def get_user(connection, module, name):
 
     try:
         return connection.get_user(**params)
-    except botocore.exceptions.ClientError as e:
-        if e.response['Error']['Code'] == 'NoSuchEntity':
-            return None
-        else:
-            module.fail_json(msg="Unable to get user {0}: {1}".format(name, to_native(e)),
-                             **camel_dict_to_snake_dict(e.response))
+    except is_boto3_error_code('NoSuchEntity'):
+        return None
+    except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:  # pylint: disable=duplicate-except
+        module.fail_json_aws(e, msg="Unable to get user {0}".format(name))
 
 
 def get_attached_policy_list(connection, module, name):
 
     try:
         return connection.list_attached_user_policies(UserName=name)['AttachedPolicies']
-    except botocore.exceptions.ClientError as e:
-        if e.response['Error']['Code'] == 'NoSuchEntity':
-            return None
-        else:
-            module.fail_json_aws(e, msg="Unable to get policies for user {0}".format(name))
+    except is_boto3_error_code('NoSuchEntity'):
+        return None
+    except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:  # pylint: disable=duplicate-except
+        module.fail_json_aws(e, msg="Unable to get policies for user {0}".format(name))
 
 
 def delete_user_login_profile(connection, module, user_name):
 
     try:
         return connection.delete_login_profile(UserName=user_name)
-    except botocore.exceptions.ClientError as e:
-        if e.response["Error"]["Code"] == "NoSuchEntity":
-            return None
-        else:
-            module.fail_json_aws(e, msg="Unable to delete login profile for user {0}".format(user_name))
+    except is_boto3_error_code('NoSuchEntity'):
+        return None
+    except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:  # pylint: disable=duplicate-except
+        module.fail_json_aws(e, msg="Unable to delete login profile for user {0}".format(user_name))
 
 
 def main():