From 2462d61dc8f1f38f5dfd68820c1d35b46126cf1b Mon Sep 17 00:00:00 2001
From: Laurent Indermuehle <laurent.indermuehle@pm.me>
Date: Tue, 7 Mar 2023 16:22:36 +0100
Subject: [PATCH] Move utility task files in their own folder

---
 .../test_mysql_user/tasks/issue-265.yml       |  8 +++---
 .../test_mysql_user/tasks/issue-29511.yaml    |  2 +-
 .../targets/test_mysql_user/tasks/main.yml    | 18 ++++++------
 .../tasks/test_idempotency.yml                |  4 +--
 .../tasks/test_priv_append.yml                |  2 +-
 .../test_mysql_user/tasks/test_priv_dict.yml  |  2 +-
 .../tasks/test_priv_subtract.yml              |  2 +-
 .../test_mysql_user/tasks/test_privs.yml      |  8 +++---
 .../tasks/test_revoke_only_grant.yml          |  4 +--
 .../tasks/test_tls_requirements.yml           | 14 +++++-----
 .../tasks/test_update_password.yml            |  8 +++---
 .../test_user_grants_with_roles_applied.yml   |  2 +-
 .../tasks/test_user_password.yml              | 18 ++++++------
 .../tasks/test_user_plugin_auth.yml           | 28 +++++++++----------
 .../assert_no_user.yml}                       |  0
 .../assert_user.yml}                          |  0
 .../assert_user_password.yml}                 |  0
 .../create_user.yml}                          |  0
 .../remove_user.yml}                          |  0
 19 files changed, 60 insertions(+), 60 deletions(-)
 rename tests/integration/targets/test_mysql_user/tasks/{utils_assert_no_user.yml => utils/assert_no_user.yml} (100%)
 rename tests/integration/targets/test_mysql_user/tasks/{utils_assert_user.yml => utils/assert_user.yml} (100%)
 rename tests/integration/targets/test_mysql_user/tasks/{utils_assert_user_password.yml => utils/assert_user_password.yml} (100%)
 rename tests/integration/targets/test_mysql_user/tasks/{utils_create_user.yml => utils/create_user.yml} (100%)
 rename tests/integration/targets/test_mysql_user/tasks/{utils_remove_user.yml => utils/remove_user.yml} (100%)

diff --git a/tests/integration/targets/test_mysql_user/tasks/issue-265.yml b/tests/integration/targets/test_mysql_user/tasks/issue-265.yml
index 203e666..bea41a8 100644
--- a/tests/integration/targets/test_mysql_user/tasks/issue-265.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/issue-265.yml
@@ -31,7 +31,7 @@
         that:
           - result is changed
 
-    - include: utils_assert_user.yml user_name={{ user_name_1 }} user_host=localhost
+    - include: utils/assert_user.yml user_name={{ user_name_1 }} user_host=localhost
 
     # Test user removal
     - name: Issue-265 | remove mysql user {{ user_name_1 }}
@@ -86,7 +86,7 @@
         that:
           - result is not changed
 
-    - include: utils_assert_no_user.yml user_name={{user_name_1}}
+    - include: utils/assert_no_user.yml user_name={{user_name_1}}
 
     # Tests with force_context: no
     # Test user creation
@@ -114,7 +114,7 @@
         that:
           - result is changed
 
-    - include: utils_assert_user.yml user_name={{ user_name_1 }} user_host=localhost
+    - include: utils/assert_user.yml user_name={{ user_name_1 }} user_host=localhost
 
     # Test user removal
     - name: Issue-265 | Remove mysql user {{ user_name_1 }}
@@ -168,4 +168,4 @@
         that:
           - result is not changed
 
