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

Revert changes that will be in a separate PR

Browse source
This commit is contained in:
Laurent Indermuehle 2024-04-12 15:05:53 +02:00
parent 671e9a4689
commit e98dd124b6
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/fragments/mysql_user_tls_requires.yml
View file

@ -2,6 +2,5 @@
minor_changes: minor_changes:
- mysql_info - Add ``tls_requires`` returned value for the ``users_info`` filter (https://github.com/ansible-collections/community.mysql/pull/628). - mysql_info - Add ``tls_requires`` returned value for the ``users_info`` filter (https://github.com/ansible-collections/community.mysql/pull/628).
bugfixes: bugfixes:
- mysql_info - Fix ``users_info`` filter output variable for hashed password to use ``plugin_hash_string`` instead of ``plugin_auth_string`` (https://github.com/ansible-collections/community.mysql/pull/628).
- mysql_user - Fix idempotence when using variables from the ``users_info`` filter of ``mysql_info`` as an input (https://github.com/ansible-collections/community.mysql/pull/628). - mysql_user - Fix idempotence when using variables from the ``users_info`` filter of ``mysql_info`` as an input (https://github.com/ansible-collections/community.mysql/pull/628).
- mysql_user - Fix ``tls_requires`` not removing ``SSL`` and ``X509`` when sets as empty (https://github.com/ansible-collections/community.mysql/pull/628). - mysql_user - Fix ``tls_requires`` not removing ``SSL`` and ``X509`` when sets as empty (https://github.com/ansible-collections/community.mysql/pull/628).

4
plugins/module_utils/user.py
View file

@ -119,10 +119,10 @@ def get_existing_authentication(cursor, user, host):
rows = list(rows.values()) rows = list(rows.values())
if isinstance(rows[0], tuple): if isinstance(rows[0], tuple):
return {'plugin': rows[0][0], 'plugin_hash_string': rows[0][1]} return {'plugin': rows[0][0], 'plugin_auth_string': rows[0][1]}
if isinstance(rows[0], dict): if isinstance(rows[0], dict):
return {'plugin': rows[0].get('plugin'), 'plugin_hash_string': rows[0].get('auth')} return {'plugin': rows[0].get('plugin'), 'plugin_auth_string': rows[0].get('auth')}
return None return None

2
plugins/modules/mysql_info.py
View file

@ -230,7 +230,7 @@ users_info:
- Does not support proxy privileges. If an account has proxy privileges, they won't appear in the output. - Does not support proxy privileges. If an account has proxy privileges, they won't appear in the output.
- Causes issues with authentications plugins C(sha256_password) and C(caching_sha2_password). - Causes issues with authentications plugins C(sha256_password) and C(caching_sha2_password).
If the output is fed to M(community.mysql.mysql_user), the If the output is fed to M(community.mysql.mysql_user), the
``plugin_hash_string`` will most likely be unreadable due to non-binary ``plugin_auth_string`` will most likely be unreadable due to non-binary
characters. characters.
returned: if not excluded by filter returned: if not excluded by filter
type: dict type: dict