From dd5daa3a6f03892b4aec3541cb87a3a8e7c3cb0b Mon Sep 17 00:00:00 2001 From: Andrew Klychkov Date: Tue, 18 Jun 2024 14:57:46 +0200 Subject: [PATCH] Incorporate feedback --- plugins/modules/mysql_info.py | 4 ++-- tests/integration/targets/test_mysql_info/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/modules/mysql_info.py b/plugins/modules/mysql_info.py index 82f84d9..6103589 100644 --- a/plugins/modules/mysql_info.py +++ b/plugins/modules/mysql_info.py @@ -166,7 +166,7 @@ server_engine: description: Database server engine. returned: if not excluded by filter type: str - sample: 'mariadb' + sample: 'MariaDB' version_added: '3.10.0' version: description: Database server version. @@ -771,7 +771,7 @@ def main(): mysql = MySQL_Info(module, cursor, server_implementation, user_implementation) module.exit_json(changed=False, - server_engine=server_implementation, + server_engine='MariaDB' if server_implementation == 'mariadb' else 'MySQL', connector_name=connector_name, connector_version=connector_version, **mysql.get_info(filter_, exclude_fields, return_empty_dbs)) diff --git a/tests/integration/targets/test_mysql_info/tasks/main.yml b/tests/integration/targets/test_mysql_info/tasks/main.yml index e589e1a..93570f2 100644 --- a/tests/integration/targets/test_mysql_info/tasks/main.yml +++ b/tests/integration/targets/test_mysql_info/tasks/main.yml @@ -56,7 +56,7 @@ - result.databases != {} - result.engines != {} - result.users != {} - - result.server_engine == 'mysql' or result.server_engine == 'mariadb' + - result.server_engine == 'MariaDB' or result.server_engine == 'MySQL' - name: mysql_info - Test connector informations display ansible.builtin.import_tasks: