diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py index 9d40129..7a54a65 100644 --- a/plugins/module_utils/user.py +++ b/plugins/module_utils/user.py @@ -486,31 +486,32 @@ def privileges_get(module, cursor, user, host, maria_role=False): else: return x - mysql8_all_privileges = [sorted([ - '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([ - 'APPLICATION_PASSWORD_ADMIN', 'AUDIT_ABORT_EXEMPT', 'AUDIT_ADMIN', - 'AUTHENTICATION_POLICY_ADMIN', 'BACKUP_ADMIN', 'BINLOG_ADMIN', - 'BINLOG_ENCRYPTION_ADMIN', 'CLONE_ADMIN', 'CONNECTION_ADMIN', - 'ENCRYPTION_KEY_ADMIN', 'FIREWALL_EXEMPT', 'FLUSH_OPTIMIZER_COSTS', - 'FLUSH_STATUS', 'FLUSH_TABLES', 'FLUSH_USER_RESOURCES', - 'GROUP_REPLICATION_ADMIN', 'GROUP_REPLICATION_STREAM', - 'INNODB_REDO_LOG_ARCHIVE', 'INNODB_REDO_LOG_ENABLE', - 'PASSWORDLESS_USER_ADMIN', 'PERSIST_RO_VARIABLES_ADMIN', - 'REPLICATION_APPLIER', 'REPLICATION_SLAVE_ADMIN', - 'RESOURCE_GROUP_ADMIN', 'RESOURCE_GROUP_USER', 'ROLE_ADMIN', - 'SENSITIVE_VARIABLES_OBSERVER', 'SERVICE_CONNECTION_ADMIN', - 'SESSION_VARIABLES_ADMIN', 'SET_USER_ID', 'SHOW_ROUTINE', - 'SYSTEM_USER', 'SYSTEM_VARIABLES_ADMIN', 'TABLE_ENCRYPTION_ADMIN', - 'XA_RECOVER_ADMIN' - ])] - + mysql8_all_privileges = [ + sorted([ + '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([ + 'APPLICATION_PASSWORD_ADMIN', 'AUDIT_ABORT_EXEMPT', 'AUDIT_ADMIN', + 'AUTHENTICATION_POLICY_ADMIN', 'BACKUP_ADMIN', 'BINLOG_ADMIN', + 'BINLOG_ENCRYPTION_ADMIN', 'CLONE_ADMIN', 'CONNECTION_ADMIN', + 'ENCRYPTION_KEY_ADMIN', 'FIREWALL_EXEMPT', 'FLUSH_OPTIMIZER_COSTS', + 'FLUSH_STATUS', 'FLUSH_TABLES', 'FLUSH_USER_RESOURCES', + 'GROUP_REPLICATION_ADMIN', 'GROUP_REPLICATION_STREAM', + 'INNODB_REDO_LOG_ARCHIVE', 'INNODB_REDO_LOG_ENABLE', + 'PASSWORDLESS_USER_ADMIN', 'PERSIST_RO_VARIABLES_ADMIN', + 'REPLICATION_APPLIER', 'REPLICATION_SLAVE_ADMIN', + 'RESOURCE_GROUP_ADMIN', 'RESOURCE_GROUP_USER', 'ROLE_ADMIN', + 'SENSITIVE_VARIABLES_OBSERVER', 'SERVICE_CONNECTION_ADMIN', + '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): diff --git a/tests/integration/targets/test_mysql_info/tasks/main.yml b/tests/integration/targets/test_mysql_info/tasks/main.yml index 6357c42..10e1917 100644 --- a/tests/integration/targets/test_mysql_info/tasks/main.yml +++ b/tests/integration/targets/test_mysql_info/tasks/main.yml @@ -220,6 +220,6 @@ that: - result.databases.allviews.size == 0 - - name: Inport tasks file to tests users_privs filter + - name: Import tasks file to tests users_privs filter ansible.builtin.import_tasks: file: filter_users_privs.yml diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt index da0354c..5565108 100644 --- a/tests/sanity/ignore-2.15.txt +++ b/tests/sanity/ignore-2.15.txt @@ -6,5 +6,4 @@ plugins/modules/mysql_info.py validate-modules:parameter-list-no-elements plugins/modules/mysql_query.py validate-modules:parameter-list-no-elements plugins/modules/mysql_user.py validate-modules:undocumented-parameter plugins/modules/mysql_variables.py validate-modules:doc-required-mismatch -plugins/module_utils/mysql.py pylint:unused-import plugins/module_utils/version.py pylint:unused-import