From 4da87fb3ee0400f69b33e1a3fa8c38d96858e57d Mon Sep 17 00:00:00 2001 From: Tristan Sweeney <41489600+Tristan-Sweeney-CambridgeConsultants@users.noreply.github.com> Date: Wed, 11 Dec 2019 04:34:42 -0500 Subject: [PATCH] Fixed misleading helm module import failure message (#44916) --- lib/ansible/modules/cloud/misc/helm.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/ansible/modules/cloud/misc/helm.py b/lib/ansible/modules/cloud/misc/helm.py index a5dac5f1f2e..15891f7b92f 100644 --- a/lib/ansible/modules/cloud/misc/helm.py +++ b/lib/ansible/modules/cloud/misc/helm.py @@ -104,15 +104,16 @@ EXAMPLES = ''' namespace: default ''' +import traceback +HELM_IMPORT_ERR = None try: import grpc from pyhelm import tiller from pyhelm import chartbuilder - HAS_PYHELM = True -except ImportError as exc: - HAS_PYHELM = False +except ImportError: + HELM_IMPORT_ERR = traceback.format_exc() -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib def install(module, tserver): @@ -182,9 +183,8 @@ def main(): ), supports_check_mode=True) - if not HAS_PYHELM: - module.fail_json(msg="Could not import the pyhelm python module. " - "Please install `pyhelm` package.") + if HELM_IMPORT_ERR: + module.fail_json(msg=missing_required_lib('pyhelm'), exception=HELM_IMPORT_ERR) host = module.params['host'] port = module.params['port']