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

Fix --diff to respect no_log task parameter.

Browse source
This commit is contained in:
Toshio Kuratomi 2016-02-05 08:59:50 -08:00
parent ab0904d051
commit 0bcbcb20b0
5 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/runner/action_plugins/assemble.py
View file

@ -136,6 +136,9 @@ class ActionModule(object):
)
module_args_tmp = utils.merge_module_args(module_args, new_module_args)
if self.runner.no_log:
resultant = " [[ Diff output has been hidden because 'no_log: true' was specified for this result ]]"
if self.runner.noop_on_check(inject):
return ReturnData(conn=conn, comm_ok=True, result=dict(changed=True), diff=dict(before_header=dest, after_header=src, after=resultant))
else:

2
lib/ansible/runner/action_plugins/copy.py
View file

@ -366,6 +366,8 @@ class ActionModule(object):
diff['after_header'] = source
diff['after'] = src.read()
if self.runner.no_log and 'after' in diff:
diff["after"] = " [[ Diff output has been hidden because 'no_log: true' was specified for this result ]]"
return diff
def _remove_tempfile_if_content_defined(self, content, content_tempfile):

4
lib/ansible/runner/action_plugins/template.py
View file

@ -146,10 +146,14 @@ class ActionModule(object):
module_args_tmp = utils.merge_module_args(module_args, new_module_args)
if self.runner.noop_on_check(inject):
if self.runner.no_log:
resultant = " [[ Diff output has been hidden because 'no_log: true' was specified for this result ]]"
return ReturnData(conn=conn, comm_ok=True, result=dict(changed=True), diff=dict(before_header=dest, after_header=source, before=dest_contents, after=resultant))
else:
res = self.runner._execute_module(conn, tmp, 'copy', module_args_tmp, inject=inject, complex_args=complex_args)
if res.result.get('changed', False):
if self.runner.no_log:
resultant = " [[ Diff output has been hidden because 'no_log: true' was specified for this result ]]"
res.diff = dict(before=dest_contents, after=resultant)
return res
else:

3
lib/ansible/runner/action_plugins/win_copy.py
View file

@ -362,6 +362,9 @@ class ActionModule(object):
diff['after_header'] = source
diff['after'] = src.read()
if self.runner.no_log and 'after' in diff:
diff["after"] = " [[ Diff output has been hidden because 'no_log: true' was specified for this result ]]"
return diff
def _remove_tempfile_if_content_defined(self, content, content_tempfile):

4
lib/ansible/runner/action_plugins/win_template.py
View file

@ -122,10 +122,14 @@ class ActionModule(object):
module_args_tmp = utils.merge_module_args(module_args, new_module_args)
if self.runner.noop_on_check(inject):
if self.runner.no_log and resultant:
resultant = " [[ Diff output has been hidden because 'no_log: true' was specified for this result ]]"
return ReturnData(conn=conn, comm_ok=True, result=dict(changed=True), diff=dict(before_header=dest, after_header=source, before=dest_contents, after=resultant))
else:
res = self.runner._execute_module(conn, tmp, 'win_copy', module_args_tmp, inject=inject, complex_args=complex_args)
if res.result.get('changed', False):
if self.runner.no_log and resultant:
resultant = " [[ Diff output has been hidden because 'no_log: true' was specified for this result ]]"
res.diff = dict(before=dest_contents, after=resultant)
return res
else: