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

Make sure uri output contains json output when a non-200 status is returned

Browse source 
Prior to the switch to the urls.py code, non-200 responses contained
a 'json' value when the content-type was JSON. This fix restores that
field upon a non-2xx response.

Fixes ansible/ansible#15555
This commit is contained in:
James Cammarata 2016-04-25 14:19:03 -04:00
parent b466f7bbe2
commit 84ee00bb42
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
network/basics/uri.py
View file

@ -326,13 +326,18 @@ def uri(module, url, dest, body, body_format, method, headers, socket_timeout):
resp, info = fetch_url(module, url, data=body, headers=headers, resp, info = fetch_url(module, url, data=body, headers=headers,
method=method, timeout=socket_timeout) method=method, timeout=socket_timeout)
r['redirected'] = redirected or info['url'] != url
r.update(redir_info)
r.update(info)
try: try:
content = resp.read() content = resp.read()
except AttributeError: except AttributeError:
content = '' # there was no content, but the error read()
# may have been stored in the info as 'body'
content = info.pop('body', '')
r['redirected'] = redirected or info['url'] != url
r.update(redir_info)
r.update(info)
return r, content, dest return r, content, dest
@ -441,14 +446,15 @@ def main():
if 'charset' in params: if 'charset' in params:
content_encoding = params['charset'] content_encoding = params['charset']
u_content = unicode(content, content_encoding, errors='replace') u_content = unicode(content, content_encoding, errors='replace')
if content_type.startswith('application/json') or \ if 'application/json' in content_type or 'text/json' in content_type:
content_type.startswith('text/json'):
try: try:
js = json.loads(u_content) js = json.loads(u_content)
uresp['json'] = js uresp['json'] = js
except: except:
module.fail_json(msg="bombed")
pass pass
else: else:
module.fail_json(msg="boo")
u_content = unicode(content, content_encoding, errors='replace') u_content = unicode(content, content_encoding, errors='replace')
if resp['status'] not in status_code: if resp['status'] not in status_code: