From 14a4a2db38d735c46ae428a7f7d1d5b9a3be20fe Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aaklychkov@mail.ru>
Date: Wed, 16 Dec 2020 09:13:12 +0300
Subject: [PATCH] Change suggested

---
 .github/workflows/ansible-test-plugins.yml    |  1 +
 plugins/modules/mysql_replication.py          | 35 +++----------------
 .../tasks/mysql_replication_initial.yml       |  4 ---
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml
index d8df768..cd27b10 100644
--- a/.github/workflows/ansible-test-plugins.yml
+++ b/.github/workflows/ansible-test-plugins.yml
@@ -111,6 +111,7 @@ jobs:
       fail-fast: true
       matrix:
         ansible:
+          - stable-2.9
           - stable-2.10
           - devel
 
diff --git a/plugins/modules/mysql_replication.py b/plugins/modules/mysql_replication.py
index 20ffd6f..322a6a8 100644
--- a/plugins/modules/mysql_replication.py
+++ b/plugins/modules/mysql_replication.py
@@ -242,6 +242,7 @@ import warnings
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.mysql.plugins.module_utils.mysql import mysql_connect, mysql_driver, mysql_driver_fail_msg, mysql_common_argument_spec
 from ansible.module_utils._text import to_native
+from distutils.version import LooseVersion
 
 executed_queries = []
 
@@ -256,40 +257,12 @@ def uses_replica_terminology(cursor):
     else:
         version_str = result[0]
 
-    version = version_str.split('.')
-
-    ver_major = int(version[0])
-    ver_minor = int(version[1])
-    if '-' in version[2]:
-        ver_patch = int(version[2].split('-')[0])
-    else:
-        ver_patch = int(version[2])
+    version = LooseVersion(version_str)
 
     if 'mariadb' in version_str.lower():
-        # Since MariaDB 10.5.1
-        if ver_major > 10:
-            return True
-
-        elif ver_major == 10 and ver_minor > 5:
-            return True
-
-        elif ver_major == 10 and ver_minor == 5 and ver_patch >= 1:
-            return True
-
-        return False
-
+        return version >= LooseVersion('10.5.1')
     else:
-        # Since MySQL 8.0.22
-        if ver_major > 8:
-            return True
-
-        elif ver_major == 8 and ver_minor > 0:
-            return True
-
-        elif ver_major == 8 and ver_minor == 0 and ver_patch >= 22:
-            return True
-
-        return False
+        return version >= LooseVersion('8.0.22')
 
 
 def get_master_status(cursor):
diff --git a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml
index ee27103..e26dcd2 100644
--- a/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml
+++ b/tests/integration/targets/test_mysql_replication/tasks/mysql_replication_initial.yml
@@ -25,10 +25,6 @@
       when:
       - db.version.major > 8 or (db.version.major == 8 and db.version.minor > 0) or (db.version.major == 8 and db.version.minor == 0 and db.version.release >= 22)
 
-    - name: Debug mysql8022_and_higher
-      debug:
-        msg: "{{ mysql8022_and_higher }} , {{ db.version }}"
-
     - name: alias mysql command to include default options
       set_fact:
         mysql_command: "mysql -u{{ mysql_user }} -p{{ mysql_password }} --protocol=tcp"