mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-08-22 22:11:44 -07:00
start getting modules to use shared import error code (#51787)
This commit is contained in:
parent
0924a8cf67
commit
0f0d33a954
46 changed files with 230 additions and 108 deletions
|
@ -72,13 +72,16 @@ old_value:
|
|||
|
||||
import traceback
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
|
||||
from ansible.module_utils._text import to_native
|
||||
|
||||
|
||||
try:
|
||||
import etcd3
|
||||
etcd_found = True
|
||||
HAS_ETCD = True
|
||||
except ImportError:
|
||||
etcd_found = False
|
||||
ETCD_IMP_ERR = traceback.format_exc()
|
||||
HAS_ETCD = False
|
||||
|
||||
|
||||
def run_module():
|
||||
|
@ -112,8 +115,8 @@ def run_module():
|
|||
|
||||
result['key'] = module.params.get('key')
|
||||
|
||||
if not etcd_found:
|
||||
module.fail_json(msg="the python etcd3 module is required")
|
||||
if not HAS_ETCD:
|
||||
module.fail_json(msg=missing_required_lib('etcd3'), exception=ETCD_IMP_ERR)
|
||||
|
||||
allowed_keys = ['host', 'port', 'ca_cert', 'cert_key', 'cert_cert',
|
||||
'timeout', 'user', 'password']
|
||||
|
|
|
@ -153,14 +153,17 @@ api_response:
|
|||
|
||||
import base64
|
||||
import json
|
||||
import traceback
|
||||
|
||||
YAML_IMP_ERR = None
|
||||
try:
|
||||
import yaml
|
||||
HAS_LIB_YAML = True
|
||||
except ImportError:
|
||||
YAML_IMP_ERR = traceback.format_exc()
|
||||
HAS_LIB_YAML = False
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
|
||||
from ansible.module_utils.urls import fetch_url
|
||||
|
||||
|
||||
|
@ -353,7 +356,7 @@ def main():
|
|||
)
|
||||
|
||||
if not HAS_LIB_YAML:
|
||||
module.fail_json(msg="missing python library: yaml")
|
||||
module.fail_json(msg=missing_required_lib('PyYAML'), exception=YAML_IMP_ERR)
|
||||
|
||||
decode_cert_data(module)
|
||||
|
||||
|
|
|
@ -95,15 +95,18 @@ EXAMPLES = """
|
|||
"""
|
||||
|
||||
import time
|
||||
import traceback
|
||||
|
||||
KAZOO_IMP_ERR = None
|
||||
try:
|
||||
from kazoo.client import KazooClient
|
||||
from kazoo.handlers.threading import KazooTimeoutError
|
||||
KAZOO_INSTALLED = True
|
||||
except ImportError:
|
||||
KAZOO_IMP_ERR = traceback.format_exc()
|
||||
KAZOO_INSTALLED = False
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
|
||||
from ansible.module_utils._text import to_bytes
|
||||
|
||||
|
||||
|
@ -122,7 +125,7 @@ def main():
|
|||
)
|
||||
|
||||
if not KAZOO_INSTALLED:
|
||||
module.fail_json(msg='kazoo >= 2.1 is required to use this module. Use pip to install it.')
|
||||
module.fail_json(msg=missing_required_lib('kazoo >= 2.1'), exception=KAZOO_IMP_ERR)
|
||||
|
||||
check = check_params(module.params)
|
||||
if not check['success']:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue