From bc92ded7914a29fe6b38d3a3ee18d3e169e43e5c Mon Sep 17 00:00:00 2001
From: Laurent Indermuehle <laurent.indermuehle@pm.me>
Date: Thu, 5 Jan 2023 19:05:58 +0100
Subject: [PATCH] Refactor test to use the db_version from setup_controller

---
 .../tasks/test_tls_requirements.yml           | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

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 a1644a0..461982a 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
@@ -8,20 +8,6 @@
 
   block:
 
-    # ============================================================
-    - name: Tls reqs | find out the database version
-      mysql_info:
-        <<: *mysql_params
-        filter: version
-      register: db_version
-
-    - name: Tls reqs | Drop mysql user {{ item }} if exists
-      mysql_user:
-        <<: *mysql_params
-        name: '{{ item }}'
-        state: absent
-      with_items: ['{{ user_name_1 }}', '{{ user_name_2 }}', '{{ user_name_3 }}']
-
     - name: Tls reqs | Create user with TLS requirements in check mode (expect changed=true)
       mysql_user:
         <<: *mysql_params
@@ -64,7 +50,9 @@
         set_fact:
           separator: '\n'
       # Semantically: when mysql version <= 5.6 or MariaDB version <= 10.1
-      when: db_version.version.major <= 5 and db_version.version.minor <= 6 or db_version.version.major == 10 and db_version.version.minor < 2
+      when:
+        - (db_engine == 'mysql' and db_version is version('5.6', '<='))
+          or (db_engine == 'mariadb' and db_version is version('10.1', '<='))
 
     - block:
       - name: Tls reqs | Retrieve TLS requirements for users in new database version
@@ -76,7 +64,9 @@
         set_fact:
           separator: 'PASSWORD'
       # Semantically: when mysql version >= 5.7 or MariaDB version >= 10.2
-      when: db_version.version.major == 5 and db_version.version.minor >= 7 or db_version.version.major > 5 and db_version.version.major < 10  or db_version.version.major == 10 and db_version.version.minor >= 2
+      when:
+        - (db_engine == 'mysql' and db_version is version('5.7', '>='))
+          or (db_engine == 'mariadb' and db_version is version('10.2', '>='))
 
     - block:
       - name: Tls reqs | Assert user1 TLS requirements
@@ -122,12 +112,16 @@
     - name: Tls reqs | Retrieve TLS requirements for users in old database version
       command: "{{ mysql_command }} -L -N -s -e \"SHOW GRANTS for '{{ user_name_1 }}'@'localhost'\""
       register: old_result
-      when: db_version.version.major <= 5 and db_version.version.minor <= 6 or db_version.version.major == 10 and db_version.version.minor < 2
+      when:
+        - (db_engine == 'mysql' and db_version is version('5.6', '<='))
+          or (db_engine == 'mariadb' and db_version is version('10.2', '<'))
 
     - name: Tls reqs | Retrieve TLS requirements for users in new database version
       command: "{{ mysql_command }} -L -N -s -e \"SHOW CREATE USER '{{ user_name_1 }}'@'localhost'\""
       register: new_result
-      when: db_version.version.major == 5 and db_version.version.minor >= 7 or db_version.version.major > 5 and db_version.version.major < 10  or db_version.version.major == 10 and db_version.version.minor >= 2
+      when:
+        - (db_engine == 'mysql' and db_version is version('5.7', '>='))
+          or (db_engine == 'mariadb' and db_version is version('10.2', '>='))
 
     - name: Tls reqs | Assert user1 TLS requirements was not changed
       assert:
@@ -146,12 +140,16 @@
     - name: Tls reqs | Retrieve TLS requirements for users in old database version
       command: "{{ mysql_command }} -L -N -s -e \"SHOW GRANTS for '{{ user_name_1 }}'@'localhost'\""
       register: old_result
-      when: db_version.version.major <= 5 and db_version.version.minor <= 6 or db_version.version.major == 10 and db_version.version.minor < 2
+      when:
+        - (db_engine == 'mysql' and db_version is version('5.6', '<='))
+          or (db_engine == 'mariadb' and db_version is version('10.2', '<'))
 
     - name: Tls reqs | Retrieve TLS requirements for users in new database version
       command: "{{ mysql_command }} -L -N -s -e \"SHOW CREATE USER '{{ user_name_1 }}'@'localhost'\""
       register: new_result
-      when: db_version.version.major == 5 and db_version.version.minor >= 7 or db_version.version.major > 5 and db_version.version.major < 10  or db_version.version.major == 10 and db_version.version.minor >= 2
+      when:
+        - (db_engine == 'mysql' and db_version is version('5.7', '>='))
+          or (db_engine == 'mariadb' and db_version is version('10.2', '>='))
 
     - name: Tls reqs | Assert user1 TLS requirements
       assert: