Fixed mysql_user idempotency for long privilege lists. (Fixes ansible/#68044) (#58)

changelogs/fragments/mysql_user_idempotency.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - "mysql_user - Fix idempotence when long grant lists are used (https://github.com/ansible/ansible/issues/68044)"

plugins/modules/database/mysql/mysql_user.py

@@ -562,13 +562,13 @@ def privileges_get(cursor, user, host):
         if res is None:
             raise InvalidPrivsError('unable to parse the MySQL grant string: %s' % grant[0])
         privileges = res.group(1).split(",")
-        privileges = [pick(x) for x in privileges]
+        privileges = [pick(x.strip()) for x in privileges]
         if "WITH GRANT OPTION" in res.group(7):
             privileges.append('GRANT')
         if "REQUIRE SSL" in res.group(7):
             privileges.append('REQUIRESSL')
         db = res.group(2)
-        output[db] = privileges
+        output.setdefault(db, []).extend(privileges)
     return output
 
 

tests/integration/targets/mysql_user/tasks/test_privs.yml

@@ -122,6 +122,31 @@
     login_user: '{{ user_name_2 }}'
     login_password: '{{ user_password_2 }}'
 
+# ============================================================
+- name: update user with a long privileges list (mysql has a special multiline grant output)
+  mysql_user:
+    name: '{{ user_name_2 }}'
+    password: '{{ user_password_2 }}'
+    priv: '*.*:CREATE USER,FILE,PROCESS,RELOAD,REPLICATION CLIENT,REPLICATION SLAVE,SHOW DATABASES,SHUTDOWN,SUPER,CREATE,DROP,EVENT,LOCK TABLES,INSERT,UPDATE,DELETE,SELECT,SHOW VIEW,GRANT'
+    state: present
+    login_unix_socket: '{{ mysql_socket }}'
+  register: result
+
+- name: Assert that priv changed
+  assert: { that: "result.changed == true" }
+
+- name: Test idempotency (expect ok)
+  mysql_user:
+    name: '{{ user_name_2 }}'
+    password: '{{ user_password_2 }}'
+    priv: '*.*:CREATE USER,FILE,PROCESS,RELOAD,REPLICATION CLIENT,REPLICATION SLAVE,SHOW DATABASES,SHUTDOWN,SUPER,CREATE,DROP,EVENT,LOCK TABLES,INSERT,UPDATE,DELETE,SELECT,SHOW VIEW,GRANT'
+    state: present
+    login_unix_socket: '{{ mysql_socket }}'
+  register: result
+
+- name: Assert that priv did not change
+  assert: { that: "result.changed == false" }
+
 - name: remove username
   mysql_user:
     name: '{{ user_name_2 }}'