Commit Graph

44 Commits (a33e34894b60fa5a9cb3a42df4f90db8d7813428)

Author SHA1 Message Date
James Cammarata 8afa090417 Resolving differences in core modules post-merge 2016-12-08 11:25:36 -05:00
Toshio Kuratomi 7319104552 Refreshed metadata for core modules 2016-12-08 11:25:35 -05:00
Fabio Alessandro Locati e49667d94c Unquote urls in YAML - network (#5792) 2016-12-08 11:25:34 -05:00
Sam Doran 895179929c Examples syntax batch6 (#5623)
* Change example syntax on os_auth module

* Change example syntax on os_client_config module

* Change example syntax on os_image_facts module

* Change example syntax on os_networks_facts module

* Change example syntax on os_nova_flavor module

* Change example syntax on os_object module

* Change example syntax on os_server module

* Change example syntax on os_subnet_facts module

* Change example syntax on rax_files module

* Change example syntax on rax_files_objects module

* Change example syntax on mysql_db module

* Change example syntax on file module

* Change example syntax on uri module

* Change example syntax on cl_bond module

* Change example syntax on cl_bridge module

* Change example syntax on cl_img_install module

* Change example syntax on cl_interface module

* Change example syntax on cl_license module

* Change example syntax on cl_ports module

* Remove trailing colon
2016-12-08 11:25:31 -05:00
Toshio Kuratomi 38b3c43c68 Fix uri for change in case in response
In python3, response fields are title cased whereas in python2 they were
not.  We return these fields to the module's caller so we need to
normalize all of them to be lower case.

This reverts the lowercase check from 454f741ef5b56cccd123e12d7b2e6fe31d47c755
as that one was only targetted as a single field.
2016-12-08 11:25:24 -05:00
Toshio Kuratomi bd9e790cfe First set of fixes for uri module to work with py3.
This fix handles changes in the response headers (no longer all
lowercased) and switches from unicode() to to_text().
2016-12-08 11:25:24 -05:00
John R Barker 25b6492d37 Bulk spelling improvement to modules-core (#5225)
* Correct spelling mistakes

* Correct more spelling issues

* merge conflict

* Revert typo in parms
2016-12-08 11:25:20 -05:00
Michael Scherer b48e65219b Fix uri to run on python3 (#4580)
Since dict no longer have a method iteritems, we have to use
the six wrapper.
2016-12-08 11:24:56 -05:00
Toshio Kuratomi 79d12db02f Fix the six import 2016-12-08 11:24:35 -05:00
Toshio Kuratomi 8ba0af5df3 Be sure to import urllib.parse from somewhere 2016-12-08 11:24:35 -05:00
Michael Scherer c0217e14a7 Convert the network subfolder to py3/py2.4 syntax (#3690) 2016-12-08 11:24:29 -05:00
James Cammarata 124c4b94c1 Remove extraneous debug stuff from uri module left over from testing 2016-12-08 11:24:23 -05:00
James Cammarata 50cd8b0aa5 Make sure uri output contains json output when a non-200 status is returned
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
2016-12-08 11:24:23 -05:00
Toshio Kuratomi 6fae6c7b2d Give headers a default so that we can add to it. 2016-12-08 11:24:14 -05:00
Matt Martz fe22ee9423 Don't pass follow_redirects to fetch_url, use module.params instead 2016-12-08 11:24:10 -05:00
Toshio Kuratomi 9551e51607 At least for now, set body to raw as it can be either a dict or jsonified-str
Since our validation does conversion as well as validation, I'm not sure
this is entirely correct.  May need to take a look at our conversion
code and re-examine to be sure we're doing it right.
2016-12-08 11:24:08 -05:00
Michael Scherer 776d079e6b Fix non RFC 2606 domain name in doc 2016-12-08 11:24:08 -05:00
Matt Martz fada638d88 Indicate in notes that the dependency on httplib2 was removed for v2.1 2016-12-08 11:24:07 -05:00
Matt Martz a18206355a Drop dependency on httplib2 in the uri module, instead using ansible.module_utils.urls 2016-12-08 11:24:07 -05:00
Brian Coca 5b07831a11 fixes for uri module
- clarify docs on body_json behaviour
- only tranform into json if body input is not a string
  users keep passing json string and expecint it to not be jsonified again
- fixed issue with removes not handling path expansion correctly
- switched all path variables to 'type path' to handle expansions
2016-12-08 11:24:05 -05:00
cspollar 7ac010977b Fixed typo in uri module example 2016-12-08 11:23:50 -05:00
Toshio Kuratomi f6353a548c Document and return an error if httplib2 >= 0.7 is not present. We
can't use httplib2 0.6.x and below because they do not verify TLS
certificates and thus are insecure.

Fixes #1875
2016-12-08 11:23:44 -05:00
Toshio Kuratomi d5f3ac2a1d Remove debugging 2016-12-08 11:23:41 -05:00
Toshio Kuratomi 931fa9b6b2 xmlcharrefreplace is only for encoding, not for decoding :-( 2016-12-08 11:23:41 -05:00
Brian Coca 0540769677 specified that uri must be uppercase 2016-12-08 11:23:41 -05:00
Brian Coca f15ce1433a added version_added to body_format in uri 2016-12-08 11:23:25 -05:00
Iiro Uusitalo d6fc0ac5be uri.py is not using module_utils/urls.py from ansible core 2016-12-08 11:23:21 -05:00
Hennadiy (Gena) Verkh 098126807d Update uri.py
Added methods 'TRACE', 'CONNECT' from https://www.rfc-editor.org/rfc/rfc2616.txt, section 5.1.1
Added method 'REFRESH'
2016-12-08 11:23:19 -05:00
Hennadiy (Gena) Verkh 852c232b2d Removed method restriction in uri module 2016-12-08 11:23:19 -05:00
Iiro Uusitalo b92dabb9fb Refactor force basic auth, now all modules which use fetch_url() can use force_basic_auth 2016-12-08 11:23:19 -05:00
James Meickle 8197d7e640 Change uri debug example 2016-12-08 11:23:15 -05:00
murdochr aae140e6cd Change docs to reflect correct when syntax for matching variable strings as per MD's forum post as this fails with unhelpful error otherwise.
https://groups.google.com/forum/#!topic/ansible-project/D2hQzZ_jNuM
2016-12-08 11:23:11 -05:00
Greg DeKoenigsberg eb881d7d5d Proper author info for all remaining modules 2016-12-08 11:23:07 -05:00
Toshio Kuratomi b6257f73b4 Properly flip default for verifying server cert. Add nice error messages when the cert is invalid 2016-12-08 11:23:02 -05:00
Toshio Kuratomi a4497a7ddf Change uri module to validate ssl certs by default 2016-12-08 11:23:02 -05:00
whiter 8ee2102993 Doc update to highlight use of body_type parameter 2016-12-08 11:23:02 -05:00
Toshio Kuratomi 9eac68b417 Fix problem writing binary content to a temporary file in the uri module.
Fixes https://github.com/ansible/ansible/issues/10938
Fixes https://github.com/ansible/ansible/issues/7606
2016-12-08 11:23:00 -05:00
Sébastien Bocahu f88f895795 Removes YAML body_format option
It would require adding a dependency to the YAML module while it might
not provide much benefit (has anybody seen a HTTP API taking YAML as
input ?)
2016-12-08 11:22:51 -05:00
Sébastien Bocahu 4af3b60167 Add body_format for handling of JSON and YAML body
body_format is a new optional argument that enables handling of JSON or
YAML serialization format for the body argument.
When set to either 'json' or 'yaml', the body argument can be a dict or list.
The body will be encoded, and the Content-Type HTTP header will be set,
accordingly to the body_format argument.

Example:

- name: Facette - Create memory graph
  uri:
    method: POST
    url: http://facette/api/v1/library/graphs
    status_code: 201
    body_format: json
    body:
      name: "{{ ansible_fqdn }} - Memory usage"
      attributes:
        Source": "{{ ansible_fqdn }}"
        link: "1947a490-8ac6-4bf2-47c1-ff74272f8b32"
2016-12-08 11:22:51 -05:00
zitterbacke 264a16d822 fix uri modul for JSON-escape quotation marks
consider the following response body (content) of a REST/JSON webservice containing escaped quotation marks:

```json
{ "key": "\"works\"" }
```

decoding this string not as raw will lose the backslash as JSON escape. later json.loads will fail to parse.

Inspired by [this thread](https://groups.google.com/forum/#!topic/ansible-project/kymtiloDme4) on the mailing list and the following python shell code:

```python
import json
string=r'{ "key": "\"works\"" }'
json.loads(string)
json.loads(string.decode('raw_unicode_escape'))
json.loads(string.decode('unicode_escape'))
```
2016-12-08 11:22:47 -05:00
Dan Rue d3c686d632 Do not mark "skipped" when changed is false
When using the "creates" option with the uri module, set changed
to False if the file already exists. This behavior is consistent with
other modules which use "creates", such as command and shell.
2016-12-08 11:22:43 -05:00
Toshio Kuratomi 104b2d684c Add text/json as a mimetype to try deserializing
Fixes #503
2016-12-08 11:22:33 -05:00
Toshio Kuratomi 34d65647bf Move from md5 to sha1 to work on FIPS-140 enabled systems 2016-12-08 11:22:25 -05:00
Michael DeHaan 677ed39cb4 Renames. 2016-12-08 11:22:25 -05:00