ansible-core 2.19.0b6__py3-none-any.whl → 2.19.0b7__py3-none-any.whl

ansible/utils/vars.py

@@ -28,6 +28,7 @@ from json import dumps
 from ansible import constants as C
 from ansible import context
 from ansible._internal import _json
+from ansible._internal._templating import _jinja_bits
 from ansible.errors import AnsibleError, AnsibleOptionsError
 from ansible.module_utils.datatag import native_type_name
 from ansible.module_utils.common.text.converters import to_native, to_text
@@ -252,6 +253,8 @@ def isidentifier(ident):
 
     Originally posted at https://stackoverflow.com/a/29586366
     """
+    # deprecated: description='Use validate_variable_name instead.' core_version='2.23'
+
     if not isinstance(ident, str):
         return False
 
@@ -269,7 +272,7 @@ def isidentifier(ident):
 
 def validate_variable_name(name: object) -> None:
     """Validate the given variable name is valid, raising an AnsibleError if it is not."""
-    if isinstance(name, str) and isidentifier(name):
+    if isinstance(name, str) and name.isidentifier() and name.isascii() and name not in _jinja_bits.JINJA_KEYWORDS:
         return
 
     if isinstance(name, (str, int, float, bool, type(None))):

ansible/vars/manager.py

@@ -407,7 +407,7 @@ class VariableManager:
         all_vars = _combine_and_track(all_vars, self._extra_vars, "extra vars")
 
         # before we add 'reserved vars', check we didn't add any reserved vars
-        warn_if_reserved(all_vars.keys())
+        warn_if_reserved(all_vars)
 
         # magic variables
         all_vars = _combine_and_track(all_vars, magic_variables, "magic vars")
@@ -563,7 +563,8 @@ class VariableManager:
         if not isinstance(facts, Mapping):
             raise AnsibleAssertionError("the type of 'facts' to set for host_facts should be a Mapping but is a %s" % type(facts))
 
-        warn_if_reserved(facts.keys())
+        warn_if_reserved(facts)
+
         try:
             host_cache = self._fact_cache.get(host)
         except KeyError:
@@ -587,7 +588,8 @@ class VariableManager:
         if not isinstance(facts, Mapping):
             raise AnsibleAssertionError("the type of 'facts' to set for nonpersistent_facts should be a Mapping but is a %s" % type(facts))
 
-        warn_if_reserved(facts.keys())
+        warn_if_reserved(facts)
+
         try:
             self._nonpersistent_fact_cache[host] |= facts
         except KeyError:
@@ -599,6 +601,7 @@ class VariableManager:
         """
 
         warn_if_reserved([varname])
+
         if host not in self._vars_cache:
             self._vars_cache[host] = dict()
 

ansible/vars/reserved.py

@@ -66,8 +66,7 @@ def get_reserved_names(include_private: bool = True) -> set[str]:
 
 
 def warn_if_reserved(myvars: c.Iterable[str], additional: c.Iterable[str] | None = None) -> None:
-    """ this function warns if any variable passed conflicts with internally reserved names """
-
+    """Issue a warning for any variable which conflicts with an internally reserved name."""
     if additional is None:
         reserved = _RESERVED_NAMES
     else:
@@ -76,8 +75,11 @@ def warn_if_reserved(myvars: c.Iterable[str], additional: c.Iterable[str] | None
     varnames = set(myvars)
     varnames.discard('vars')  # we add this one internally, so safe to ignore
 
-    for varname in varnames.intersection(reserved):
-        display.warning(f'Found variable using reserved name {varname!r}.')
+    if conflicts := varnames.intersection(reserved):
+        # Ensure the varname used for obj is the tagged one from myvars and not the untagged one from reserved.
+        # This can occur because tags do not affect value equality, and intersection can return values from either the left or right side.
+        for varname in (name for name in myvars if name in conflicts):
+            display.warning(f'Found variable using reserved name {varname!r}.', obj=varname)
 
 
 def is_reserved_name(name: str) -> bool:

{ansible_core-2.19.0b6.dist-info → ansible_core-2.19.0b7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansible-core
-Version: 2.19.0b6
+Version: 2.19.0b7
 Summary: Radically simple IT automation
 Author: Ansible Project
 Project-URL: Homepage, https://ansible.com/