From a69c0e91d6c5158a9d841f76549b87885569fcaa Mon Sep 17 00:00:00 2001
From: Tomas <tomas.palevicius@adform.com>
Date: Tue, 28 Nov 2023 22:54:40 +0200
Subject: [PATCH] docs and sanity and integration test fix

---
 plugins/module_utils/user.py                              | 7 ++++---
 plugins/modules/mysql_user.py                             | 2 +-
 .../integration/targets/setup_controller/tasks/verify.yml | 8 ++++++--
 tests/integration/targets/test_mysql_user/tasks/main.yml  | 8 ++++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py
index 7cf2177..7a3d223 100644
--- a/plugins/module_utils/user.py
+++ b/plugins/module_utils/user.py
@@ -319,7 +319,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
                 # Check if changes needed to be applied.
                 if not ((current_password_policy == -1 and password_expire == "default") or
                         (current_password_policy == 0 and password_expire == "never") or
-                        (current_password_policy == password_expire_interval and password_expire == "interval") or 
+                        (current_password_policy == password_expire_interval and password_expire == "interval") or
                         (password_expire == 'now' and password_expired)):
 
                     update = True
@@ -977,10 +977,10 @@ def set_password_expire(cursor, user, host, password_expire, password_expire_int
     if host:
         params = (user, host)
         query = ["ALTER USER %s@%s"]
-    else: 
+    else:
         params = (user,)
         query = ["ALTER USER %s"]
-        
+
     query.append(statment)
     query = ' '.join(query)
     cursor.execute(query, params)
@@ -1029,6 +1029,7 @@ def is_password_expired(cursor, user, host):
         return True
     return False
 
+
 def get_impl(cursor):
     global impl
     cursor.execute("SELECT VERSION()")
diff --git a/plugins/modules/mysql_user.py b/plugins/modules/mysql_user.py
index 8075fbb..7cc7d5c 100644
--- a/plugins/modules/mysql_user.py
+++ b/plugins/modules/mysql_user.py
@@ -165,7 +165,7 @@ options:
     choices: [ now, never, default, interval ]
   password_expire_interval:
     description:
-      - number of days password will expire. Used with I(password_expire: iterval)
+      - number of days password will expire. Used when I(password_expire=interval).
     type: int
 
   column_case_sensitive:
diff --git a/tests/integration/targets/setup_controller/tasks/verify.yml b/tests/integration/targets/setup_controller/tasks/verify.yml
index 74aa0f2..5140533 100644
--- a/tests/integration/targets/setup_controller/tasks/verify.yml
+++ b/tests/integration/targets/setup_controller/tasks/verify.yml
@@ -16,11 +16,15 @@
           - version
       register: primary_info
 
+    - set_fact:
+        registred_db_version: "'{{ primary_info.version.major }}.{{ primary_info.version.minor }}\
+          .{{ primary_info.version.release }}'"
+        db_version_value: "'{{ db_version }}'"
+
     - name: Assert that test container runs the expected MySQL/MariaDB version
       assert:
         that:
-          - "'{{ primary_info.version.major }}.{{ primary_info.version.minor }}\
-          .{{ primary_info.version.release }}' == '{{ db_version }}'"
+          - registred_db_version == db_version_value
 
     - name: Assert that mysql_info module used the expected version of pymysql
       assert:
diff --git a/tests/integration/targets/test_mysql_user/tasks/main.yml b/tests/integration/targets/test_mysql_user/tasks/main.yml
index f7d70a2..f31e2ae 100644
--- a/tests/integration/targets/test_mysql_user/tasks/main.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/main.yml
@@ -119,8 +119,10 @@
     - name: Assert grant access for user1 on multiple database
       assert:
         that:
-          - "'{{ item }}' in result.stdout"
+          - db_name in result.stdout
       with_items: "{{ db_names }}"
+      vars:
+        db_name: "{{ item }}"
 
     - name: Show grants access for user2 on multiple database
       command: "{{ mysql_command }} -e \"SHOW GRANTS FOR '{{ user_name_2 }}'@'localhost'\""
@@ -129,8 +131,10 @@
     - name: Assert grant access for user2 on multiple database
       assert:
         that:
-          - "'{{ item }}' in result.stdout"
+          - db_name in result.stdout
       with_items: "{{db_names}}"
+      vars:
+        db_name: "{{ item }}"
 
     - include_tasks: utils/remove_user.yml
       vars: