internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tempating issues with no_log and loops (#44468)

Browse Source 
* fix tempating issues with no_log and loops

 - task is no log if any item is
 - added test cases

fixes #43294
This commit is contained in:
Brian Coca
2018-08-21 21:53:56 -04:00
committed by GitHub
parent 6982dfc756
commit bda074d34e
5 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ansible/executor/task_executor.py
View File

@@ -171,9 +171,10 @@ class TaskExecutor:
display.debug("done dumping result, returning")
return res
except AnsibleError as e:
return dict(failed=True, msg=wrap_var(to_text(e, nonstring='simplerepr')))
return dict(failed=True, msg=wrap_var(to_text(e, nonstring='simplerepr')), _ansible_no_log=self._task.no_log)
except Exception as e:
return dict(failed=True, msg='Unexpected failure during module execution.', exception=to_text(traceback.format_exc()), stdout='')
return dict(failed=True, msg='Unexpected failure during module execution.', exception=to_text(traceback.format_exc()),
stdout='', _ansible_no_log=self._task.no_log)
finally:
try:
self._connection.close()
@@ -303,6 +304,7 @@ class TaskExecutor:
# Only squash with 'with_:' not with the 'loop:', 'magic' squashing can be removed once with_ loops are
items = self._squash_items(items, loop_var, task_vars)
no_log = False
for item_index, item in enumerate(items):
task_vars[loop_var] = item
if index_var:
@@ -337,6 +339,9 @@ class TaskExecutor:
(self._task, tmp_task) = (tmp_task, self._task)
(self._play_context, tmp_play_context) = (tmp_play_context, self._play_context)
# update 'general no_log' based on specific no_log
no_log = no_log or tmp_task.no_log
# now update the result with the item info, and append the result
# to the list of results
res[loop_var] = item
@@ -360,6 +365,8 @@ class TaskExecutor:
results.append(res)
del task_vars[loop_var]
self._task.no_log = no_log
return results
def _squash_items(self, items, loop_var, variables):

2
lib/ansible/executor/task_result.py
View File

@@ -111,7 +111,7 @@ class TaskResult:
else:
ignore = _IGNORE
if self._task.no_log or self._result.get('_ansible_no_log', False):
if isinstance(self._task.no_log, bool) and self._task.no_log or self._result.get('_ansible_no_log', False):
x = {"censored": "the output has been hidden due to the fact that 'no_log: true' was specified for this result"}
# preserve full