From 9b59b9246447041a4046994a69e1168d963bec0c Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 17 Jan 2024 00:22:38 +0100
Subject: [PATCH] :bug: Improve not-found error report on s3 storage backend

---
 backend/src/app/storage/s3.clj        | 23 ++++++++++--------
 common/deps.edn                       |  2 +-
 common/src/app/common/exceptions.cljc | 35 ++++++++++++++++++++++-----
 3 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/backend/src/app/storage/s3.clj b/backend/src/app/storage/s3.clj
index 92d59988b..1bbb38b16 100644
--- a/backend/src/app/storage/s3.clj
+++ b/backend/src/app/storage/s3.clj
@@ -51,6 +51,7 @@
    software.amazon.awssdk.services.s3.model.DeleteObjectsRequest
    software.amazon.awssdk.services.s3.model.DeleteObjectsResponse
    software.amazon.awssdk.services.s3.model.GetObjectRequest
+   software.amazon.awssdk.services.s3.model.NoSuchKeyException
    software.amazon.awssdk.services.s3.model.ObjectIdentifier
    software.amazon.awssdk.services.s3.model.PutObjectRequest
    software.amazon.awssdk.services.s3.model.S3Error
@@ -126,17 +127,19 @@
 (defmethod impl/get-object-data :s3
   [backend object]
   (us/assert! ::backend backend)
-  (letfn [(no-such-key? [cause]
-            (instance? software.amazon.awssdk.services.s3.model.NoSuchKeyException cause))
-          (handle-not-found [cause]
-            (ex/raise :type :not-found
-                      :code :object-not-found
-                      :hint "s3 object not found"
-                      :cause cause))]
 
-    (-> (get-object-data backend object)
-        (p/catch no-such-key? handle-not-found)
-        (p/await!))))
+  (let [result (p/await (get-object-data backend object))]
+    (if (ex/exception? result)
+      (cond
+        (ex/instance? NoSuchKeyException result)
+        (ex/raise :type :not-found
+                  :code :object-not-found
+                  :hint "s3 object not found"
+                  :cause result)
+        :else
+        (throw result))
+
+      result)))
 
 (defmethod impl/get-object-bytes :s3
   [backend object]
diff --git a/common/deps.edn b/common/deps.edn
index f8c649fab..61c52e909 100644
--- a/common/deps.edn
+++ b/common/deps.edn
@@ -32,7 +32,7 @@
 
   funcool/tubax {:mvn/version "2021.05.20-0"}
   funcool/cuerdas {:mvn/version "2023.11.09-407"}
-  funcool/promesa {:git/sha "484b7f5c0d08d817746caa685ed9ac5583eb37fa"
+  funcool/promesa {:git/sha "0c5ed6ad033515a2df4b55addea044f60e9653d0"
                    :git/url "https://github.com/funcool/promesa"}
 
   funcool/datoteka {:mvn/version "3.0.66"
diff --git a/common/src/app/common/exceptions.cljc b/common/src/app/common/exceptions.cljc
index b01914ca5..2070986fe 100644
--- a/common/src/app/common/exceptions.cljc
+++ b/common/src/app/common/exceptions.cljc
@@ -7,10 +7,12 @@
 (ns app.common.exceptions
   "A helpers for work with exceptions."
   #?(:cljs (:require-macros [app.common.exceptions]))
+  (:refer-clojure :exclude [instance?])
   (:require
    #?(:clj [clojure.stacktrace :as strace])
    [app.common.pprint :as pp]
    [app.common.schema :as sm]
+   [clojure.core :as c]
    [clojure.spec.alpha :as s]
    [cuerdas.core :as str]
    [expound.alpha :as expound])
@@ -20,6 +22,9 @@
 
 #?(:clj (set! *warn-on-reflection* true))
 
+(def ^:dynamic *data-length* 8)
+(def ^:dynamic *data-level* 8)
+
 (defmacro error
   [& {:keys [type hint] :as params}]
   `(ex-info ~(or hint (name type))
@@ -49,20 +54,38 @@
 
 (defn ex-info?
   [v]
-  (instance? #?(:clj clojure.lang.IExceptionInfo :cljs cljs.core.ExceptionInfo) v))
+  (c/instance? #?(:clj clojure.lang.IExceptionInfo :cljs cljs.core.ExceptionInfo) v))
 
 (defn error?
   [v]
-  (instance? #?(:clj clojure.lang.IExceptionInfo :cljs cljs.core.ExceptionInfo) v))
+  (c/instance? #?(:clj clojure.lang.IExceptionInfo :cljs cljs.core.ExceptionInfo) v))
 
 (defn exception?
   [v]
-  (instance? #?(:clj java.lang.Throwable :cljs js/Error) v))
+  (c/instance? #?(:clj java.lang.Throwable :cljs js/Error) v))
 
 #?(:clj
    (defn runtime-exception?
      [v]
-     (instance? RuntimeException v)))
+     (c/instance? RuntimeException v)))
+
+#?(:clj
+   (defn instance?
+     [class cause]
+     (loop [cause cause]
+       (if (c/instance? class cause)
+         true
+         (if-let [cause (ex-cause cause)]
+           (recur cause)
+           false)))))
+
+;; NOTE: idea for a macro for error handling
+;; (pu/try-let [cause (p/await (get-object-data backend object))]
+;;   (ex/instance? NoSuchKeyException cause)
+;;   (ex/raise :type :not-found
+;;             :code :object-not-found
+;;             :hint "s3 object not found"
+;;             :cause cause))
 
 (defn explain
   [data & {:as opts}]
@@ -91,8 +114,8 @@
                                data? true
                                explain? true
                                chain? true
-                               data-length 8
-                               data-level 5}}]
+                               data-length *data-length*
+                               data-level *data-level*}}]
 
      (letfn [(print-trace-element [^StackTraceElement e]
                (let [class (.getClassName e)