From a9c3bfa96ceea4e21176cb0c07cb2c98a0634775 Mon Sep 17 00:00:00 2001 From: kaorihinata Date: Mon, 10 Feb 2020 17:21:45 -0500 Subject: [PATCH] Backport PR #66219 to support the backport of PR #64733 (#67209) * Update user module to support no_log=False. (#66219) Updates the user module to support pull request #64733. Neither the update_password or password_lock field contains sensitive information, so mark them as such. (cherry picked from commit 40394ed671ffdcc42cd9e5bdb736a682d7452319) * Backport PR #66219 to support PR #64733 Backport PR #66219 to support the backport of PR #64733 (see: https://github.com/ansible/ansible/pull/66219). * Delete backport-66219-update-user-module-for-64733.yml * Update 66219-update-user-module-for-64733.yml Co-authored-by: Matt Davis --- changelogs/fragments/66219-update-user-module-for-64733.yml | 2 ++ lib/ansible/modules/system/user.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/66219-update-user-module-for-64733.yml diff --git a/changelogs/fragments/66219-update-user-module-for-64733.yml b/changelogs/fragments/66219-update-user-module-for-64733.yml new file mode 100644 index 00000000000..138c6d98dc1 --- /dev/null +++ b/changelogs/fragments/66219-update-user-module-for-64733.yml @@ -0,0 +1,2 @@ +bugfixes: + - "user - update module to support silencing ``no_log`` warnings in the future (see: https://github.com/ansible/ansible/pull/64733)" diff --git a/lib/ansible/modules/system/user.py b/lib/ansible/modules/system/user.py index e175cbe8410..4f22ec7fa05 100644 --- a/lib/ansible/modules/system/user.py +++ b/lib/ansible/modules/system/user.py @@ -2856,9 +2856,9 @@ def main(): ssh_key_file=dict(type='path'), ssh_key_comment=dict(type='str', default=ssh_defaults['comment']), ssh_key_passphrase=dict(type='str', no_log=True), - update_password=dict(type='str', default='always', choices=['always', 'on_create']), + update_password=dict(type='str', default='always', choices=['always', 'on_create'], no_log=False), expires=dict(type='float'), - password_lock=dict(type='bool'), + password_lock=dict(type='bool', no_log=False), local=dict(type='bool'), profile=dict(type='str'), authorization=dict(type='str'),