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

fix CI

Browse source
This commit is contained in:
n-cc 2024-01-10 15:56:01 -06:00 • committed by n-cc
parent 5273712941
commit 7012a277de
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/module_utils/user.py
View file

@ -155,10 +155,10 @@ def user_add(cursor, user, host, host_all, password, encrypted,
attributes, tls_requires, reuse_existing_password, module): attributes, tls_requires, reuse_existing_password, module):
# we cannot create users without a proper hostname # we cannot create users without a proper hostname
if host_all: if host_all:
return {'changed': False, 'password_changed': False} return {'changed': False, 'password_changed': False, 'attributes': {}}
if module.check_mode: if module.check_mode:
return {'changed': True, 'password_changed': None} return {'changed': True, 'password_changed': None, 'attributes': {}}
# If attributes are set, perform a sanity check to ensure server supports user attributes before creating user # If attributes are set, perform a sanity check to ensure server supports user attributes before creating user
if attributes and not get_attribute_support(cursor): if attributes and not get_attribute_support(cursor):
@ -417,6 +417,8 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
privileges_revoke(cursor, user, host, db_table, revoke_privs, grant_option, maria_role) privileges_revoke(cursor, user, host, db_table, revoke_privs, grant_option, maria_role)
if len(grant_privs) > 0: if len(grant_privs) > 0:
privileges_grant(cursor, user, host, db_table, grant_privs, tls_requires, maria_role) privileges_grant(cursor, user, host, db_table, grant_privs, tls_requires, maria_role)
else:
changed = True
# after privilege manipulation, compare privileges from before and now # after privilege manipulation, compare privileges from before and now
after_priv = privileges_get(cursor, user, host, maria_role) after_priv = privileges_get(cursor, user, host, maria_role)
@ -969,11 +971,12 @@ def get_attribute_support(cursor):
# information_schema.tables does not hold the tables within information_schema itself # information_schema.tables does not hold the tables within information_schema itself
cursor.execute("SELECT attribute FROM INFORMATION_SCHEMA.USER_ATTRIBUTES LIMIT 0") cursor.execute("SELECT attribute FROM INFORMATION_SCHEMA.USER_ATTRIBUTES LIMIT 0")
cursor.fetchone() cursor.fetchone()
except mysql_driver.OperationalError: except mysql_driver.Error:
return False return False
return True return True
def attributes_get(cursor, user, host): def attributes_get(cursor, user, host):
"""Get attributes for a given user. """Get attributes for a given user.
@ -999,6 +1002,7 @@ def attributes_get(cursor, user, host):
return None return None
def get_impl(cursor): def get_impl(cursor):
global impl global impl
cursor.execute("SELECT VERSION()") cursor.execute("SELECT VERSION()")

2
plugins/modules/mysql_role.py
View file

@ -931,7 +931,7 @@ class Role():
if privs: if privs:
result = user_mod(self.cursor, self.name, self.host, result = user_mod(self.cursor, self.name, self.host,
None, None, None, None, None, None, None, None, None, None, None, None,
privs, append_privs, subtract_privs, None, privs, append_privs, subtract_privs, None, None,
self.module, role=True, maria_role=self.is_mariadb) self.module, role=True, maria_role=self.is_mariadb)
changed = result['changed'] changed = result['changed']

2
plugins/modules/mysql_user.py
View file

@ -166,7 +166,7 @@ options:
version_added: '3.8.0' version_added: '3.8.0'
attributes: attributes:
description: description:
- Create, update, or delete user attributes (arbitrary "key: value" comments) for the user. - "Create, update, or delete user attributes (arbitrary 'key: value' comments) for the user."
- MySQL server must support the INFORMATION_SCHEMA.USER_ATTRIBUTES table. Provided since MySQL 8.0. - MySQL server must support the INFORMATION_SCHEMA.USER_ATTRIBUTES table. Provided since MySQL 8.0.
- To delete an existing attribute, set its value to False. - To delete an existing attribute, set its value to False.
type: dict type: dict