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

Use UnsafeProxy for lookup results too

Browse source 
Also fixes a couple of bugs that popped up when using the proxy class
This commit is contained in:
James Cammarata 2015-09-08 12:18:10 -04:00
parent f0411217e6
commit 30399edada
4 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/executor/task_executor.py
View file

@ -34,6 +34,7 @@ from ansible.playbook.task import Task
from ansible.template import Templar
from ansible.utils.listify import listify_lookup_plugin_terms
from ansible.utils.unicode import to_unicode
from ansible.utils.vars import json_variable_cleaner
from ansible.utils.debug import debug
@ -123,7 +124,7 @@ class TaskExecutor:
res['changed'] = False
debug("dumping result to json")
result = json.dumps(res)
result = json.dumps(res, default=json_variable_cleaner)
debug("done dumping result, returning")
return result
except AnsibleError as e:
@ -160,6 +161,11 @@ class TaskExecutor:
else:
raise AnsibleError("Unexpected failure in finding the lookup named '%s' in the available lookup plugins" % self._task.loop)
if items:
from ansible.vars.unsafe_proxy import UnsafeProxy
for idx, item in enumerate(items):
if item is not None and not isinstance(item, UnsafeProxy):
items[idx] = UnsafeProxy(item)
return items
def _run_loop(self, items):