cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
19340 commits 47 branches 390 tags 440 MiB
Commit graph

81 commits

Author SHA1 Message Date
Brian Coca
005dc84aa7 moved last utils.debug to display.debug 2016-04-08 16:00:36 -04:00
Brian Coca
0b2f631197 Merge pull request #14504 from bcoca/template_comments 
template also when only comments present
 2016-03-06 10:45:18 -05:00
Brian Coca
b901b15d3b Merge pull request #14537 from Yannig/devel_better_error_handling 
Improve message content to get more hint about the raised error.
 2016-03-03 18:11:04 -05:00
Brian Coca
c022a43a47 fixed str to to_str 2016-03-03 14:40:35 -05:00
Brian Coca
4cfd042839 more complete and informative errors 
mostly templating issues now all return data templated and actual error
fixes #14781
 2016-03-03 13:52:09 -05:00
Toshio Kuratomi
1dbbd2a80c Remove debugging and fix the place where bytes are being handed to StringIO 2016-03-02 09:31:06 -08:00
Toshio Kuratomi
093b3422ec more information 2016-03-02 08:58:15 -08:00
Toshio Kuratomi
5aef65edcd Testing whether this fixes jenkins 2016-03-02 07:47:32 -08:00
James Cammarata
3247390123 Conditionally import StringIO in template so we only use io.StringIO on py3 2016-03-02 09:34:43 -05:00
Toshio Kuratomi
b70bf3b056 Use io.StringIO and io.BytesIO instead of StringIO.StringIO for compat with py3 2016-02-26 16:43:05 -08:00
Matt Martz
439a385215 Catch TypeError on join, and if caught just return a single item, or a list of many 2016-02-20 16:17:58 -06:00
Yannig Perré
588045cc46 Improve message content to get more hint about the raised error. 2016-02-17 21:30:34 +01:00
Brian Coca
6102a4b9b4 template also when only comments present 2016-02-16 09:42:33 -05:00
Marc Poirier
0792983ec8 Display the string which is causing an exception to be raised. 
In the ansible template module, when there is an error while
expanding a templated string, displaying the string causing the
exception is very useful.
 2016-02-11 15:42:50 -05:00
Brian Coca
6149685652 Merge pull request #14293 from dagwieers/fix-eval-json-booleans 
Defined JSON booleans in global context for python eval()
 2016-02-04 11:33:30 -05:00
Dag Wieers
2e171610e0 Also add 'null' as a possible JSON value 2016-02-04 14:19:46 +01:00
Dag Wieers
dc48d27dd2 Defined JSON booleans in global context for python eval() 
We define 'false' and 'true' as variables so that python eval() recognizes them as False and True.

This fixes #14291.
 2016-02-03 19:11:55 +01:00
Brian Coca
dc15eb806e deprecate all bare variable conversions (not debug) 
now deprecation message appears with variable name in all spots where this occurs
debug's var= option is excluded as this is only place where bare variables shold actually
be accepted.
 2016-02-01 18:59:14 -05:00
Brian Coca
d82d65ee7b keep string type filters as strings 
now we don't try to convert types if using a filter that outputs a specifically formated string
made list of filters configurable
 2015-12-08 12:52:20 -08:00
James Cammarata
f926e81782 Re-implement lookup wantlist 
Fixes #13285
 2015-11-29 23:45:54 -05:00
Yannig Perré
0c360d17cb New parameter for template method. 
We do not compute hash when we know that the result does not need to be cached (like with_items loop).
It also result in a small speed improvement.
 2015-11-10 07:19:19 +01:00
James Cammarata
7e04947599 Be more selective about what variables we cache during templating 
Fixes #13087
 2015-11-09 14:07:48 -05:00
James Cammarata
5040abaaf2 Merge branch 'devel_cache_for_do_template_call' of https://github.com/Yannig/ansible into Yannig-devel_cache_for_do_template_call 2015-11-06 22:04:52 -05:00
James Cammarata
1027abd596 Cleaning up bugs related to perf improvement changes 2015-11-05 16:42:12 -05:00
James Cammarata
63c47fb271 Fixing up performance 2015-11-05 16:22:37 -05:00
Yannig Perre
ccbdd6229a Use static vars when computing host vars known to be static (inventory_hostname, inventory_dir etc.). 2015-11-04 22:16:14 +01:00
Yannig Perré
30f827d92d Fix python3 test. 2015-11-03 11:52:09 +01:00
Yannig Perré
130139dc80 Fix unicode issue introduced by previous commit. 2015-11-02 21:32:49 +01:00
Yannig Perré
4a8d1703d4 New patch against hostvars.py. With this patch, Ansible run lose 50% of time. 
Little rewrite of previous patch to use sha1 signature.
Use fail_on_undefined to compute sha1 signature.
 2015-11-02 21:04:20 +01:00