-    - include: utils_assert_no_user.yml user_name={{ user_name_1 }}
+    - include: utils/assert_no_user.yml user_name={{ user_name_1 }}
diff --git a/tests/integration/targets/test_mysql_user/tasks/issue-29511.yaml b/tests/integration/targets/test_mysql_user/tasks/issue-29511.yaml
index 30da30e..17eb200 100644
--- a/tests/integration/targets/test_mysql_user/tasks/issue-29511.yaml
+++ b/tests/integration/targets/test_mysql_user/tasks/issue-29511.yaml
@@ -79,4 +79,4 @@
         - foo
         - bar
 
-    - include: utils_remove_user.yml user_name="{{ user_name_2 }}"
+    - include: utils/remove_user.yml user_name="{{ user_name_2 }}"
diff --git a/tests/integration/targets/test_mysql_user/tasks/main.yml b/tests/integration/targets/test_mysql_user/tasks/main.yml
index 396528c..188628f 100644
--- a/tests/integration/targets/test_mysql_user/tasks/main.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/main.yml
@@ -54,11 +54,11 @@
         state: present
       register: result
 
-    - include: utils_assert_user.yml user_name={{ user_name_1 }} user_host=localhost priv=USAGE
+    - include: utils/assert_user.yml user_name={{ user_name_1 }} user_host=localhost priv=USAGE
 
-    - include: utils_remove_user.yml user_name={{ user_name_1 }}
+    - include: utils/remove_user.yml user_name={{ user_name_1 }}
 
-    - include: utils_assert_no_user.yml user_name={{ user_name_1 }}
+    - include: utils/assert_no_user.yml user_name={{ user_name_1 }}
 
     # ============================================================
     # Create user with select privileges and verify select privileges are assign
@@ -72,11 +72,11 @@
         priv: '*.*:SELECT'
       register: result
 
-    - include: utils_assert_user.yml user_name={{ user_name_2 }} user_host=localhost priv=SELECT
+    - include: utils/assert_user.yml user_name={{ user_name_2 }} user_host=localhost priv=SELECT
 
-    - include: utils_remove_user.yml user_name={{ user_name_2 }}
+    - include: utils/remove_user.yml user_name={{ user_name_2 }}
 
-    - include: utils_assert_no_user.yml user_name={{ user_name_2 }}
+    - include: utils/assert_no_user.yml user_name={{ user_name_2 }}
 
     # ============================================================
     # Assert user has access to multiple databases
@@ -112,9 +112,9 @@
           - "'{{ item }}' in result.stdout"
       with_items: "{{db_names}}"
 
-    - include: utils_remove_user.yml user_name={{ user_name_1 }}
+    - include: utils/remove_user.yml user_name={{ user_name_1 }}
 
-    - include: utils_remove_user.yml user_name={{ user_name_2 }}
+    - include: utils/remove_user.yml user_name={{ user_name_2 }}
 
     - name: Give user SELECT access to database via wildcard
       mysql_user:
@@ -172,7 +172,7 @@
           - "'%db' in result.stdout"
           - "'INSERT' in result.stdout"
 
-    - include: utils_remove_user.yml user_name={{user_name_1}}
+    - include: utils/remove_user.yml user_name={{user_name_1}}
 
     # ============================================================
     # Test plaintext and encrypted password scenarios.
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_idempotency.yml b/tests/integration/targets/test_mysql_user/tasks/test_idempotency.yml
index f6be534..cc6850c 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_idempotency.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_idempotency.yml
@@ -10,7 +10,7 @@
     # ========================================================================
     # Creation
     # ========================================================================
-    - include: utils_create_user.yml user_name={{ user_name_1 }} user_password={{ user_password_1 }}
+    - include: utils/create_user.yml user_name={{ user_name_1 }} user_password={{ user_password_1 }}
 
     - name: Idempotency | Create user that already exist (expect changed=false)
       mysql_user:
@@ -55,7 +55,7 @@
     # ========================================================================
 
     # Create blank  user to be removed later
