diff --git a/plugins/modules/alert_contact_point.py b/plugins/modules/alert_contact_point.py index 90c0861..0f5c890 100644 --- a/plugins/modules/alert_contact_point.py +++ b/plugins/modules/alert_contact_point.py @@ -123,7 +123,7 @@ output: sample: email ''' -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib try: import requests HAS_REQUESTS = True @@ -213,7 +213,7 @@ def main(): ) if not HAS_REQUESTS: - module.fail_json("Missing package - `request` ") + module.fail_json(msg=missing_required_lib('requests')) is_error, has_changed, result = choice_map.get( module.params['state'])(module) diff --git a/plugins/modules/alert_notification_policy.py b/plugins/modules/alert_notification_policy.py index b02482e..bf1ec78 100644 --- a/plugins/modules/alert_notification_policy.py +++ b/plugins/modules/alert_notification_policy.py @@ -161,7 +161,7 @@ output: ] ''' -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib try: import requests HAS_REQUESTS = True @@ -208,7 +208,7 @@ def main(): module = AnsibleModule(argument_spec=module_args) if not HAS_REQUESTS: - module.fail_json("Missing package - `request` ") + module.fail_json(msg=missing_required_lib('requests')) is_error, has_changed, result = alert_notification_policy(module) diff --git a/plugins/modules/cloud_api_key.py b/plugins/modules/cloud_api_key.py index 67a3864..b7c358e 100644 --- a/plugins/modules/cloud_api_key.py +++ b/plugins/modules/cloud_api_key.py @@ -71,7 +71,7 @@ EXAMPLES = ''' state: absent ''' -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib try: import requests HAS_REQUESTS = True @@ -132,7 +132,7 @@ def main(): ) if not HAS_REQUESTS: - module.fail_json("Missing package - `request` ") + module.fail_json(msg=missing_required_lib('requests')) is_error, has_changed, result = choice_map.get( module.params['state'])(module) diff --git a/plugins/modules/cloud_plugin.py b/plugins/modules/cloud_plugin.py index c3bed0b..7fb9bdc 100644 --- a/plugins/modules/cloud_plugin.py +++ b/plugins/modules/cloud_plugin.py @@ -92,7 +92,7 @@ RETURN = r''' sample: "grafana-github-datasource" ''' -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib try: import requests HAS_REQUESTS = True @@ -156,7 +156,7 @@ def main(): ) if not HAS_REQUESTS: - module.fail_json("Missing package - `request` ") + module.fail_json(msg=missing_required_lib('requests')) is_error, has_changed, result = choice_map.get( module.params['state'])(module) diff --git a/plugins/modules/cloud_stack.py b/plugins/modules/cloud_stack.py index ba94bb5..d95a9df 100644 --- a/plugins/modules/cloud_stack.py +++ b/plugins/modules/cloud_stack.py @@ -125,7 +125,7 @@ RETURN = r''' sample: "https://stackname.grafana.net" ''' -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib try: import requests HAS_REQUESTS = True @@ -199,7 +199,7 @@ def main(): ) if not HAS_REQUESTS: - module.fail_json("Missing package - `request` ") + module.fail_json(msg=missing_required_lib('requests')) is_error, has_changed, result = choice_map.get( module.params['state'])(module) diff --git a/plugins/modules/dashboard.py b/plugins/modules/dashboard.py index b67bc4a..0214dc8 100644 --- a/plugins/modules/dashboard.py +++ b/plugins/modules/dashboard.py @@ -106,7 +106,7 @@ output: sample: "Ansible Integration Test" ''' -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib try: import requests HAS_REQUESTS = True @@ -162,7 +162,7 @@ def main(): ) if not HAS_REQUESTS: - module.fail_json("Missing package - `request` ") + module.fail_json(msg=missing_required_lib('requests')) is_error, has_changed, result = choice_map.get( module.params['state'])(module) diff --git a/plugins/modules/datasource.py b/plugins/modules/datasource.py index dfbfedb..6ae0900 100644 --- a/plugins/modules/datasource.py +++ b/plugins/modules/datasource.py @@ -107,7 +107,7 @@ output: sample: "Datasource added" ''' -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib try: import requests HAS_REQUESTS = True @@ -171,7 +171,7 @@ def main(): ) if not HAS_REQUESTS: - module.fail_json("Missing package - `request` ") + module.fail_json(msg=missing_required_lib('requests')) is_error, has_changed, result = choice_map.get( module.params['state'])(module) diff --git a/plugins/modules/folder.py b/plugins/modules/folder.py index 71086e2..41c9c5a 100644 --- a/plugins/modules/folder.py +++ b/plugins/modules/folder.py @@ -154,7 +154,7 @@ output: sample: "Folder foldername deleted" ''' -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib try: import requests HAS_REQUESTS = True @@ -226,7 +226,7 @@ def main(): ) if not HAS_REQUESTS: - module.fail_json("Missing package - `request` ") + module.fail_json(msg=missing_required_lib('requests')) is_error, has_changed, result = choice_map.get( module.params['state'])(module)