IAM group modules need `module` passed

The IAM group modules were not receiving the `module` object, but they
use `module.fail_json()` in their exception handlers. This patch passes
through the module object so the real errors from boto are exposed,
rather than errors about "NoneType has no method `fail_json`".
pull/18777/head
Ryan S. Brown 8 years ago committed by Matt Clay
parent 2090304511
commit a2e6ac6ca8

@ -748,11 +748,12 @@ def main():
group_exists = name in orig_group_list group_exists = name in orig_group_list
if state == 'present' and not group_exists: if state == 'present' and not group_exists:
new_group, changed = create_group(iam=iam, name=name, path=path) new_group, changed = create_group(module=module, iam=iam, name=name, path=path)
module.exit_json(changed=changed, group_name=new_group) module.exit_json(changed=changed, group_name=new_group)
elif state in ['present', 'update'] and group_exists: elif state in ['present', 'update'] and group_exists:
changed, updated_name, updated_path, cur_path = update_group( changed, updated_name, updated_path, cur_path = update_group(
iam=iam, name=name, new_name=new_name, new_path=new_path) module=module, iam=iam, name=name, new_name=new_name,
new_path=new_path)
if new_path and new_name: if new_path and new_name:
module.exit_json(changed=changed, old_group_name=name, module.exit_json(changed=changed, old_group_name=name,
@ -774,11 +775,11 @@ def main():
elif state == 'update' and not group_exists: elif state == 'update' and not group_exists:
module.fail_json( module.fail_json(
changed=changed, msg="Update Failed. Group %s doesn't seem to exit!" % name) changed=changed, msg="Update Failed. Group %s doesn't seem to exist!" % name)
elif state == 'absent': elif state == 'absent':
if name in orig_group_list: if name in orig_group_list:
removed_group, changed = delete_group(iam=iam, name=name) removed_group, changed = delete_group(module=module, iam=iam, name=name)
module.exit_json(changed=changed, delete_group=removed_group) module.exit_json(changed=changed, delete_group=removed_group)
else: else:
module.exit_json(changed=changed, msg="Group already absent") module.exit_json(changed=changed, msg="Group already absent")

Loading…
Cancel
Save