Brian Coca
79bf66336b switched clean_data from hardcoded delimiters to actual currently set jinja2 environment delimiters 2015-11-02 09:00:56 -05:00
Yannig Perré
805f768dab Clear cache when updating template variables. 2015-11-02 07:57:44 +01:00
Yannig Perré
87a9485b2f Cache for _do_template call. May result in nice speed improvement (4-5 times faster). 2015-11-01 22:30:55 +01:00
Toshio Kuratomi
baa309309d Bundle a new version of python-six for compatibility along with some code to make it easy for distributions to override the bunndled copy if they have a new enough version. 2015-10-16 08:21:28 -07:00
James Cammarata
45b803efb4 Properly use test_loader from SharedPluginLoaderObj 2015-10-14 17:53:28 -04:00
Marius Gedminas
9b39af8e9a Python 3: the StringIO module is gone 
Fixes 17 failing tests on Python 3.4, restoring the 8 failures we had
last Friday.
 2015-09-28 09:28:53 +03:00
James Cammarata
cdc6c5208e Clean string data run through the template engine 
Also strip UnsafeProxy off of low level srings and objects to ensure
they don't cause issues later down the road

Fixes #12513
 2015-09-25 16:49:31 -04:00
Marius Gedminas
56f2a25bff Python 3: there's no 'unicode' 2015-09-24 12:53:48 +03:00
Marius Gedminas
f91b28ef23 Fix safe_eval() of set literals 
There was code to support set literals (on Python 2.7 and newer), but it
was buggy: SAFE_NODES.union() doesn't modify SAFE_NODES in place,
instead it returns a new set object that is then silently discarded.

I added a unit test and fixed the code.  I also changed the version
check to use sys.version_tuple instead of a string comparison, for
consistency with the subsequent Python 3.4 version check that I added in
the previous commit.
 2015-09-11 09:41:05 +03:00
Marius Gedminas
2b73002044 Python 3: make ansible.template.safe_eval() work 
Two things changed in Python 3.4:

- 'basestring' is no longer defined, so use six.string_types

- True/False are now special AST node types (NamedConstant) rather than
  just names

(Good thing we had tests, or I wouldn't have noticed the 2nd thing!)

I found only one place where safe_eval() is called inside the ansible
codebase: in lib/template/__init__.py.  The call to safe_eval(result,
...) is protected by result.startswith('...'), which means result cannot
possibly be a byte string on Python 3 (or startswith() would raise, so
six.string_types (which excludes byte strings on Python 3) is fine here.
 2015-09-11 09:37:44 +03:00
Toshio Kuratomi
46bf3d1bc1 Remove plugin._basedirs as we now use different data structures to achieve that functionality. 2015-09-10 10:41:31 -07:00
Marius Gedminas
ba0cf42ce9 Python 3: use six.string_types instead of basestring 
Reduces the number of failing tests from 35 to 17.
 2015-09-09 09:25:23 +03:00
James Cammarata
30399edada Use UnsafeProxy for lookup results too 
Also fixes a couple of bugs that popped up when using the proxy class
 2015-09-08 12:19:39 -04:00
James Cammarata
87f75a50ad Use proxy class to mark variables unsafe for templating 
Fixes #12191
 2015-09-04 16:38:06 -04:00
Toshio Kuratomi
e218bf8da9 Do not escape backslashes when processing a template file. 
Fixes #12198
Fixes #12241
 2015-09-03 17:45:17 -07:00
Marius Gedminas
823677b490 Replace .iteritems() with six.iteritems() 
Replace .iteritems() with six.iteritems() everywhere except in
module_utils (because there's no 'six' on the remote host).  And except
in lib/ansible/galaxy/data/metadata_template.j2, because I'm not sure
six is available there.
 2015-09-03 09:23:27 +03:00
Toshio Kuratomi
1998eddf8d Keep newlines by default now. 
In v1, a trailing newline was kept if the parameter was passed as key=value.  If
the parameter was passed as yaml dict the trailing newline was
discarded.  Since key-value and yaml dict were unified in v2 we have to
make a choice as to which behaviour we want.  Decided that keeping trailing
newlines by default made the most sense.

Fixes #12200
Fixes #12199
 2015-09-02 11:55:45 -07:00
Toshio Kuratomi
41da8de094 Speedup for counting newlines 2015-09-02 10:59:51 -07:00
James Cammarata
5434ed973b Make sure locals in safe_eval is a plain dict when running eval 
Fixes #12206
 2015-09-02 13:54:58 -04:00
Toshio Kuratomi
417bf1c805 Unittest the _count_trailing_newlines function 2015-09-02 08:59:31 -07:00
Toshio Kuratomi
7ed746ad45 Fix preserve_trailing_newlines (broken by 7f5080f64a ) 
Fix for one half of hte bug reported in #12198
 2015-09-02 08:47:20 -07:00