ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 03:41:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix no_log value for content in common file args settings

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

Related to #8647
This commit is contained in:
James Cammarata 2014-08-19 10:46:46 -05:00
parent 8a5675ca9f
commit 3a7aca6066
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/basic.py
View file

@ -152,7 +152,7 @@ FILE_COMMON_ARGUMENTS=dict(
selevel = dict(), selevel = dict(),
setype = dict(), setype = dict(),
# not taken by the file module, but other modules call file so it must ignore them. # 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(), backup = dict(),
force = dict(), force = dict(),
remote_src = dict(), # used by assemble remote_src = dict(), # used by assemble
@ -884,7 +884,7 @@ class AnsibleModule(object):
arg_opts = self.argument_spec.get(canon, {}) arg_opts = self.argument_spec.get(canon, {})
no_log = arg_opts.get('no_log', False) no_log = arg_opts.get('no_log', False)
if no_log: if self.boolean(no_log):
log_args[param] = 'NOT_LOGGING_PARAMETER' log_args[param] = 'NOT_LOGGING_PARAMETER'
elif param in passwd_keys: elif param in passwd_keys:
log_args[param] = 'NOT_LOGGING_PASSWORD' log_args[param] = 'NOT_LOGGING_PASSWORD'

2
test/integration/roles/test_copy/tasks/main.yml
View file

@ -89,6 +89,7 @@
assert: assert:
that: that:
- "copy_result3|changed" - "copy_result3|changed"
- "'content' not in copy_result3"
# test recursive copy # test recursive copy
@ -180,3 +181,4 @@
- "copy_result6.changed" - "copy_result6.changed"
- "copy_result6.dest == '{{output_dir|expanduser}}/multiline.txt'" - "copy_result6.dest == '{{output_dir|expanduser}}/multiline.txt'"
- "copy_result6.md5sum == '1627d51e7e607c92cf1a502bf0c6cce3'" - "copy_result6.md5sum == '1627d51e7e607c92cf1a502bf0c6cce3'"