mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
77e25a7503
* fix invalid fail_json call
Currently causes this error:
```
TypeError: AnsibleModule.fail_json() missing 1 required positional argument: 'msg'
gitlab | FAILED! => {
"ansible_facts": {
"discovered_interpreter_python": "/usr/bin/python3.10"
},
"changed": false,
"module_stderr": "Shared connection to 10.0.3.100 closed.\r\n",
"module_stdout": "Traceback (most recent call last):\r\n File \"/root/.ansible/tmp/ansible-tmp-1653579059.8318024-147674-84188943153768/AnsiballZ_redis.py\", line 107, in <module>\r\n _ansiballz_main()\r\n File \"/root/.ansible/tmp/ansible-tmp-1653579059.8318024-147674-84188943153768/AnsiballZ_redis.py\", line 99, in _ansiballz_main\r\n invoke_module(zipped_mod, temp_path, ANSIBALLZ_PARAMS)\r\n File \"/root/.ansible/tmp/ansible-tmp-1653579059.8318024-147674-84188943153768/AnsiballZ_redis.py\", line 47, in invoke_module\r\n runpy.run_module(mod_name='ansible_collections.community.general.plugins.modules.redis', init_globals=dict(_module_fqn='ansible_collections.community.general.plugins.modules.redis', _modlib_path=modlib_path),\r\n File \"/usr/lib/python3.10/runpy.py\", line 209, in run_module\r\n return _run_module_code(code, init_globals, run_name, mod_spec)\r\n File \"/usr/lib/python3.10/runpy.py\", line 96, in _run_module_code\r\n _run_code(code, mod_globals, init_globals,\r\n File \"/usr/lib/python3.10/runpy.py\", line 86, in _run_code\r\n exec(code, run_globals)\r\n File \"/tmp/ansible_community.general.redis_payload_di15cy0s/ansible_community.general.redis_payload.zip/ansible_collections/community/general/plugins/modules/redis.py\", line 328, in <module>\r\n File \"/tmp/ansible_community.general.redis_payload_di15cy0s/ansible_community.general.redis_payload.zip/ansible_collections/community/general/plugins/modules/redis.py\", line 195, in main\r\n File \"/tmp/ansible_community.general.redis_payload_di15cy0s/ansible_community.general.redis_payload.zip/ansible_collections/community/general/plugins/module_utils/redis.py\", line 40, in fail_imports\r\nTypeError: AnsibleModule.fail_json() missing 1 required positional argument: 'msg'\r\n",
"msg": "MODULE FAILURE\nSee stdout/stderr for the exact error",
"rc": 1
}
```
* Add changelog.
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit e55875107b)
Co-authored-by: Brian Coca <bcoca@users.noreply.github.com>
97 lines
3 KiB
Python
97 lines
3 KiB
Python
# -*- coding: utf-8 -*-
|
|
#
|
|
# Copyright: (c) 2021, Andreas Botzner <andreas at botzner dot com>
|
|
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
|
|
|
from __future__ import absolute_import, division, print_function
|
|
|
|
from ansible.module_utils.basic import missing_required_lib
|
|
__metaclass__ = type
|
|
|
|
import traceback
|
|
|
|
REDIS_IMP_ERR = None
|
|
try:
|
|
from redis import Redis
|
|
from redis import __version__ as redis_version
|
|
HAS_REDIS_PACKAGE = True
|
|
except ImportError:
|
|
REDIS_IMP_ERR = traceback.format_exc()
|
|
HAS_REDIS_PACKAGE = False
|
|
|
|
try:
|
|
import certifi
|
|
HAS_CERTIFI_PACKAGE = True
|
|
except ImportError:
|
|
CERTIFI_IMPORT_ERROR = traceback.format_exc()
|
|
HAS_CERTIFI_PACKAGE = False
|
|
|
|
|
|
def fail_imports(module, needs_certifi=True):
|
|
errors = []
|
|
traceback = []
|
|
if not HAS_REDIS_PACKAGE:
|
|
errors.append(missing_required_lib('redis'))
|
|
traceback.append(REDIS_IMP_ERR)
|
|
if not HAS_CERTIFI_PACKAGE and needs_certifi:
|
|
errors.append(missing_required_lib('certifi'))
|
|
traceback.append(CERTIFI_IMPORT_ERROR)
|
|
if errors:
|
|
module.fail_json(msg='\n'.join(errors), traceback='\n'.join(traceback))
|
|
|
|
|
|
def redis_auth_argument_spec(tls_default=True):
|
|
return dict(
|
|
login_host=dict(type='str',
|
|
default='localhost',),
|
|
login_user=dict(type='str'),
|
|
login_password=dict(type='str',
|
|
no_log=True
|
|
),
|
|
login_port=dict(type='int', default=6379),
|
|
tls=dict(type='bool',
|
|
default=tls_default),
|
|
validate_certs=dict(type='bool',
|
|
default=True
|
|
),
|
|
ca_certs=dict(type='str')
|
|
)
|
|
|
|
|
|
def redis_auth_params(module):
|
|
login_host = module.params['login_host']
|
|
login_user = module.params['login_user']
|
|
login_password = module.params['login_password']
|
|
login_port = module.params['login_port']
|
|
tls = module.params['tls']
|
|
validate_certs = 'required' if module.params['validate_certs'] else None
|
|
ca_certs = module.params['ca_certs']
|
|
if tls and ca_certs is None:
|
|
ca_certs = str(certifi.where())
|
|
if tuple(map(int, redis_version.split('.'))) < (3, 4, 0) and login_user is not None:
|
|
module.fail_json(
|
|
msg='The option `username` in only supported with redis >= 3.4.0.')
|
|
params = {'host': login_host,
|
|
'port': login_port,
|
|
'password': login_password,
|
|
'ssl_ca_certs': ca_certs,
|
|
'ssl_cert_reqs': validate_certs,
|
|
'ssl': tls}
|
|
if login_user is not None:
|
|
params['username'] = login_user
|
|
return params
|
|
|
|
|
|
class RedisAnsible(object):
|
|
'''Base class for Redis module'''
|
|
|
|
def __init__(self, module):
|
|
self.module = module
|
|
self.connection = self._connect()
|
|
|
|
def _connect(self):
|
|
try:
|
|
return Redis(**redis_auth_params(self.module))
|
|
except Exception as e:
|
|
self.module.fail_json(msg='{0}'.format(str(e)))
|
|
return None
|