ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-08-03 12:44:25 -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
commit 7012a277de
3 changed files with 9 additions and 5 deletions
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):
# we cannot create users without a proper hostname
if host_all:
return {'changed': False, 'password_changed': False}
return {'changed': False, 'password_changed': False, 'attributes': {}}
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 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)
if len(grant_privs) > 0:
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_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
cursor.execute("SELECT attribute FROM INFORMATION_SCHEMA.USER_ATTRIBUTES LIMIT 0")
cursor.fetchone()
except mysql_driver.OperationalError:
except mysql_driver.Error:
return False
return True
def attributes_get(cursor, user, host):
"""Get attributes for a given user.
@ -999,6 +1002,7 @@ def attributes_get(cursor, user, host):
return None
def get_impl(cursor):
global impl
cursor.execute("SELECT VERSION()")