cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added no_log censoring to item output

Browse source 
should be last commit that fixes #12214
This commit is contained in:
Brian Coca 2015-10-02 09:09:40 -04:00
parent 5c39538a73
commit 4c9f58a152
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/plugins/callback/__init__.py
View file

@ -107,10 +107,19 @@ class CallbackBase:
except UnicodeDecodeError: except UnicodeDecodeError:
ret.append(">> the files are different, but the diff library cannot compare unicode strings\n\n") ret.append(">> the files are different, but the diff library cannot compare unicode strings\n\n")
def _get_item(self, result):
if '_ansible_no_log' in result:
item = "(censored due to no_log)"
else:
item = getattr(result, 'item', "(censored due to no_log)")
return item
def _process_items(self, result): def _process_items(self, result):
for res in result._result['results']: for res in result._result['results']:
newres = deepcopy(result) newres = deepcopy(result)
res['item'] = self._get_item(res)
newres._result = res newres._result = res
if 'failed' in res and res['failed']: if 'failed' in res and res['failed']:
self.v2_playbook_item_on_failed(newres) self.v2_playbook_item_on_failed(newres)
@ -119,7 +128,7 @@ class CallbackBase:
else: else:
self.v2_playbook_item_on_ok(newres) self.v2_playbook_item_on_ok(newres)
#del result._result['results'] del result._result['results']
def set_play_context(self, play_context): def set_play_context(self, play_context):
pass pass
@ -202,9 +211,7 @@ class CallbackBase:
def v2_runner_on_skipped(self, result): def v2_runner_on_skipped(self, result):
if C.DISPLAY_SKIPPED_HOSTS: if C.DISPLAY_SKIPPED_HOSTS:
host = result._host.get_name() host = result._host.get_name()
#FIXME, get item to pass through self.runner_on_skipped(host, self._get_item(getattr(result._result,'results',{})))
item = None
self.runner_on_skipped(host, item)
def v2_runner_on_unreachable(self, result): def v2_runner_on_unreachable(self, result):
host = result._host.get_name() host = result._host.get_name()

7
lib/ansible/plugins/callback/default.py
View file

@ -89,8 +89,11 @@ class CallbackModule(CallbackBase):
def v2_runner_on_skipped(self, result): def v2_runner_on_skipped(self, result):
if C.DISPLAY_SKIPPED_HOSTS: if C.DISPLAY_SKIPPED_HOSTS:
msg = "skipping: [%s]" % result._host.get_name() msg = "skipping: [%s]" % result._host.get_name()
if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result: if result._task.loop and 'results' in result._result:
msg += " => %s" % self._dump_results(result._result) self._process_items(result)
else:
if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result:
msg += " => %s" % self._dump_results(result._result)
self._display.display(msg, color='cyan') self._display.display(msg, color='cyan')
def v2_runner_on_unreachable(self, result): def v2_runner_on_unreachable(self, result):