ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-06 10:40:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

move one if statement to module initialiazation

Browse source
This commit is contained in:
Tomas 2024-02-20 23:25:31 +02:00
parent ef058c4714
commit 642d87a121
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/modules/mysql_user.py
View file

@ -430,7 +430,7 @@ def main():
session_vars=dict(type='dict'), session_vars=dict(type='dict'),
column_case_sensitive=dict(type='bool', default=None), # TODO 4.0.0 add default=True 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=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( module = AnsibleModule(
argument_spec=argument_spec, argument_spec=argument_spec,
@ -479,10 +479,6 @@ def main():
if mysql_driver is None: if mysql_driver is None:
module.fail_json(msg=mysql_driver_fail_msg) 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: if password_expire_interval and password_expire_interval < 1:
module.fail_json(msg="password_expire_interval value \ module.fail_json(msg="password_expire_interval value \
should be positive number") should be positive number")

1
tests/integration/targets/test_mysql_user/tasks/test_password_expire.yml
View file

@ -132,7 +132,6 @@
ansible.builtin.assert: ansible.builtin.assert:
that: that:
- result is failed - result is failed
- "'should be used with' in result.msg"
- name: password_expire | Set password_expire_interval < 1 - name: password_expire | Set password_expire_interval < 1
community.mysql.mysql_user: community.mysql.mysql_user: