From 69c8322d506a3c11b726d283f10f93856cd80c1f Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Tue, 9 May 2023 13:21:00 -0700
Subject: [PATCH] Better error handling in nomad variable bootstrap

---
 nomad_vars.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nomad_vars.py b/nomad_vars.py
index 2454a20..52abbda 100755
--- a/nomad_vars.py
+++ b/nomad_vars.py
@@ -10,7 +10,7 @@ NOMAD_ADDR = getenv("NOMAD_ADDR", "http://127.0.0.1:4646")
 NOMAD_TOKEN = getenv("NOMAD_TOKEN")
 
 
-def nomad_req(method: str, path: str, json: dict|None = None) -> dict:
+def nomad_req(method: str, path: str, json: dict|None = None) -> requests.Response:
     headers = {}
     if NOMAD_TOKEN:
         headers["X-Nomad-Token"] = NOMAD_TOKEN
@@ -25,11 +25,11 @@ def nomad_req(method: str, path: str, json: dict|None = None) -> dict:
     print(result.text)
     result.raise_for_status()
 
-    return result.json()
+    return result
 
 
 
-def write_var(path: str, items: dict[str, str | float | int]) -> dict:
+def write_var(path: str, items: dict[str, str | float | int]) -> requests.Response:
     return nomad_req("PUT", f"var/{path}",
         json={
             "Path": path,
@@ -38,7 +38,7 @@ def write_var(path: str, items: dict[str, str | float | int]) -> dict:
     )
 
 
-def delete_var(path: str) -> dict:
+def delete_var(path: str) -> requests.Response:
     return nomad_req("DELETE", f"var/{path}")
 
 
@@ -80,7 +80,12 @@ def write_nomad():
                 response = delete_var(path)
             else:
                 response = write_var(path, items)
-            print(response)
+
+            try:
+                response.raise_for_status()
+            except:
+                print(response.text)
+                raise
 
 
 def main():