From 83bb4bf22118289ad7ce619aafd79f184bba8832 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 19 Dec 2025 09:14:56 +0100 Subject: [PATCH] :bug: Prefill storage object bucket if it comes nil on import binfile --- backend/src/app/binfile/v3.clj | 7 ++++--- backend/src/app/storage.clj | 3 +++ backend/src/app/storage/gc_touched.clj | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/src/app/binfile/v3.clj b/backend/src/app/binfile/v3.clj index e044ef2e8b..bd6c041b0a 100644 --- a/backend/src/app/binfile/v3.clj +++ b/backend/src/app/binfile/v3.clj @@ -821,9 +821,10 @@ entries (keep (match-storage-entry-fn) entries)] (doseq [{:keys [id entry]} entries] - (let [object (->> (read-entry input entry) - (decode-storage-object) - (validate-storage-object)) + (let [object (-> (read-entry input entry) + (decode-storage-object) + (update :bucket d/nilv sto/default-bucket) + (validate-storage-object)) ext (cmedia/mtype->extension (:content-type object)) path (str "objects/" id ext) diff --git a/backend/src/app/storage.clj b/backend/src/app/storage.clj index 0d7bac7eca..0fe48c2911 100644 --- a/backend/src/app/storage.clj +++ b/backend/src/app/storage.clj @@ -35,6 +35,9 @@ :assets-s3 :s3 nil))) +(def default-bucket + "file-media-object") + (def valid-buckets #{"file-media-object" "team-font-variant" diff --git a/backend/src/app/storage/gc_touched.clj b/backend/src/app/storage/gc_touched.clj index 964765589b..fa3e144ef9 100644 --- a/backend/src/app/storage/gc_touched.clj +++ b/backend/src/app/storage/gc_touched.clj @@ -25,7 +25,7 @@ [app.common.time :as ct] [app.config :as cf] [app.db :as db] - [app.storage :as-alias sto] + [app.storage :as sto] [app.storage.impl :as impl] [integrant.core :as ig])) @@ -130,7 +130,7 @@ [{:keys [metadata]}] (or (some-> metadata :bucket) (some-> metadata :reference d/name) - "file-media-object")) + sto/default-bucket)) (defn- process-objects! [conn has-refs? bucket objects]