laurent review

plugins/module_utils/user.py

@@ -190,8 +190,6 @@ def user_add(cursor, user, host, host_all, password, encrypted,
         elif salt:
             if plugin in ['caching_sha2_password', 'sha256_password']:
                 generated_hash_string = mysql_sha256_password_hash_hex(password=plugin_auth_string, salt=salt)
-            else:
-                module.fail_json(msg="salt not handled for %s authentication plugin" % plugin)
             query_with_args = ("CREATE USER %s@%s IDENTIFIED WITH %s AS 0x" + generated_hash_string), (user, host, plugin)
         else:
             query_with_args = "CREATE USER %s@%s IDENTIFIED WITH %s BY %s", (user, host, plugin, plugin_auth_string)
@@ -358,8 +356,6 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
                 if plugin in ['caching_sha2_password', 'sha256_password']:
                     if current_plugin[1] != mysql_sha256_password_hash(password=plugin_auth_string, salt=salt):
                         update = True
-                else:
-                    module.fail_json(msg="salt not handled for %s authentication plugin" % plugin)
             elif plugin_auth_string and current_plugin[1] != plugin_auth_string:
                 # this case can cause more updates than expected,
                 # as plugin can hash auth_string in any way it wants
@@ -377,8 +373,6 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
                     elif salt:
                         if plugin in ['caching_sha2_password', 'sha256_password']:
                             generated_hash_string = mysql_sha256_password_hash_hex(password=plugin_auth_string, salt=salt)
-                        else:
-                            module.fail_json(msg="salt not handled for %s authentication plugin" % plugin)
                         query_with_args = ("ALTER USER %s@%s IDENTIFIED WITH %s AS 0x" + generated_hash_string), (user, host, plugin)
                     else:
                         query_with_args = "ALTER USER %s@%s IDENTIFIED WITH %s BY %s", (user, host, plugin, plugin_auth_string)

tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml

@@ -489,21 +489,9 @@
         plugin_auth_string: '{{ test_plugin_auth_string }}'
         salt: '{{ test_salt }}'
         priv: '{{ test_default_priv }}'
-      register: result
-
-    - name: Plugin auth | Assert that plugin_auth_string and salt was successful
-      ansible.builtin.assert:
-        that:
-          - result is succeeded
 
     - name: Plugin auth | Connect with user and password
       ansible.builtin.command: "{{ mysql_command }} -u {{ test_user_name }} -p{{ test_plugin_auth_string }} -e \"SELECT 1\""
-      register: result
-
-    - name: Plugin auth | Assert that connection was successful
-      ansible.builtin.assert:
-        that:
-          - result is succeeded
 
     - name: Plugin auth | Alter user with same plugin auth and same salt
       community.mysql.mysql_user:
@@ -515,11 +503,7 @@
         salt: '{{ test_salt }}'
         priv: '{{ test_default_priv }}'
       register: result
-
-    - name: Plugin auth | Assert that plugin_auth_string and salt doesn't trigger change
-      ansible.builtin.assert:
-        that:
-          - result is not changed
+      failed_when: result is not changed
 
     - name: cleanup user
       ansible.builtin.include_tasks: utils/remove_user.yml