From b195e71e7cdfd04bf177d34817b15c2cc14af925 Mon Sep 17 00:00:00 2001
From: "R. Sicart" <roger.sicart@gmail.com>
Date: Thu, 8 Sep 2022 10:35:37 +0200
Subject: [PATCH] Replace privileges_equal() by a comparison

---
 plugins/module_utils/user.py                  | 18 ++---------
 .../plugins/module_utils/test_mysql_user.py   | 30 -------------------
 2 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py
index 3e56992..2a96ac5 100644
--- a/plugins/module_utils/user.py
+++ b/plugins/module_utils/user.py
@@ -387,10 +387,8 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
                         privileges_grant(cursor, user, host, db_table, grant_privs, tls_requires, maria_role)
 
             # after privilege manipulation, compare privileges from before and now
-            changed = changed or not privileges_equal(
-                curr_priv,
-                privileges_get(cursor, user, host, maria_role)
-            )
+            after_priv = privileges_get(cursor, user, host, maria_role)
+            changed = changed or not (curr_priv == after_priv)
 
         if role:
             continue
@@ -885,15 +883,3 @@ def get_impl(cursor):
     else:
         from ansible_collections.community.mysql.plugins.module_utils.implementations.mysql import user as mysqluser
         impl = mysqluser
-
-
-def privileges_equal(before_privs, after_privs):
-    """Compare 2 priv dicts
-
-    Args:
-        before_privs (dict): contains privileges, built with privileges_get()
-        after_privs (dict): contains privileges, built with privileges_get()
-
-    Returns: True, if equal, False otherwise.
-    """
-    return before_privs == after_privs
diff --git a/tests/unit/plugins/module_utils/test_mysql_user.py b/tests/unit/plugins/module_utils/test_mysql_user.py
index 34d6741..fdbfa34 100644
--- a/tests/unit/plugins/module_utils/test_mysql_user.py
+++ b/tests/unit/plugins/module_utils/test_mysql_user.py
@@ -98,33 +98,3 @@ def test_handle_grant_on_col(privileges, start, end, output):
 def test_normalize_col_grants(input_, expected):
     """Tests normalize_col_grants function."""
     assert normalize_col_grants(input_) == expected
-
-
-@pytest.mark.parametrize(
-    'before_privileges,after_privileges,output',
-    [
-        (
-            {'*.*': ['INSERT', 'UPDATE', 'GRANT'], '`mysql`.*': ['SELECT']},
-            {'*.*': ['INSERT', 'UPDATE', 'GRANT'], '`mysql`.*': ['SELECT']},
-            True
-        ),
-        (
-            {'`mysql`.*': ['SELECT'], '`sys`.*': ['SELECT']},
-            {'`mysql`.*': ['SELECT'], '`sys`.*': ['SELECT']},
-            True
-        ),
-        (
-            {'`sys`.*': ['SELECT'], '`mysql`.*': ['SELECT']},
-            {'`mysql`.*': ['SELECT'], '`sys`.*': ['SELECT']},
-            True
-        ),
-        (
-            {'`mysql`.*': ['UPDATE'], '`sys`.*': ['SELECT']},
-            {'`mysql`.*': ['SELECT'], '`sys`.*': ['SELECT']},
-            False
-        ),
-    ]
-)
-def test_privileges_equal(before_privileges, after_privileges, output):
-    """Tests privileges_equal function."""
-    assert privileges_equal(before_privileges, after_privileges) == output