ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-24 19:31:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add connector information to the returned values

Browse source 
I need to know what python library was used. I had a container with
both mysqlclient and pymysql installed and tests used a different
connector that what is advertised by the title of integration tests.
We need to prevent that otherwise our tests are worth nothing.
This commit is contained in:
Laurent Indermuehle 2023-01-19 16:36:06 +01:00
parent 454778406d
commit b24249d39a
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/module_utils/mysql.py
View file

@ -34,6 +34,11 @@ mysql_driver_fail_msg = ('A MySQL module is required: for Python 2.7 either PyMy
'Consider setting ansible_python_interpreter to use ' 'Consider setting ansible_python_interpreter to use '
'the intended Python version.') 'the intended Python version.')
mysql_driver_info = {
"name": mysql_driver.__name__,
"version": mysql_driver.__version__
}
def parse_from_mysql_config_file(cnf): def parse_from_mysql_config_file(cnf):
# Default values of comment_prefix is '#' and ';'. # Default values of comment_prefix is '#' and ';'.

17
plugins/modules/mysql_info.py
View file

@ -206,6 +206,12 @@ slave_hosts:
type: dict type: dict
sample: sample:
- { "2": { "Host": "", "Master_id": 1, "Port": 3306 } } - { "2": { "Host": "", "Master_id": 1, "Port": 3306 } }
connector:
description: The python connector used by the plugins
returned: always
type: dict
sample:
- { "connector: { "name": "pymysql", "version": "1.0.2" } }
''' '''
from decimal import Decimal from decimal import Decimal
@ -216,6 +222,7 @@ from ansible_collections.community.mysql.plugins.module_utils.mysql import (
mysql_common_argument_spec, mysql_common_argument_spec,
mysql_driver, mysql_driver,
mysql_driver_fail_msg, mysql_driver_fail_msg,
mysql_driver_info,
) )
from ansible.module_utils.six import iteritems from ansible.module_utils.six import iteritems
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
@ -564,15 +571,19 @@ def main():
check_hostname=check_hostname, check_hostname=check_hostname,
connect_timeout=connect_timeout, cursor_class='DictCursor') connect_timeout=connect_timeout, cursor_class='DictCursor')
except Exception as e: except Exception as e:
module.fail_json(msg="unable to connect to database, check login_user and login_password are correct or %s has the credentials. " module.fail_json(msg=f"unable to connect to database using \
"Exception message: %s" % (config_file, to_native(e))) {mysql_driver_info.name} {mysql_driver_info.version}, \
check login_user and login_password are correct or {config_file} has \
the credentials. Exception message: {to_native(e)}%s")
############################### ###############################
# Create object and do main job # Create object and do main job
mysql = MySQL_Info(module, cursor) mysql = MySQL_Info(module, cursor)
module.exit_json(changed=False, **mysql.get_info(filter_, exclude_fields, return_empty_dbs)) module.exit_json(changed=False,
**mysql.get_info(filter_, exclude_fields, return_empty_dbs),
connector=mysql_driver_info)
if __name__ == '__main__': if __name__ == '__main__':