Commit 3a7aca60 by James Cammarata

Fix no_log value for content in common file args settings

Also adds a test to ensure the content value is not logged.

Related to #8647
parent 8a5675ca
......@@ -152,7 +152,7 @@ FILE_COMMON_ARGUMENTS=dict(
selevel = dict(),
setype = dict(),
# not taken by the file module, but other modules call file so it must ignore them.
content = dict(),
content = dict(no_log=True),
backup = dict(),
force = dict(),
remote_src = dict(), # used by assemble
......@@ -884,7 +884,7 @@ class AnsibleModule(object):
arg_opts = self.argument_spec.get(canon, {})
no_log = arg_opts.get('no_log', False)
if no_log:
if self.boolean(no_log):
log_args[param] = 'NOT_LOGGING_PARAMETER'
elif param in passwd_keys:
log_args[param] = 'NOT_LOGGING_PASSWORD'
......
......@@ -89,6 +89,7 @@
assert:
that:
- "copy_result3|changed"
- "'content' not in copy_result3"
# test recursive copy
......@@ -180,3 +181,4 @@
- "copy_result6.changed"
- "copy_result6.dest == '{{output_dir|expanduser}}/multiline.txt'"
- "copy_result6.md5sum == '1627d51e7e607c92cf1a502bf0c6cce3'"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment