10 Commits (26d34c1d6158eb679660278c1f9ac3e7171cb14a)

Author	SHA1	Message	Date
Adrian Likins	dd0189839e	Fix bug (#18355) where encrypted inventories fail 18355 (#18373) ... * Fix bug (#18355) where encrypted inventories fail This is first part of fix for #18355 * Make DataLoader._get_file_contents return bytes The issue #18355 is caused by a change to inventory to stop using _get_file_contents so that it can handle text encoding itself to better protect against harmless text encoding errors in ini files (invalid unicode text in comment fields). So this makes _get_file_contents return bytes so it and other callers can handle the to_text(). The data returned by _get_file_contents() is now a bytes object instead of a text object. The callers of _get_file_contents() have been updated to call to_text() themselves on the results. Previously, the ini parser attempted to work around ini files that potentially include non-vailid unicode in comment lines. To do this, it stopped using DataLoader._get_file_contents() which does the decryption of files if vault encrypted. It didn't use that because _get_file_contents previously did to_text() on the read data itself. _get_file_contents() returns a bytestring now, so ini.py can call it and still special case ini file comments when converting to_text(). That also means encrypted inventory files are decrypted first. Fixes #18355	8 years ago
Toshio Kuratomi	4203850d1a	Break apart a looped dependency to show a warning when parsing playbooks ... Display a warning when a dict key is overwritten by pyyaml Fixes #12888	9 years ago
James Cammarata	ff9f5d7dc8	Starting to add additional unit tests for VariableManager ... Required some rewiring in inventory code to make sure we're using the DataLoader class for some data file operations, which makes mocking them much easier. Also identified two corner cases not currently handled by the code, related to inventory variable sources and which one "wins". Also noticed we weren't properly merging variables from multiple group/host_var file locations (inventory directory vs. playbook directory locations) so fixed as well.	9 years ago
Toshio Kuratomi	e8452c864e	Restore the relative path handling portion of #11865	9 years ago
Brian Coca	b9433650d1	Revert "Path of group_vars and host_vars were getting the basedir added twice." ... in view of simpler solution incomming from james This reverts commit bae7a02be5.	9 years ago
Toshio Kuratomi	bae7a02be5	Path of group_vars and host_vars were getting the basedir added twice. ... Fix inventory so this won't happen and fix DataLoader so that it will test relative paths relative to self._basedir Fixes #11789	9 years ago
Brian Coca	091caf6279	added missing error class import	10 years ago
James Cammarata	9ac624d2c9	Fix mock DictDataLoader _get_file_contents to match real code	10 years ago
James Cammarata	9aa8676bdd	More template unit tests for v2	10 years ago
James Cammarata	ce3ef7f4c1	Making the switch to v2	10 years ago