-    - include: utils_create_user.yml user_name="" user_password='KJFDY&D*Sfuysf'
+    - include: utils/create_user.yml user_name="" user_password='KJFDY&D*Sfuysf'
 
     - name: Idempotency | Remove blank  user with hosts=all (expect changed)
       mysql_user:
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_priv_append.yml b/tests/integration/targets/test_mysql_user/tasks/test_priv_append.yml
index e6f71b7..51d4a29 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_priv_append.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_priv_append.yml
@@ -131,4 +131,4 @@
         - data1
         - data2
 
-    - include: utils_remove_user.yml user_name={{ user_name_4 }}
+    - include: utils/remove_user.yml user_name={{ user_name_4 }}
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_priv_dict.yml b/tests/integration/targets/test_mysql_user/tasks/test_priv_dict.yml
index 1b5ecc4..82385e1 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_priv_dict.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_priv_dict.yml
@@ -151,4 +151,4 @@
         - data2
         - data3
 
-    - include: utils_remove_user.yml user_name="{{ user_name_3 }}"
+    - include: utils/remove_user.yml user_name="{{ user_name_3 }}"
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_priv_subtract.yml b/tests/integration/targets/test_mysql_user/tasks/test_priv_subtract.yml
index 7081e14..b63f664 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_priv_subtract.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_priv_subtract.yml
@@ -172,4 +172,4 @@
       loop:
         - data1
 
-    - include: utils_remove_user.yml user_name="{{ user_name_4 }}"
+    - include: utils/remove_user.yml user_name="{{ user_name_4 }}"
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_privs.yml b/tests/integration/targets/test_mysql_user/tasks/test_privs.yml
index 1992989..9801e19 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_privs.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_privs.yml
@@ -37,7 +37,7 @@
         state: present
       when: current_append_privs ==  "yes"
 
-    - include: utils_assert_user.yml user_name={{ user_name_2 }} user_host=% priv='SELECT'
+    - include: utils/assert_user.yml user_name={{ user_name_2 }} user_host=% priv='SELECT'
       when: current_append_privs ==  "yes"
 
     - name: Privs | Create user with current privileges (expect changed=true)
@@ -132,7 +132,7 @@
         priv: '*.*:ALL'
         state: present
 
-    # - include: utils_assert_user.yml user_name={{user_name_2}} user_host=% priv='ALL PRIVILEGES'
+    # - include: utils/assert_user.yml user_name={{user_name_2}} user_host=% priv='ALL PRIVILEGES'
 
     - name: Privs | Create database using user {{ user_name_2 }}
       mysql_db:
@@ -188,7 +188,7 @@
         that:
           - result is not changed
 
-    - include: utils_remove_user.yml user_name="{{ user_name_2 }}"
+    - include: utils/remove_user.yml user_name="{{ user_name_2 }}"
 
     # ============================================================
     - name: Privs | Grant all privileges with grant option
@@ -259,4 +259,4 @@
           - result is failed
           - "'Error granting privileges' in result.msg"
 
-    - include: utils_remove_user.yml user_name="{{ user_name_2 }}"
+    - include: utils/remove_user.yml user_name="{{ user_name_2 }}"
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_revoke_only_grant.yml b/tests/integration/targets/test_mysql_user/tasks/test_revoke_only_grant.yml
index 2420989..de0fc62 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_revoke_only_grant.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_revoke_only_grant.yml
@@ -6,7 +6,7 @@
       login_host: '{{ mysql_host }}'
       login_port: '{{ mysql_primary_port }}'
   block:
-    - include: utils_remove_user.yml user_name={{ user_name_1 }}
+    - include: utils/remove_user.yml user_name={{ user_name_1 }}
 
     - name: Revoke only grants | Create user with two grants
       mysql_user:
@@ -47,4 +47,4 @@
           - result is not changed
 
   always:
-    - include: utils_remove_user.yml user_name={{ user_name_1 }}
+    - include: utils/remove_user.yml user_name={{ user_name_1 }}
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_tls_requirements.yml b/tests/integration/targets/test_mysql_user/tasks/test_tls_requirements.yml
index 461982a..f85ae3b 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_tls_requirements.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_tls_requirements.yml
@@ -23,7 +23,7 @@
         that:
           - result is changed
 
