ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-06 10:40:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix dependent lookup.

Browse source
This commit is contained in:
Felix Fontein 2025-03-08 13:25:04 +01:00
parent 207ae01a05
commit 097356dd5c
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/9833-data-tagging.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "dependent look plugin - make compatible with ansible-core's Data Tagging feature (https://github.com/ansible-collections/community.general/pull/9833)."

21
plugins/lookup/dependent.py
View file

@ -130,12 +130,24 @@ from ansible.template import Templar
from ansible_collections.community.general.plugins.module_utils.version import LooseVersion from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
try:
from ansible.template import trust_as_template as _trust_as_template
HAS_DATATAGGING = True
except ImportError:
HAS_DATATAGGING = False
# Whether Templar has a cache, which can be controlled by Templar.template()'s cache option. # Whether Templar has a cache, which can be controlled by Templar.template()'s cache option.
# The cache was removed for ansible-core 2.14 (https://github.com/ansible/ansible/pull/78419) # The cache was removed for ansible-core 2.14 (https://github.com/ansible/ansible/pull/78419)
_TEMPLAR_HAS_TEMPLATE_CACHE = LooseVersion(ansible_version) < LooseVersion('2.14.0') _TEMPLAR_HAS_TEMPLATE_CACHE = LooseVersion(ansible_version) < LooseVersion('2.14.0')
def _make_safe(value):
if HAS_DATATAGGING and isinstance(value, str):
return _trust_as_template(value)
return value
class LookupModule(LookupBase): class LookupModule(LookupBase):
def __evaluate(self, expression, templar, variables): def __evaluate(self, expression, templar, variables):
"""Evaluate expression with templar. """Evaluate expression with templar.
@ -144,10 +156,13 @@ class LookupModule(LookupBase):
``variables`` are the variables to use. ``variables`` are the variables to use.
""" """
templar.available_variables = variables or {} templar.available_variables = variables or {}
expression = "{0}{1}{2}".format("{{", expression, "}}") quoted_expression = "{0}{1}{2}".format("{{", expression, "}}")
if _TEMPLAR_HAS_TEMPLATE_CACHE: if _TEMPLAR_HAS_TEMPLATE_CACHE:
return templar.template(expression, cache=False) return templar.template(quoted_expression, cache=False)
return templar.template(expression) if hasattr(templar, 'evaluate_expression'):
# This is available since the Data Tagging PR has been merged
return templar.evaluate_expression(_make_safe(expression))
return templar.template(quoted_expression)
def __process(self, result, terms, index, current, templar, variables): def __process(self, result, terms, index, current, templar, variables):
"""Fills ``result`` list with evaluated items. """Fills ``result`` list with evaluated items.