Don't return 502 on non 200 gateway response (#6)

* Don't return 502 on non 200 gateway response * Review feedback
SURFnet · Sep 13, 2024 · 4a9b1ac · 4a9b1ac
1 parent cc3e729
commit 4a9b1ac
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/deps.edn b/deps.edn
@@ -1,5 +1,6 @@
 {:paths   ["src" "test" "resources" "classes"]
- :deps    {ch.qos.logback.contrib/logback-json-classic {:mvn/version "0.1.5"}
+ :deps    {ch.qos.logback.contrib/logback-jackson      {:mvn/version "0.1.5"}
+           ch.qos.logback.contrib/logback-json-classic {:mvn/version "0.1.5"}
            ch.qos.logback/logback-classic              {:mvn/version "1.5.8"}
            cheshire/cheshire                           {:mvn/version "5.13.0"}
            com.fasterxml.jackson.core/jackson-databind {:mvn/version "2.17.2"}

diff --git a/src/nl/surf/eduhub/validator/service/main.clj b/src/nl/surf/eduhub/validator/service/main.clj
@@ -37,12 +37,14 @@
                              {:headers {"x-route" (str "endpoint=" endpoint-id)
                                         "accept" "application/json; version=5"
                                         "x-envelope-response" "false"}
-                              :basic-auth (:gateway-basic-auth config)})]
+                              :basic-auth (:gateway-basic-auth config)
+                              :throws false})]
       (if (= (:status response) 200)
         {:valid true}
         {:valid false :message (str "Endpoint validation failed with status: " (:status response))}))
     (catch Throwable e
-      {:valid false :message (str "Error during validation: " (.getMessage e))})))
+      (log/error e "Exception in validate-endpoint")
+      {:valid false :error true :message (str "Error during validation " (class e) ":" (ex-message e))})))
 
 (defroutes app-routes
   (GET "/endpoints/:endpoint-id/config" [endpoint-id]
@@ -53,11 +55,11 @@
   (fn [req]
     (let [{:keys [validator endpoint-id] :as resp} (app req)]
       (if validator
-        (let [{:keys [valid] :as body} (validate-endpoint endpoint-id config)]
+        (let [{:keys [error] :as body} (validate-endpoint endpoint-id config)]
           {:body body
-           :status (if valid
-                     http-status/ok
-                     http-status/bad-gateway)})
+           :status (if error
+                     http-status/internal-server-error
+                     http-status/ok)})
         resp))))
 
 (def opt-specs

diff --git a/test/nl/surf/eduhub/validator/service/main_test.clj b/test/nl/surf/eduhub/validator/service/main_test.clj
@@ -31,6 +31,6 @@
 
 (deftest test-validate-fails
   (with-redefs [http/request (fn [_] {:status 401 :body "mocked response"})]
-    (is (= {:status 502
+    (is (= {:status 200
             :body {:message "Endpoint validation failed with status: 401", :valid false}}
            (app {:uri "/endpoints/google.com/config" :request-method :get})))))