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

be smarter when dealing with policy_json input

Browse source 
Now module will assume that if the argument is a string it is already formated as json
and will only try to convert non strings into json string.
Also removed unused 'msg' var declarations and the ifs that set them
fixes #2009
This commit is contained in:
Brian Coca 2015-12-24 00:12:50 -05:00
parent 002028748f
commit 1fe6479617
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cloud/amazon/iam_policy.py
View file

@ -146,9 +146,7 @@ def user_action(module, iam, name, policy_name, skip, pdoc, state):
if urllib.unquote(iam.get_user_policy(name, pol). if urllib.unquote(iam.get_user_policy(name, pol).
get_user_policy_result.policy_document) == pdoc: get_user_policy_result.policy_document) == pdoc:
policy_match = True policy_match = True
if policy_match:
msg=("The policy document you specified already exists "
"under the name %s." % pol)
if state == 'present' and skip: if state == 'present' and skip:
if policy_name not in current_policies and not policy_match: if policy_name not in current_policies and not policy_match:
changed = True changed = True
@ -189,15 +187,12 @@ def role_action(module, iam, name, policy_name, skip, pdoc, state):
module.exit_json(changed=False) module.exit_json(changed=False)
else: else:
module.fail_json(msg=e.message) module.fail_json(msg=e.message)
try: try:
for pol in current_policies: for pol in current_policies:
if urllib.unquote(iam.get_role_policy(name, pol). if urllib.unquote(iam.get_role_policy(name, pol).
get_role_policy_result.policy_document) == pdoc: get_role_policy_result.policy_document) == pdoc:
policy_match = True policy_match = True
if policy_match:
msg=("The policy document you specified already exists "
"under the name %s." % pol)
if state == 'present' and skip: if state == 'present' and skip:
if policy_name not in current_policies and not policy_match: if policy_name not in current_policies and not policy_match:
changed = True changed = True
@ -305,10 +300,12 @@ def main():
pdoc = json.dumps(json.load(json_data)) pdoc = json.dumps(json.load(json_data))
json_data.close() json_data.close()
elif module.params.get('policy_json') != None: elif module.params.get('policy_json') != None:
try: # if its a string, assume it is already JSON
pdoc = json.dumps(module.params.get('policy_json')) if not isinstance(pdoc, basestring):
except Exception as e: try:
module.fail_json(msg=str(e) + '\n' + module.params.get('policy_json')) pdoc = json.dumps(module.params.get('policy_json'))
except Exception as e:
module.fail_json(msg='Failed to convert the policy into valid JSON: %s' % str(e))
else: else:
pdoc=None pdoc=None