cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

PEP 8 E111 cleanup.

Browse source
This commit is contained in:
Matt Clay 2017-01-30 19:53:08 -08:00
parent 23f2efbc8d
commit 5f89fc4a68
1 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
lib/ansible/modules/cloud/amazon/iam.py
View file

@ -167,7 +167,7 @@ try:
import boto.ec2 import boto.ec2
HAS_BOTO = True HAS_BOTO = True
except ImportError: except ImportError:
HAS_BOTO = False HAS_BOTO = False
def boto_exception(err): def boto_exception(err):
'''generic error message handler''' '''generic error message handler'''
@ -253,10 +253,10 @@ def delete_user(module, iam, name):
except boto.exception.BotoServerError as err: except boto.exception.BotoServerError as err:
error_msg = boto_exception(err) error_msg = boto_exception(err)
if ('Cannot find Login Profile') in error_msg: if ('Cannot find Login Profile') in error_msg:
del_meta = iam.delete_user(name).delete_user_response del_meta = iam.delete_user(name).delete_user_response
else: else:
iam.delete_login_profile(name) iam.delete_login_profile(name)
del_meta = iam.delete_user(name).delete_user_response del_meta = iam.delete_user(name).delete_user_response
except Exception as ex: except Exception as ex:
module.fail_json(changed=False, msg="delete failed %s" %ex) module.fail_json(changed=False, msg="delete failed %s" %ex)
if ('must detach all policies first') in error_msg: if ('must detach all policies first') in error_msg:
@ -267,10 +267,10 @@ def delete_user(module, iam, name):
except boto.exception.BotoServerError as err: except boto.exception.BotoServerError as err:
error_msg = boto_exception(err) error_msg = boto_exception(err)
if ('must detach all policies first') in error_msg: if ('must detach all policies first') in error_msg:
module.fail_json(changed=changed, msg="All inline polices have been removed. Though it appears" module.fail_json(changed=changed, msg="All inline polices have been removed. Though it appears"
"that %s has Managed Polices. This is not " "that %s has Managed Polices. This is not "
"currently supported by boto. Please detach the polices " "currently supported by boto. Please detach the polices "
"through the console and try again." % name) "through the console and try again." % name)
else: else:
module.fail_json(changed=changed, msg=str(error_msg)) module.fail_json(changed=changed, msg=str(error_msg))
else: else:
@ -460,10 +460,10 @@ def delete_group(module=None, iam=None, name=None):
except boto.exception.BotoServerError as err: except boto.exception.BotoServerError as err:
error_msg = boto_exception(err) error_msg = boto_exception(err)
if ('must detach all policies first') in error_msg: if ('must detach all policies first') in error_msg:
module.fail_json(changed=changed, msg="All inline polices have been removed. Though it appears" module.fail_json(changed=changed, msg="All inline polices have been removed. Though it appears"
"that %s has Managed Polices. This is not " "that %s has Managed Polices. This is not "
"currently supported by boto. Please detach the polices " "currently supported by boto. Please detach the polices "
"through the console and try again." % name) "through the console and try again." % name)
else: else:
module.fail_json(changed=changed, msg=str(err)) module.fail_json(changed=changed, msg=str(err))
else: else:
@ -527,25 +527,25 @@ def delete_role(module, iam, name, role_list, prof_list):
for profile in cur_ins_prof: for profile in cur_ins_prof:
iam.remove_role_from_instance_profile(profile, name) iam.remove_role_from_instance_profile(profile, name)
try: try:
iam.delete_role(name) iam.delete_role(name)
except boto.exception.BotoServerError as err: except boto.exception.BotoServerError as err:
error_msg = boto_exception(err) error_msg = boto_exception(err)
if ('must detach all policies first') in error_msg: if ('must detach all policies first') in error_msg:
for policy in iam.list_role_policies(name).list_role_policies_result.policy_names: for policy in iam.list_role_policies(name).list_role_policies_result.policy_names:
iam.delete_role_policy(name, policy) iam.delete_role_policy(name, policy)
try: try:
iam_role_result = iam.delete_role(name) iam_role_result = iam.delete_role(name)
except boto.exception.BotoServerError as err: except boto.exception.BotoServerError as err:
error_msg = boto_exception(err) error_msg = boto_exception(err)
if ('must detach all policies first') in error_msg: if ('must detach all policies first') in error_msg:
module.fail_json(changed=changed, msg="All inline polices have been removed. Though it appears" module.fail_json(changed=changed, msg="All inline polices have been removed. Though it appears"
"that %s has Managed Polices. This is not " "that %s has Managed Polices. This is not "
"currently supported by boto. Please detach the polices " "currently supported by boto. Please detach the polices "
"through the console and try again." % name) "through the console and try again." % name)
else: else:
module.fail_json(changed=changed, msg=str(err)) module.fail_json(changed=changed, msg=str(err))
else: else:
changed = True changed = True
else: else:
changed = True changed = True
@ -590,7 +590,7 @@ def main():
) )
if not HAS_BOTO: if not HAS_BOTO:
module.fail_json(msg='This module requires boto, please install it') module.fail_json(msg='This module requires boto, please install it')
state = module.params.get('state').lower() state = module.params.get('state').lower()
iam_type = module.params.get('iam_type').lower() iam_type = module.params.get('iam_type').lower()
@ -732,12 +732,12 @@ def main():
elif state == 'absent': elif state == 'absent':
if user_exists: if user_exists:
try: try:
set_users_groups(module, iam, name, '') set_users_groups(module, iam, name, '')
del_meta, name, changed = delete_user(module, iam, name) del_meta, name, changed = delete_user(module, iam, name)
module.exit_json(deleted_user=name, changed=changed) module.exit_json(deleted_user=name, changed=changed)
except Exception as ex: except Exception as ex:
module.fail_json(changed=changed, msg=str(ex)) module.fail_json(changed=changed, msg=str(ex))
else: else:
module.exit_json( module.exit_json(
changed=False, msg="User %s is already absent from your AWS IAM users" % name) changed=False, msg="User %s is already absent from your AWS IAM users" % name)