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 tls_requires data structure inconsistencies between modules

Browse source
This commit is contained in:
Laurent Indermuehle 2024-04-11 11:17:04 +02:00
parent 502bf58df1
commit 5460dec642
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/module_utils/user.py
View file

@ -102,14 +102,15 @@ def get_tls_requires(cursor, user, host):
if isinstance(res, dict): if isinstance(res, dict):
res = list(res.values()) res = list(res.values())
if not res: # When user don't require SSL, res value is: ('', '', '', '')
if not any(res):
return None return None
if res[0] == 'ANY': if res[0] == 'ANY':
return {'SSL': ''} return 'SSL'
if res[0] == 'X509': if res[0] == 'X509':
return {'X509': ''} return 'X509'
if res[1]: if res[1]:
tls_requires['CIPHER'] = res[1] tls_requires['CIPHER'] = res[1]

3
plugins/modules/mysql_info.py
View file

@ -301,6 +301,7 @@ from ansible_collections.community.mysql.plugins.module_utils.user import (
get_resource_limits, get_resource_limits,
get_existing_authentication, get_existing_authentication,
get_tls_requires, get_tls_requires,
sanitize_requires,
) )
from ansible.module_utils.six import iteritems from ansible.module_utils.six import iteritems
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
@ -612,7 +613,7 @@ class MySQL_Info(object):
'host': host, 'host': host,
'priv': '/'.join(priv_string), 'priv': '/'.join(priv_string),
'resource_limits': copy_ressource_limits, 'resource_limits': copy_ressource_limits,
'tls_requires': tls_requires, 'tls_requires': sanitize_requires(tls_requires),
} }
# Prevent returning a resource limit if empty # Prevent returning a resource limit if empty