From 642d87a12154e546d7a81941d54a06c0290ed291 Mon Sep 17 00:00:00 2001 From: Tomas Date: Tue, 20 Feb 2024 23:25:31 +0200 Subject: [PATCH] move one if statement to module initialiazation --- plugins/modules/mysql_user.py | 6 +----- .../targets/test_mysql_user/tasks/test_password_expire.yml | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/modules/mysql_user.py b/plugins/modules/mysql_user.py index 130e1b3..c9d4248 100644 --- a/plugins/modules/mysql_user.py +++ b/plugins/modules/mysql_user.py @@ -430,7 +430,7 @@ def main(): session_vars=dict(type='dict'), column_case_sensitive=dict(type='bool', default=None), # TODO 4.0.0 add default=True password_expire=dict(type='str', choices=['now', 'never', 'default', 'interval']), - password_expire_interval=dict(type='int'), + password_expire_interval=dict(type='int', required_if=[('password_expire', 'interval', True)]), ) module = AnsibleModule( argument_spec=argument_spec, @@ -479,10 +479,6 @@ def main(): if mysql_driver is None: module.fail_json(msg=mysql_driver_fail_msg) - if password_expire == "interval" and not password_expire_interval: - module.fail_json(msg="password_expire value interval \ - should be used with password_expire_interval") - if password_expire_interval and password_expire_interval < 1: module.fail_json(msg="password_expire_interval value \ should be positive number") diff --git a/tests/integration/targets/test_mysql_user/tasks/test_password_expire.yml b/tests/integration/targets/test_mysql_user/tasks/test_password_expire.yml index ead2a6d..c858c48 100644 --- a/tests/integration/targets/test_mysql_user/tasks/test_password_expire.yml +++ b/tests/integration/targets/test_mysql_user/tasks/test_password_expire.yml @@ -132,7 +132,6 @@ ansible.builtin.assert: that: - result is failed - - "'should be used with' in result.msg" - name: password_expire | Set password_expire_interval < 1 community.mysql.mysql_user: