Fix hiding of original value of files in diff output with no_logno-log-diff-before-fix

4 files changed, 33 insertions, 23 deletions

diff --git a/lib/ansible/runner/action_plugins/copy.py b/lib/ansible/runner/action_plugins/copy.py
index af0ad7189d..2c7a634899 100644
--- a/lib/ansible/runner/action_plugins/copy.py
+++ b/lib/ansible/runner/action_plugins/copy.py
@@ -366,8 +366,11 @@ 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 ]]"
+        if self.runner.no_log:
+            if 'before' in diff:
+                diff["before"] = ""
+            if '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):
diff --git a/lib/ansible/runner/action_plugins/template.py b/lib/ansible/runner/action_plugins/template.py
index b0f48595c7..4a5694592b 100644
--- a/lib/ansible/runner/action_plugins/template.py
+++ b/lib/ansible/runner/action_plugins/template.py
@@ -117,19 +117,22 @@ class ActionModule(object):
 
             # template is different from the remote value
 
-            # if showing diffs, we need to get the remote value
-            dest_contents = ''
-
+            diff = {}
             if self.runner.diff:
                 # using persist_files to keep the temp directory around to avoid needing to grab another
                 dest_result = self.runner._execute_module(conn, tmp, 'slurp', "path=%s" % dest, inject=inject, persist_files=True)
+                diff['before'] = ""
                 if 'content' in dest_result.result:
                     dest_contents = dest_result.result['content']
                     if dest_result.result['encoding'] == 'base64':
                         dest_contents = base64.b64decode(dest_contents)
                     else:
                         raise Exception("unknown encoding, failed: %s" % dest_result.result)
- 
+                    diff['before'] = dest_contents
+                diff['before_header'] = dest
+                diff['after_header'] = source
+                diff['after'] = resultant
+
             xfered = self.runner._transfer_str(conn, tmp, 'source', resultant)
 
             # fix file permissions when the copy is done as a different user
@@ -145,16 +148,15 @@ class ActionModule(object):
             )
             module_args_tmp = utils.merge_module_args(module_args, new_module_args)
 
+            if self.runner.no_log and self.runner.diff:
+                diff['before'] = ""
+                diff['after'] = " [[ Diff output has been hidden because 'no_log: true' was specified for this result ]]"
             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))
+                return ReturnData(conn=conn, comm_ok=True, result=dict(changed=True), diff=diff)
             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)
+                    res.diff = diff
                 return res
         else:
             # when running the file module based on the template data, we do
diff --git a/lib/ansible/runner/action_plugins/win_copy.py b/lib/ansible/runner/action_plugins/win_copy.py
index 27c3a778e9..476e9ad850 100644
--- a/lib/ansible/runner/action_plugins/win_copy.py
+++ b/lib/ansible/runner/action_plugins/win_copy.py
@@ -362,8 +362,11 @@ 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 ]]"
+        if self.runner.no_log:
+            if 'before' in diff:
+                diff['before'] = ""
+            if 'after' in diff:
+                diff["after"] = " [[ Diff output has been hidden because 'no_log: true' was specified for this result ]]"
 
         return diff
 
diff --git a/lib/ansible/runner/action_plugins/win_template.py b/lib/ansible/runner/action_plugins/win_template.py
index f085d7bde2..b9809ac3eb 100644
--- a/lib/ansible/runner/action_plugins/win_template.py
+++ b/lib/ansible/runner/action_plugins/win_template.py
@@ -93,18 +93,21 @@ class ActionModule(object):
 
             # template is different from the remote value
 
-            # if showing diffs, we need to get the remote value
-            dest_contents = ''
-
+            diff = {}
             if self.runner.diff:
                 # using persist_files to keep the temp directory around to avoid needing to grab another
                 dest_result = self.runner._execute_module(conn, tmp, 'slurp', "path=%s" % dest, inject=inject, persist_files=True)
+                diff["before"] = ""
                 if 'content' in dest_result.result:
                     dest_contents = dest_result.result['content']
                     if dest_result.result['encoding'] == 'base64':
                         dest_contents = base64.b64decode(dest_contents)
                     else:
                         raise Exception("unknown encoding, failed: %s" % dest_result.result)
+                    diff["before"] = dest_contents
+                diff["before_header"] = dest
+                diff["after"] = resultant
+                diff["after_header"] = resultant
 
             xfered = self.runner._transfer_str(conn, tmp, 'source', resultant)
 
@@ -121,16 +124,15 @@ class ActionModule(object):
             )
             module_args_tmp = utils.merge_module_args(module_args, new_module_args)
 
+            if self.runner.no_log:
+                diff["before"] = ""
+                diff["after"] = " [[ Diff output has been hidden because 'no_log: true' was specified for this result ]]"
             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))
+                return ReturnData(conn=conn, comm_ok=True, result=dict(changed=True), diff=diff)
             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)
+                    res.diff = diff
                 return res
         else:
             # when running the file module based on the template data, we do