ansible

Commit Graph

Author	SHA1	Message	Date
Matt Clay	8c270ac75f	Add empty-init code-smell script. (#18406 ) Also removed boilerplate from otherwise empty __init__.py files which should not contain any code (checked by empty-init script).	8 years ago
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	4ed88512e4	Move uses of to_bytes, to_text, to_native to use the module_utils version (#17423 ) We couldn't copy to_unicode, to_bytes, to_str into module_utils because of licensing. So once created it we had two sets of functions that did the same things but had different implementations. To remedy that, this change removes the ansible.utils.unicode versions of those functions.	8 years ago
Toshio Kuratomi	44d979c8f5	Enable most unittests on python3 (just some vault unittests and a logging one left) (#17240 ) Make some python3 fixes to make the unittests pass: * galaxy imports * dictionary iteration in role requirements * swap_stdout helper for unittests * Normalize to text string in a facts.py function	8 years ago
Adrian Likins	e396d5d508	Implement vault encrypted yaml variables. (#16274 ) Make !vault-encrypted create a AnsibleVaultUnicode yaml object that can be used as a regular string object. This allows a playbook to include a encrypted vault blob for the value of a yaml variable. A 'secret_password' variable can have it's value encrypted instead of having to vault encrypt an entire vars file. Add __ENCRYPTED__ to the vault yaml types so template.Template can treat it similar to __UNSAFE__ flags. vault.VaultLib api changes: - Split VaultLib.encrypt to encrypt and encrypt_bytestring - VaultLib.encrypt() previously accepted the plaintext data as either a byte string or a unicode string. Doing the right thing based on the input type would fail on py3 if given a arg of type 'bytes'. To simplify the API, vaultlib.encrypt() now assumes input plaintext is a py2 unicode or py3 str. It will encode to utf-8 then call the new encrypt_bytestring(). The new methods are less ambiguous. - moved VaultLib.is_encrypted logic to vault module scope and split to is_encrypted() and is_encrypted_file(). Add a test/unit/mock/yaml_helper.py It has some helpers for testing parsing/yaml Integration tests added as roles test_vault and test_vault_embedded	8 years ago
Toshio Kuratomi	c8a8f546d4	A little unittest refactoring (#16704 ) A little unittest refactoring * Add a class decorator to generate tests when using a unittest.TestCase base class * Add a TestCase subclass with setUp() and tearDown() that sets up module parameter parsing * Move test_safe_eval to use the class decorator and ModuleTestCase base class * Move testing of set_mode_if_different into its own file and separate some test methods out so we get better errors and more coverage in case of errors. * Naming convention for test cases doesn't need to duplicate information that's already in the file path.	8 years ago
jctanner	373b23cc24	Fix mock loader for osx /etc symlinks (#16074 ) Fix role based unit tests for osx via mock.patch	9 years ago
nitzmahone	5b336832af	add _load_params debug overrides for module args/file passed on cmdline Updated python module wrapper explode method to drop 'args' file next to module. Both execute() and excommunicate() debug methods now pass the module args via file to enable debuggers that are picky about stdin. Updated unit tests to use a context manager for masking/restoring default streams and argv.	9 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

17 Commits (6ffd494efb146714fc4b297706ade5823118a6b1)