a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

now using type=json which takes care of str/dict

pull/4420/head
Brian Coca 2016-07-26 09:52:16 -04:00 committed by Matt Clay
parent 02ee352951
commit 1e5ca511d6
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ansible/modules/extras/cloud/amazon/s3_bucket.py
View File

@ -203,13 +203,7 @@ def _create_or_update_bucket(connection, module, location):
module.fail_json(msg=e.message) module.fail_json(msg=e.message)
if policy is not None: if policy is not None:
# Deal with policy if either JSON formatted string or just data structure compare_policy = json.loads(policy)
if isinstance(policy, basestring):
compare_policy = json.dumps(policy)
load_policy = policy
else:
compare_policy = policy
load_policy = json.loads(policy)
if current_policy is None or json.loads(current_policy) != compare_policy: if current_policy is None or json.loads(current_policy) != compare_policy:
try: try:
@ -350,7 +344,7 @@ def main():
argument_spec.update( argument_spec.update(
dict( dict(
force = dict(required=False, default='no', type='bool'), force = dict(required=False, default='no', type='bool'),
policy = dict(required=False), policy = dict(required=False, type='json'),
name = dict(required=True, type='str'), name = dict(required=True, type='str'),
requester_pays = dict(default='no', type='bool'), requester_pays = dict(default='no', type='bool'),
s3_url = dict(aliases=['S3_URL'], type='str'), s3_url = dict(aliases=['S3_URL'], type='str'),