From 7fdbd386703e99c437525e7ebe807dd3339d3a3c Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aaklychkov@mail.ru>
Date: Tue, 23 Jan 2024 11:04:37 +0100
Subject: [PATCH] Fix sanity issues

---
 plugins/modules/mysql_db.py        | 4 ++--
 plugins/modules/mysql_info.py      | 4 ++--
 plugins/modules/mysql_query.py     | 3 ++-
 plugins/modules/mysql_variables.py | 2 +-
 tests/sanity/ignore-2.16.txt       | 4 ----
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/plugins/modules/mysql_db.py b/plugins/modules/mysql_db.py
index a425361..2cb67dc 100644
--- a/plugins/modules/mysql_db.py
+++ b/plugins/modules/mysql_db.py
@@ -577,14 +577,14 @@ def db_create(cursor, db, encoding, collation):
 def main():
     argument_spec = mysql_common_argument_spec()
     argument_spec.update(
-        name=dict(type='list', required=True, aliases=['db']),
+        name=dict(type='list', elements='str', required=True, aliases=['db']),
         encoding=dict(type='str', default=''),
         collation=dict(type='str', default=''),
         target=dict(type='path'),
         state=dict(type='str', default='present', choices=['absent', 'dump', 'import', 'present']),
         single_transaction=dict(type='bool', default=False),
         quick=dict(type='bool', default=True),
-        ignore_tables=dict(type='list', default=[]),
+        ignore_tables=dict(type='list', elements='str', default=[]),
         hex_blob=dict(default=False, type='bool'),
         force=dict(type='bool', default=False),
         master_data=dict(type='int', default=0, choices=[0, 1, 2]),
diff --git a/plugins/modules/mysql_info.py b/plugins/modules/mysql_info.py
index 303921b..0be25fa 100644
--- a/plugins/modules/mysql_info.py
+++ b/plugins/modules/mysql_info.py
@@ -698,8 +698,8 @@ def main():
     argument_spec = mysql_common_argument_spec()
     argument_spec.update(
         login_db=dict(type='str'),
-        filter=dict(type='list'),
-        exclude_fields=dict(type='list'),
+        filter=dict(type='list', elements='str'),
+        exclude_fields=dict(type='list', elements='str'),
         return_empty_dbs=dict(type='bool', default=False),
     )
 
diff --git a/plugins/modules/mysql_query.py b/plugins/modules/mysql_query.py
index 9123d60..fd3a8e0 100644
--- a/plugins/modules/mysql_query.py
+++ b/plugins/modules/mysql_query.py
@@ -36,6 +36,7 @@ options:
     - List of values to be passed as positional arguments to the query.
     - Mutually exclusive with I(named_args).
     type: list
+    elements: raw
   named_args:
     description:
     - Dictionary of key-value arguments to pass to the query.
@@ -141,7 +142,7 @@ def main():
     argument_spec.update(
         query=dict(type='raw', required=True),
         login_db=dict(type='str'),
-        positional_args=dict(type='list'),
+        positional_args=dict(type='list', elements='raw'),
         named_args=dict(type='dict'),
         single_transaction=dict(type='bool', default=False),
     )
diff --git a/plugins/modules/mysql_variables.py b/plugins/modules/mysql_variables.py
index 395a24c..dfe8466 100644
--- a/plugins/modules/mysql_variables.py
+++ b/plugins/modules/mysql_variables.py
@@ -176,7 +176,7 @@ def setvariable(cursor, mysqlvar, value, mode='global'):
 def main():
     argument_spec = mysql_common_argument_spec()
     argument_spec.update(
-        variable=dict(type='str'),
+        variable=dict(type='str', required=True),
         value=dict(type='str'),
         mode=dict(type='str', choices=['global', 'persist', 'persist_only'], default='global'),
     )
diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt
index da0354c..b28ed63 100644
--- a/tests/sanity/ignore-2.16.txt
+++ b/tests/sanity/ignore-2.16.txt
@@ -1,10 +1,6 @@
 plugins/modules/mysql_db.py validate-modules:doc-elements-mismatch
-plugins/modules/mysql_db.py validate-modules:parameter-list-no-elements
 plugins/modules/mysql_db.py validate-modules:use-run-command-not-popen
 plugins/modules/mysql_info.py validate-modules:doc-elements-mismatch
-plugins/modules/mysql_info.py validate-modules:parameter-list-no-elements
-plugins/modules/mysql_query.py validate-modules:parameter-list-no-elements
 plugins/modules/mysql_user.py validate-modules:undocumented-parameter
-plugins/modules/mysql_variables.py validate-modules:doc-required-mismatch
 plugins/module_utils/mysql.py pylint:unused-import
 plugins/module_utils/version.py pylint:unused-import