Small improvements

Checkmk · Nov 15, 2023 · b03b4ce · b03b4ce
1 parent 00307d1
commit b03b4ce
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/plugins/lookup/folder.py b/plugins/lookup/folder.py
@@ -96,7 +96,7 @@ def run(self, terms, variables, **kwargs):
             if "code" in response:
                 raise AnsibleError(
                     "Received error for %s - %s: %s"
-                    % (response["url"], response["code"], response["msg"])
+                    % (response.get("url", ""), response.get("code", ""), response.get("msg", ""))
                 )
             ret.append(response.get("extensions"))
 

diff --git a/plugins/lookup/folders.py b/plugins/lookup/folders.py
@@ -138,7 +138,7 @@ def run(self, terms, variables, **kwargs):
             if "code" in response:
                 raise AnsibleError(
                     "Received error for %s - %s: %s"
-                    % (response["url"], response["code"], response["msg"])
+                    % (response.get("url", ""), response.get("code", ""), response.get("msg", ""))
                 )
             ret.append(response.get("value"))
 

diff --git a/plugins/lookup/host.py b/plugins/lookup/host.py
@@ -108,7 +108,7 @@ def run(self, terms, variables, **kwargs):
             if "code" in response:
                 raise AnsibleError(
                     "Received error for %s - %s: %s"
-                    % (response["url"], response["code"], response["msg"])
+                    % (response.get("url", ""), response.get("code", ""), response.get("msg", ""))
                 )
             ret.append(response.get("extensions"))
 

diff --git a/plugins/lookup/hosts.py b/plugins/lookup/hosts.py
@@ -103,7 +103,7 @@ def run(self, terms, variables, **kwargs):
         if "code" in response:
             raise AnsibleError(
                 "Received error for %s - %s: %s"
-                % (response["url"], response["code"], response["msg"])
+                % (response.get("url", ""), response.get("code", ""), response.get("msg", ""))
             )
         ret.append(response.get("value"))
 

diff --git a/plugins/lookup/version.py b/plugins/lookup/version.py
@@ -86,7 +86,7 @@ def run(self, terms, variables, **kwargs):
             if "code" in response:
                 raise AnsibleError(
                     "Received error for %s - %s: %s"
-                    % (response["url"], response["code"], response["msg"])
+                    % (response.get("url", ""), response.get("code", ""), response.get("msg", ""))
                 )
             ret.append(response.get("versions", {}).get("checkmk"))
         return ret
diff --git a/plugins/module_utils/lookup_api.py b/plugins/module_utils/lookup_api.py
@@ -44,23 +44,19 @@ def get(self, endpoint="", parameters=None):
         if parameters:
             url = "%s?%s" % (url, urlencode(parameters))
 
-        response = ""
-
         try:
             raw_response = open_url(
                 url, headers=self.headers, validate_certs=self.validate_certs
             )
-            response = to_text(raw_response.read())
+            return to_text(raw_response.read())
         except HTTPError as e:
             if e.code in HTTP_ERROR_CODES:
-                response = json.dumps(
+                return json.dumps(
                     {"code": e.code, "msg": HTTP_ERROR_CODES[e.code], "url": url}
                 )
             else:
-                response = json.dumps({"code": e.code, "msg": e.reason, "url": url})
+                return json.dumps({"code": e.code, "msg": e.reason, "url": url})
         except URLError as e:
-            response = json.dumps({"code": 0, "msg": str(e), "url": url})
+            return json.dumps({"code": 0, "msg": str(e), "url": url})
         except Exception as e:
-            response = json.dumps({"code": 0, "msg": str(e), "url": url})
-
-        return response
+            return json.dumps({"code": 0, "msg": str(e), "url": url})