-    - include: utils_assert_no_user.yml user_name={{user_name_1}}
+    - include: utils/assert_no_user.yml user_name={{user_name_1}}
 
     - name: Tls reqs | Create user with TLS requirements state=present (expect changed=true)
       mysql_user:
@@ -172,14 +172,14 @@
       assert:
         that: "'REQUIRE ' not in result.stdout or 'REQUIRE NONE' in result.stdout"
 
-    - include: utils_remove_user.yml user_name={{user_name_1}}
+    - include: utils/remove_user.yml user_name={{user_name_1}}
 
-    - include: utils_remove_user.yml user_name={{user_name_2}}
+    - include: utils/remove_user.yml user_name={{user_name_2}}
 
-    - include: utils_remove_user.yml user_name={{user_name_3}}
+    - include: utils/remove_user.yml user_name={{user_name_3}}
 
-    - include: utils_assert_no_user.yml user_name={{user_name_1}}
+    - include: utils/assert_no_user.yml user_name={{user_name_1}}
 
-    - include: utils_assert_no_user.yml user_name={{user_name_2}}
+    - include: utils/assert_no_user.yml user_name={{user_name_2}}
 
-    - include: utils_assert_no_user.yml user_name={{user_name_3}}
+    - include: utils/assert_no_user.yml user_name={{user_name_3}}
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_update_password.yml b/tests/integration/targets/test_mysql_user/tasks/test_update_password.yml
index 29b5363..428c1ef 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_update_password.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_update_password.yml
@@ -16,7 +16,7 @@
 
 
   block:
-    - include_tasks: utils_assert_user_password.yml
+    - include_tasks: utils/assert_user_password.yml
       vars:
         username: "{{ item.username }}"
         host: "%"
@@ -49,7 +49,7 @@
           expect_change: false
 
     # same user, new password
-    - include_tasks: utils_assert_user_password.yml
+    - include_tasks: utils/assert_user_password.yml
       vars:
         username: "{{ item.username }}"
         host: "%"
@@ -73,7 +73,7 @@
           expect_password_hash: "{{ test_password1_hash }}"
 
     # new user, new password
-    - include_tasks: utils_assert_user_password.yml
+    - include_tasks: utils/assert_user_password.yml
       vars:
         username: "{{ item.username }}"
         host: '::1'
@@ -111,7 +111,7 @@
           expect_password_hash: "{{ test_password2_hash }}"
 
     # another new user, another new password and multiple existing users with varying passwords
-    - include_tasks: utils_assert_user_password.yml
+    - include_tasks: utils/assert_user_password.yml
       vars:
         username: "{{ item.username }}"
         host: '2001:db8::1'
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_user_grants_with_roles_applied.yml b/tests/integration/targets/test_mysql_user/tasks/test_user_grants_with_roles_applied.yml
index 8d209f6..c6a1327 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_user_grants_with_roles_applied.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_user_grants_with_roles_applied.yml
@@ -81,7 +81,7 @@
         - data1
         - data2
 
-    - include: utils_remove_user.yml user_name={{ user_name_3 }}
+    - include: utils/remove_user.yml user_name={{ user_name_3 }}
 
     - name: User grants with roles applied | Drop test role
       mysql_role:
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_user_password.yml b/tests/integration/targets/test_mysql_user/tasks/test_user_password.yml
index e1bbfa8..d98c92c 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_user_password.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_user_password.yml
@@ -36,7 +36,7 @@
         that:
           - result is changed
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Password | Get the MySQL version using the newly created used creds
       mysql_info:
@@ -68,7 +68,7 @@
         that:
           - result is not changed
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Password | Update the user password
       mysql_user:
@@ -84,7 +84,7 @@
         that:
           - result is changed
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Password | Get the MySQL version data using the original password (should fail)
       mysql_info:
