ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-08 03:30:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix according to PR review

Browse source
This commit is contained in:
Jorge-Rodriguez 2021-03-30 11:54:50 +03:00
parent b17b394fe7
commit b01a740b76
No known key found for this signature in database
GPG key ID: 43153D1EFD8F7D90
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
plugins/modules/mysql_user.py
View file

@ -968,18 +968,18 @@ def convert_priv_dict_to_str(priv):
def handle_requiressl_in_priv_string(module, priv, tls_requires): def handle_requiressl_in_priv_string(module, priv, tls_requires):
if "REQUIRESSL" in priv: module.deprecate('The "REQUIRESSL" privilege is deprecated, use the "tls_requires" option instead.',
module.deprecate('The "REQUIRESSL" privilege is deprecated, use the "tls_requires" option instead.', version='3.0.0', collection_name='community.mysql') version='3.0.0', collection_name='community.mysql')
priv_groups = re.search(r"(.*?)(\*\.\*:)([^/]*)(.*)", priv) priv_groups = re.search(r"(.*?)(\*\.\*:)([^/]*)(.*)", priv)
if priv_groups.group(3) == "REQUIRESSL": if priv_groups.group(3) == "REQUIRESSL":
priv = priv_groups.group(1) + priv_groups.group(4) or None priv = priv_groups.group(1) + priv_groups.group(4) or None
else: else:
inner_priv_groups = re.search(r"(.*?),?REQUIRESSL,?(.*)", priv_groups.group(3)) inner_priv_groups = re.search(r"(.*?),?REQUIRESSL,?(.*)", priv_groups.group(3))
priv = priv_groups.group(1) + priv_groups.group(2) + ','.join((inner_priv_groups.group(1), inner_priv_groups.group(3))) + priv_groups.group(4) priv = priv_groups.group(1) + priv_groups.group(2) + ','.join((inner_priv_groups.group(1), inner_priv_groups.group(3))) + priv_groups.group(4)
if not tls_requires: if not tls_requires:
tls_requires = {"SSL": None} tls_requires = {"SSL": None}
else: else:
module.warn('Ignoring "REQUIRESSL" privilege as "tls_requires" is defined and it takes precedence.') module.warn('Ignoring "REQUIRESSL" privilege as "tls_requires" is defined and it takes precedence.')
return priv, tls_requires return priv, tls_requires
@ -1175,6 +1175,9 @@ def main():
if priv and isinstance(priv, dict): if priv and isinstance(priv, dict):
priv = convert_priv_dict_to_str(priv) priv = convert_priv_dict_to_str(priv)
if "REQUIRESSL" in priv:
priv, tls_requires = handle_requiressl_in_priv_string(module, priv, tls_requires)
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)