From fad6bc7564952f541058ea585cfdeb4792a99cca Mon Sep 17 00:00:00 2001
From: Luca Keidel <info@lucakeidel.de>
Date: Wed, 8 Oct 2025 10:29:18 +0200
Subject: [PATCH] mysql_info: Add support for source terminology for
 slave_status filter (#747)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* mysql_info: Add support for source terminology for slave_status filter

* Update changelogs/fragments/mysql_info_fix_slave_status_for_source_terminology.yaml

---------

Co-authored-by: Luca Keidel <luca.keidel@check24.de>
Co-authored-by: Laurent Indermühle <laurent.indermuehle@pm.me>
---
 ...x_slave_status_for_source_terminology.yaml |  2 ++
 plugins/modules/mysql_info.py                 |  8 +++---
 .../targets/test_mysql_info/defaults/main.yml |  1 +
 .../test_mysql_info/tasks/issue-682.yml       | 28 +++++++++++++++++++
 .../targets/test_mysql_info/tasks/main.yml    |  2 ++
 5 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/fragments/mysql_info_fix_slave_status_for_source_terminology.yaml
 create mode 100644 tests/integration/targets/test_mysql_info/tasks/issue-682.yml

diff --git a/changelogs/fragments/mysql_info_fix_slave_status_for_source_terminology.yaml b/changelogs/fragments/mysql_info_fix_slave_status_for_source_terminology.yaml
new file mode 100644
index 0000000..1ec300b
--- /dev/null
+++ b/changelogs/fragments/mysql_info_fix_slave_status_for_source_terminology.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+  - mysql_info - Fix slave status for source terminology introduced in MySQL 8.0.23 (https://github.com/ansible-collections/community.mysql/issues/682).
diff --git a/plugins/modules/mysql_info.py b/plugins/modules/mysql_info.py
index 56d8071..1d11729 100644
--- a/plugins/modules/mysql_info.py
+++ b/plugins/modules/mysql_info.py
@@ -531,20 +531,20 @@ class MySQL_Info(object):
         res = self.__exec_sql(query)
         if res:
             for line in res:
-                host = line['Master_Host']
+                host = line.get('Master_Host') or line.get('Source_Host')
                 if host not in self.info['slave_status']:
                     self.info['slave_status'][host] = {}
 
-                port = line['Master_Port']
+                port = line.get('Master_Port') or line.get('Source_Port')
                 if port not in self.info['slave_status'][host]:
                     self.info['slave_status'][host][port] = {}
 
-                user = line['Master_User']
+                user = line.get('Master_User') or line.get('Source_User')
                 if user not in self.info['slave_status'][host][port]:
                     self.info['slave_status'][host][port][user] = {}
 
                 for vname, val in line.items():
-                    if vname not in ('Master_Host', 'Master_Port', 'Master_User'):
+                    if vname not in ('Master_Host', 'Master_Port', 'Master_User', 'Source_Host', 'Source_Port', 'Source_User'):
                         self.info['slave_status'][host][port][user][vname] = self.__convert(val)
 
     def __get_slaves(self):
diff --git a/tests/integration/targets/test_mysql_info/defaults/main.yml b/tests/integration/targets/test_mysql_info/defaults/main.yml
index e1cd880..b7c4117 100644
--- a/tests/integration/targets/test_mysql_info/defaults/main.yml
+++ b/tests/integration/targets/test_mysql_info/defaults/main.yml
@@ -4,6 +4,7 @@ mysql_user: root
 mysql_password: msandbox
 mysql_host: '{{ gateway_addr }}'
 mysql_primary_port: 3307
+mysql_replica1_port: 3308
 
 db_name: data
 
diff --git a/tests/integration/targets/test_mysql_info/tasks/issue-682.yml b/tests/integration/targets/test_mysql_info/tasks/issue-682.yml
new file mode 100644
index 0000000..313610d
--- /dev/null
+++ b/tests/integration/targets/test_mysql_info/tasks/issue-682.yml
@@ -0,0 +1,28 @@
+---
+
+- vars:
+    mysql_parameters: &mysql_params
+      login_user: '{{ mysql_user }}'
+      login_password: '{{ mysql_password }}'
+      login_host: '{{ mysql_host }}'
+      login_port: '{{ mysql_replica1_port }}'
+
+  block:
+
+    - name: Skip non-affected versions
+      meta: end_play
+      when:
+        - db_engine != 'mysql' or db_version is version('8.0.23', '<')
+
+    - name: Test mysql_info with slave_status filter on replica database
+      mysql_info:
+        <<: *mysql_params
+        filter: slave_status
+      register: slave_status_result
+      ignore_errors: yes
+
+    - name: Assert that mysql_info with slave_status returns data
+      assert:
+        that:
+          - slave_status_result is not failed
+        fail_msg: "mysql_info with slave_status filter crashed: {{ slave_status_result.msg | default('Unknown error') }}"
diff --git a/tests/integration/targets/test_mysql_info/tasks/main.yml b/tests/integration/targets/test_mysql_info/tasks/main.yml
index 61f238f..79483c4 100644
--- a/tests/integration/targets/test_mysql_info/tasks/main.yml
+++ b/tests/integration/targets/test_mysql_info/tasks/main.yml
@@ -141,3 +141,5 @@
     - name: Import tasks file to tests users_info filter
       ansible.builtin.import_tasks:
         file: filter_users_info.yml
+
+    - include_tasks: issue-682.yml