ansible-vars 1.0.11__tar.gz → 1.0.12__tar.gz

{ansible_vars-1.0.11 → ansible_vars-1.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansible-vars
-Version: 1.0.11
+Version: 1.0.12
 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
@@ -103,7 +103,7 @@ To use any functions of `ansible-vars` that require encrypting or decrypting dat
 
 By default, the first loaded key is used for all encryption tasks. Note that auto-detected keys are inserted into the application's keyring *after* your explicitly added ones, so the first key you add will usually be the encryption key. If you want to make sure a certain key is used, reference its identifier using `--encryption-key|-K <identifier>`.
 
-You can disable automatic key detection by flagging `--no-encrypt-keys|-D`. Use `ansible-vars keyring` to view all available keys.
+You can disable automatic key detection by flagging `--no-detect-keys|-D`. Use `ansible-vars keyring` to view all available keys.
 
 #### Encryption salts
 

{ansible_vars-1.0.11 → ansible_vars-1.0.12}/README.md

@@ -81,7 +81,7 @@ To use any functions of `ansible-vars` that require encrypting or decrypting dat
 
 By default, the first loaded key is used for all encryption tasks. Note that auto-detected keys are inserted into the application's keyring *after* your explicitly added ones, so the first key you add will usually be the encryption key. If you want to make sure a certain key is used, reference its identifier using `--encryption-key|-K <identifier>`.
 
-You can disable automatic key detection by flagging `--no-encrypt-keys|-D`. Use `ansible-vars keyring` to view all available keys.
+You can disable automatic key detection by flagging `--no-detect-keys|-D`. Use `ansible-vars keyring` to view all available keys.
 
 #### Encryption salts
 

{ansible_vars-1.0.11 → ansible_vars-1.0.12}/pyproject.toml

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

{ansible_vars-1.0.11 → ansible_vars-1.0.12}/src/ansible_vars/vault.py

@@ -263,7 +263,7 @@ class Vault():
           - `True`: Attempt to copy and convert the value('s leaf values) into an `EncryptedVar` before storing it
           - `False`: Store the value as-is
         '''
-        path = Vault._to_path(path)
+        path: tuple[Hashable, ...] = Vault._to_path(path)
         # Encrypt value if necessary
         if encrypt:
             value = Vault._copy_data(value)
@@ -271,10 +271,14 @@ class Vault():
                 '''Transforms strings into `EncryptedVar`s.'''
                 if type(_value) is not str:
                     return _value
+                name: str | None = str(path[-1]) if path else None
                 if VaultKey.is_encrypted(_value):
-                    return EncryptedVar(_value, name=str(path[-1]))
-                return EncryptedVar(self.keyring.encrypt(_value), name=str(path[-1]))
-            Vault._transform_leaves(value, _encrypt_leaf, tuple()) if isinstance(value, dict | list) else _encrypt_leaf(tuple(), value)
+                    return EncryptedVar(_value, name=name)
+                return EncryptedVar(self.keyring.encrypt(_value), name=name)
+            if isinstance(value, dict | list):
+                Vault._transform_leaves(value, _encrypt_leaf, tuple())
+            else:
+                value = _encrypt_leaf(tuple(), value)
         # Resolve chain and create parents if necessary, then set value for last item
         parent: Any = self._data
         par_path: str = ''