From 4f9bb86e5844d634d9e16fce7fd72d0eb514d58e Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 14 Sep 2015 15:43:49 +1000 Subject: [PATCH] Add exception handling to iam --- lib/ansible/modules/cloud/amazon/iam.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/iam.py b/lib/ansible/modules/cloud/amazon/iam.py index 9be189620c2..27761b29d19 100644 --- a/lib/ansible/modules/cloud/amazon/iam.py +++ b/lib/ansible/modules/cloud/amazon/iam.py @@ -581,19 +581,26 @@ def main(): result = {} changed = False - orig_group_list = [gl['group_name'] for gl in iam.get_all_groups(). + try: + orig_group_list = [gl['group_name'] for gl in iam.get_all_groups(). list_groups_result. groups] - orig_user_list = [ul['user_name'] for ul in iam.get_all_users(). + + orig_user_list = [ul['user_name'] for ul in iam.get_all_users(). list_users_result. users] - orig_role_list = [rl['role_name'] for rl in iam.list_roles().list_roles_response. + + orig_role_list = [rl['role_name'] for rl in iam.list_roles().list_roles_response. list_roles_result. roles] - orig_prof_list = [ap['instance_profile_name'] for ap in iam.list_instance_profiles(). + + orig_prof_list = [ap['instance_profile_name'] for ap in iam.list_instance_profiles(). list_instance_profiles_response. list_instance_profiles_result. instance_profiles] + + except boto.exception.BotoServerError, err: + module.fail_json(msg=err.message) if iam_type == 'user': been_updated = False