From 20ce789f1ba46c3c1fb89193ed3dd5b7c5c13d04 Mon Sep 17 00:00:00 2001
From: Jorge-Rodriguez <jorge.rodriguez@futurice.com>
Date: Mon, 15 Mar 2021 14:15:43 +0200
Subject: [PATCH] Add changes as per PR review

---
 .../115-add_mysql_full_version_suffix_return_var.yml        | 2 +-
 plugins/modules/mysql_info.py                               | 6 +++---
 tests/integration/targets/test_mysql_info/tasks/main.yml    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml b/changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml
index 87c21f1..3eadb46 100644
--- a/changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml
+++ b/changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml
@@ -1,2 +1,2 @@
 minor_changes:
-- mysql_info - add `full_version` and `suffix` return values (https://github.com/ansible-collections/community.mysql/issues/114).
+- mysql_info - add `version.full` and `version.suffix` return values (https://github.com/ansible-collections/community.mysql/issues/114).
diff --git a/plugins/modules/mysql_info.py b/plugins/modules/mysql_info.py
index 1de6b94..7380b6b 100644
--- a/plugins/modules/mysql_info.py
+++ b/plugins/modules/mysql_info.py
@@ -144,7 +144,7 @@ version:
       returned: if not excluded by filter
       type: str
       sample: "MariaDB"
-    full_version:
+    full:
       description: Full server version.
       returned: if not excluded by filter
       type: str
@@ -368,7 +368,7 @@ class MySQL_Info(object):
             version = self.info['settings']['version'].split('.')
 
             # full_version = "5.5.60-MariaDB"
-            full_version = self.info['settings']['version']
+            full = self.info['settings']['version']
 
             # release = "60"
             release = version[2].split('-')[0]
@@ -387,7 +387,7 @@ class MySQL_Info(object):
                 minor=int(version[1]),
                 release=int(release),
                 suffix=str(suffix),
-                full_version=str(full_version),
+                full=str(full),
             )
 
     def __get_global_status(self):
diff --git a/tests/integration/targets/test_mysql_info/tasks/main.yml b/tests/integration/targets/test_mysql_info/tasks/main.yml
index a17f6eb..785e814 100644
--- a/tests/integration/targets/test_mysql_info/tasks/main.yml
+++ b/tests/integration/targets/test_mysql_info/tasks/main.yml
@@ -48,7 +48,7 @@
     - assert:
         that:
         - result.changed == false
-        - "mysql_version in result.version.full_version"
+        - "mysql_version in result.version.full"
         - result.settings != {}
         - result.global_status != {}
         - result.databases != {}