@@ -117,7 +117,7 @@
           - result is succeeded
 
     # Cleanup
-    - include: utils_remove_user.yml user_name={{ test_user_name }}
+    - include: utils/remove_user.yml user_name={{ test_user_name }}
 
     # ============================================================
     # Test setting a plaintext password and then the same password encrypted to ensure there isn't a change detected.
@@ -137,7 +137,7 @@
         that:
           - result is changed
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=localhost priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=localhost priv={{ test_default_priv_type }}
 
     - name: Password | Pass in the same password as before, but in the encrypted form (no change expected)
       mysql_user:
@@ -155,7 +155,7 @@
           - result is not changed
 
     # Cleanup
-    - include: utils_remove_user.yml user_name={{ test_user_name }}
+    - include: utils/remove_user.yml user_name={{ test_user_name }}
 
     # ============================================================
     # Test setting an encrypted password and then the same password in plaintext to ensure there isn't a change.
@@ -177,7 +177,7 @@
         that:
           - result is changed
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Password | Get the MySQL version data using the new creds
       mysql_info:
@@ -209,7 +209,7 @@
           - result is not changed
 
     # Cleanup
-    - include: utils_remove_user.yml user_name={{ test_user_name }}
+    - include: utils/remove_user.yml user_name={{ test_user_name }}
 
     # ============================================================
     # Test setting an empty password.
@@ -274,4 +274,4 @@
           - result is not changed
 
     # Cleanup
-    - include: utils_remove_user.yml user_name={{ test_user_name }}
+    - include: utils/remove_user.yml user_name={{ test_user_name }}
diff --git a/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml b/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml
index ac8ffb1..8d7740b 100644
--- a/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/test_user_plugin_auth.yml
@@ -47,7 +47,7 @@
           - "'{{ test_plugin_type }}' in show_create_user.stdout"
       when: db_engine == 'mysql' or (db_engine == 'mariadb' and db_version is version('10.3', '>='))
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Plugin auth | Get the MySQL version using the newly created creds
       mysql_info:
@@ -77,7 +77,7 @@
         that:
           - result is changed
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Plugin auth | Getting the MySQL info with the new password should work
       mysql_info:
@@ -94,7 +94,7 @@
           - result is succeeded
 
     # Cleanup
-    - include: utils_remove_user.yml user_name={{ test_user_name }}
+    - include: utils/remove_user.yml user_name={{ test_user_name }}
 
     # ============================================================
     # Test plugin auth initially setting a hash and then switching to a plaintext auth string.
@@ -125,7 +125,7 @@
           - "'{{ test_plugin_type }}' in show_create_user.stdout"
       when: db_engine == 'mysql' or (db_engine == 'mariadb' and db_version is version('10.3', '>='))
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Plugin auth | Get the MySQL version using the newly created creds
       mysql_info:
@@ -157,7 +157,7 @@
           - result is not changed
       when: db_engine == 'mysql' or (db_engine == 'mariadb' and db_version is version('10.3', '>='))
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Plugin auth | Change the user using the same plugin, but switch to the same auth string in plaintext form
       mysql_user:
@@ -189,7 +189,7 @@
           - result is succeeded
 
     # Cleanup
-    - include: utils_remove_user.yml user_name={{ test_user_name }}
+    - include: utils/remove_user.yml user_name={{ test_user_name }}
 
     # ============================================================
     # Test plugin auth initially setting a plaintext auth string and then switching to a hash.
@@ -220,7 +220,7 @@
           - test_plugin_type in show_create_user.stdout
       when: db_engine == 'mysql' or (db_engine == 'mariadb' and db_version is version('10.3', '>='))
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Plugin auth | Get the MySQL version using the newly created creds
       mysql_info:
@@ -252,7 +252,7 @@
         that:
           - result is changed
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Plugin auth | Change the user using the same plugin, but switch to the same auth string in hash form
       mysql_user:
@@ -283,7 +283,7 @@
           - result is succeeded
 
     # Cleanup
