Merge pull request #2067 from wimnat/feature/issue-2066

Add exception handling to iam

cloud/amazon/iam.py

@@ -570,19 +570,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