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

typo and no_log remove for password_expire* vars

Browse source
This commit is contained in:
Tomas 2024-02-20 22:04:53 +02:00
parent 494b537359
commit 3e10ac4851
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/module_utils/user.py
View file

@ -990,13 +990,13 @@ def get_password_expiration_policy(cursor, user, host, maria_role=False):
policy (int): Current users password policy. policy (int): Current users password policy.
""" """
if not maria_role: if not maria_role:
statment = "SELECT IFNULL(password_lifetime, -1) FROM mysql.user \ statement = "SELECT IFNULL(password_lifetime, -1) FROM mysql.user \
WHERE User = %s AND Host = %s", (user, host) WHERE User = %s AND Host = %s", (user, host)
else: else:
statment = "SELECT JSON_EXTRACT(Priv, '$.password_lifetime') AS password_lifetime \ statement = "SELECT JSON_EXTRACT(Priv, '$.password_lifetime') AS password_lifetime \
FROM mysql.global_priv \ FROM mysql.global_priv \
WHERE User = %s AND Host = %s", (user, host) WHERE User = %s AND Host = %s", (user, host)
cursor.execute(*statment) cursor.execute(*statement)
policy = cursor.fetchone()[0] policy = cursor.fetchone()[0]
return int(policy) return int(policy)
@ -1012,9 +1012,9 @@ def is_password_expired(cursor, user, host):
Returns: Returns:
expired (bool): True if expired, else False. expired (bool): True if expired, else False.
""" """
statment = "SELECT password_expired FROM mysql.user \ statement = "SELECT password_expired FROM mysql.user \
WHERE User = %s AND Host = %s", (user, host) WHERE User = %s AND Host = %s", (user, host)
cursor.execute(*statment) cursor.execute(*statement)
expired = cursor.fetchone()[0] expired = cursor.fetchone()[0]
if str(expired) == "Y": if str(expired) == "Y":
return True return True

4
plugins/modules/mysql_user.py
View file

@ -429,8 +429,8 @@ def main():
force_context=dict(type='bool', default=False), force_context=dict(type='bool', default=False),
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'], no_log=True), password_expire=dict(type='str', choices=['now', 'never', 'default', 'interval']),
password_expire_interval=dict(type='int', no_log=True), password_expire_interval=dict(type='int'),
) )
module = AnsibleModule( module = AnsibleModule(
argument_spec=argument_spec, argument_spec=argument_spec,