-    - include: utils_remove_user.yml user_name={{ test_user_name }}
+    - include: utils/remove_user.yml user_name={{ test_user_name }}
 
     # ============================================================
     # Test plugin auth with an empty auth string.
@@ -313,7 +313,7 @@
           - "'{{ test_plugin_type }}' in show_create_user.stdout"
       when: db_engine == 'mysql' or (db_engine == 'mariadb' and db_version is version('10.3', '>='))
 
-    - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
+    - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=% priv={{ test_default_priv_type }}
 
     - name: Plugin auth | Get the MySQL version using an empty password for the newly created user
       mysql_info:
@@ -360,7 +360,7 @@
           - result is not changed
 
     # Cleanup
-    - include: utils_remove_user.yml user_name={{ test_user_name }}
+    - include: utils/remove_user.yml user_name={{ test_user_name }}
 
     # ============================================================
     # Test plugin auth switching from one type of plugin to another without an auth string or hash. The only other
@@ -400,7 +400,7 @@
               - test_plugin_type in show_create_user.stdout
           when: db_engine == 'mysql' or (db_engine == 'mariadb' and db_version is version('10.3', '>='))
 
-        - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=localhost priv={{ test_default_priv_type }}
+        - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=localhost priv={{ test_default_priv_type }}
 
         - name: Plugin auth | Switch user to sha256_password auth plugin
           mysql_user:
@@ -425,7 +425,7 @@
               - "'sha256_password' in show_create_user.stdout"
           when: db_engine == 'mysql' or (db_engine == 'mariadb' and db_version is version('10.3', '>='))
 
-        - include: utils_assert_user.yml user_name={{ test_user_name }} user_host=localhost priv={{ test_default_priv_type }}
+        - include: utils/assert_user.yml user_name={{ test_user_name }} user_host=localhost priv={{ test_default_priv_type }}
 
         # Cleanup
-        - include: utils_remove_user.yml user_name={{ test_user_name }}
+        - include: utils/remove_user.yml user_name={{ test_user_name }}
diff --git a/tests/integration/targets/test_mysql_user/tasks/utils_assert_no_user.yml b/tests/integration/targets/test_mysql_user/tasks/utils/assert_no_user.yml
similarity index 100%
rename from tests/integration/targets/test_mysql_user/tasks/utils_assert_no_user.yml
rename to tests/integration/targets/test_mysql_user/tasks/utils/assert_no_user.yml
diff --git a/tests/integration/targets/test_mysql_user/tasks/utils_assert_user.yml b/tests/integration/targets/test_mysql_user/tasks/utils/assert_user.yml
similarity index 100%
rename from tests/integration/targets/test_mysql_user/tasks/utils_assert_user.yml
rename to tests/integration/targets/test_mysql_user/tasks/utils/assert_user.yml
diff --git a/tests/integration/targets/test_mysql_user/tasks/utils_assert_user_password.yml b/tests/integration/targets/test_mysql_user/tasks/utils/assert_user_password.yml
similarity index 100%
rename from tests/integration/targets/test_mysql_user/tasks/utils_assert_user_password.yml
rename to tests/integration/targets/test_mysql_user/tasks/utils/assert_user_password.yml
diff --git a/tests/integration/targets/test_mysql_user/tasks/utils_create_user.yml b/tests/integration/targets/test_mysql_user/tasks/utils/create_user.yml
similarity index 100%
rename from tests/integration/targets/test_mysql_user/tasks/utils_create_user.yml
rename to tests/integration/targets/test_mysql_user/tasks/utils/create_user.yml
diff --git a/tests/integration/targets/test_mysql_user/tasks/utils_remove_user.yml b/tests/integration/targets/test_mysql_user/tasks/utils/remove_user.yml
similarity index 100%
rename from tests/integration/targets/test_mysql_user/tasks/utils_remove_user.yml
rename to tests/integration/targets/test_mysql_user/tasks/utils/remove_user.yml