From d38caa264f290ff46a30c8affe674572d80d0938 Mon Sep 17 00:00:00 2001 From: Laurent Indermuehle Date: Mon, 9 Oct 2023 17:36:04 +0200 Subject: [PATCH] change struct to be able to call a specific sub-list --- plugins/module_utils/user.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py index ac6dfd3..4777b16 100644 --- a/plugins/module_utils/user.py +++ b/plugins/module_utils/user.py @@ -486,16 +486,16 @@ def privileges_get(module, cursor, user, host, maria_role=False): else: return x - mysql8_all_privileges = [ - sorted([ + mysql8_all_privileges = { + 'all_privs_base': [ 'SELECT', 'INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'RELOAD', 'SHUTDOWN', 'PROCESS', 'FILE', 'REFERENCES', 'INDEX', 'ALTER', 'SHOW DATABASES', 'SUPER', 'CREATE TEMPORARY TABLES', 'LOCK TABLES', 'EXECUTE', 'REPLICATION SLAVE', 'REPLICATION CLIENT', 'CREATE VIEW', 'SHOW VIEW', 'CREATE ROUTINE', 'ALTER ROUTINE', 'CREATE USER', 'EVENT', 'TRIGGER', - 'CREATE TABLESPACE', 'CREATE ROLE', 'DROP ROLE'] - ), sorted([ + 'CREATE TABLESPACE', 'CREATE ROLE', 'DROP ROLE'], + 'all_privs_extended': [ 'APPLICATION_PASSWORD_ADMIN', 'AUDIT_ABORT_EXEMPT', 'AUDIT_ADMIN', 'AUTHENTICATION_POLICY_ADMIN', 'BACKUP_ADMIN', 'BINLOG_ADMIN', 'BINLOG_ENCRYPTION_ADMIN', 'CLONE_ADMIN', 'CONNECTION_ADMIN', @@ -510,8 +510,7 @@ def privileges_get(module, cursor, user, host, maria_role=False): 'SESSION_VARIABLES_ADMIN', 'SET_USER_ID', 'SHOW_ROUTINE', 'SYSTEM_USER', 'SYSTEM_VARIABLES_ADMIN', 'TABLE_ENCRYPTION_ADMIN', 'XA_RECOVER_ADMIN'] - ) - ] + } for grant in grants: if isinstance(grant, dict): @@ -546,7 +545,7 @@ def privileges_get(module, cursor, user, host, maria_role=False): db = res.group(2) - if sorted(privileges) in mysql8_all_privileges: + if sorted(privileges) in sorted(mysql8_all_privileges.values()): privileges = ['ALL'] if not maria_role: