ansible-vars 1.0.3__tar.gz → 1.0.5__tar.gz

{ansible_vars-1.0.3 → ansible_vars-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansible-vars
-Version: 1.0.3
+Version: 1.0.5
 Summary: Manage vaults and variable files for Ansible
 Project-URL: Homepage, https://github.com/xorwow/ansible-vars
 Project-URL: Issues, https://github.com/xorwow/ansible-vars/issues
@@ -204,6 +204,10 @@ Creates, updates, or deletes a key-value pair from a vault or variable file. Whe
 
 ### Environment variables
 
+#### ANSIBLE_HOME
+
+If this variable is set, the program will use its value as the working directory. When running the script from somewhere else, this way keys will be detected and paths will be resolved as if you were in your Ansible root directory.
+
 #### AV_COLOR_MODE
 
 Set the color mode as you would with `-C <mode>`.
@@ -264,6 +268,7 @@ When editing a file or creating a daemon, decrypted vaults are written to disk t
     - Will ignore files which cannot be parsed as an Ansible YAML file.
 - `file-daemon` command
     - Changes to file metadata (permissions, ...) are not mirrored.
+- `ansible-vars` cannot operate on files which are not (Jinja2) YAML dictionaries.
 
 ## Extension plans
 

{ansible_vars-1.0.3 → ansible_vars-1.0.5}/README.md

@@ -182,6 +182,10 @@ Creates, updates, or deletes a key-value pair from a vault or variable file. Whe
 
 ### Environment variables
 
+#### ANSIBLE_HOME
+
+If this variable is set, the program will use its value as the working directory. When running the script from somewhere else, this way keys will be detected and paths will be resolved as if you were in your Ansible root directory.
+
 #### AV_COLOR_MODE
 
 Set the color mode as you would with `-C <mode>`.
@@ -242,6 +246,7 @@ When editing a file or creating a daemon, decrypted vaults are written to disk t
     - Will ignore files which cannot be parsed as an Ansible YAML file.
 - `file-daemon` command
     - Changes to file metadata (permissions, ...) are not mirrored.
+- `ansible-vars` cannot operate on files which are not (Jinja2) YAML dictionaries.
 
 ## Extension plans
 

{ansible_vars-1.0.3 → ansible_vars-1.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ansible-vars"
-version = "1.0.3"
+version = "1.0.5"
 authors = [
   { name="xorwow", email="pip@xorwow.de" },
 ]

{ansible_vars-1.0.3 → ansible_vars-1.0.5}/src/ansible_vars/cli.py

@@ -29,6 +29,11 @@ from pygments.lexers.templates import YamlJinjaLexer
 from pygments.formatter import Formatter
 from pygments.formatters import TerminalFormatter, Terminal256Formatter, TerminalTrueColorFormatter
 
+# If we need to change the working directory, we have to do it before loading the Ansible vault library
+# Else, keys will not be detected correctly
+ANSIBLE_HOME: str = os.environ.get('ANSIBLE_HOME', os.getcwd())
+os.chdir(ANSIBLE_HOME)
+
 # Internal module imports
 from .vault import VaultFile, EncryptedVar, ProtoEncryptedVar
 from .vault_crypt import VaultKey, VaultKeyring
@@ -190,7 +195,7 @@ Deletes a node from a vault if it exists.
 }
 
 DEFAULT_EDITOR: str = os.environ.get('EDITOR', 'notepad.exe' if os.name == 'nt' else 'vi')
-DEFAULT_COLOR_MODE: str = os.environ.get('AV_COLOR_MODE', '256')
+DEFAULT_COLOR_MODE: str = os.environ.get('AV_COLOR_MODE', '256' if os.isatty(os.pipe()[1]) else 'none')
 DEFAULT_TEMP_DIR: str = os.environ.get('AV_TEMP_DIR', gettempdir())
 DEFAULT_CREATE_PLAIN: bool = os.environ.get('AV_CREATE_PLAIN', 'no').lower() in [ 'yes', 'y', 'true', 't', '1' ]
 
@@ -616,11 +621,11 @@ if config.command in [ 'create', 'edit' ]:
                     new_plain_leaves: list[tuple[Hashable, ...]] = []
                     def _find_new_plain_vars(path: tuple[Hashable, ...], value: Any) -> Any:
                         if path != ( SENTINEL_KEY, ) and type(value) is not EncryptedVar:
-                            if vault.get(path, default=Unset) is Unset:
+                            if vault.get(path, default=Unset) != value:
                                 new_plain_leaves.append(path)
                         return value
                     vault._transform_leaves(new_vault._data, _find_new_plain_vars, tuple())
-                    if new_plain_leaves:
+                    if not new_vault.full_encryption and new_plain_leaves:
                         print(f"\n[!] The following plain vars have been added in this edit:", Color.MEH)
                         print('\n'.join([ f"- { format_key_path(path) }" for path in new_plain_leaves ]))
                     # Log changes
@@ -727,8 +732,7 @@ if config.command == 'convert':
         vault.save()
         print(f"Vault converted to { 'outer' if vault.full_encryption else 'inner' } encryption.", Color.GOOD)
         if not vault.full_encryption:
-            print('New vault contents:\n')
-            print_yaml(vault.as_editable(with_header=False))
+            print('Please check the vault to make sure all secrets have been encrypted', Color.MEH)
     _convert()
 
 # Grep command