Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-10 14:51:37 -05:00
Code Issues Activity

🐛 Fix corner case on selection storage backend from settings

Browse source 
Related to how backward compatibility is handled with previous
settings.
This commit is contained in:
Andrey Antukh 2024-10-25 16:08:11 +02:00
parent cb9839223e
commit 5b860ee601
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
backend/src/app/storage.clj
View file

@ -10,6 +10,7 @@
(:require (:require
[app.common.data :as d] [app.common.data :as d]
[app.common.data.macros :as dm] [app.common.data.macros :as dm]
[app.common.logging :as l]
[app.common.spec :as us] [app.common.spec :as us]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.config :as cf] [app.config :as cf]
@ -19,6 +20,7 @@
[app.storage.s3 :as ss3] [app.storage.s3 :as ss3]
[app.util.time :as dt] [app.util.time :as dt]
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
[cuerdas.core :as str]
[datoteka.fs :as fs] [datoteka.fs :as fs]
[integrant.core :as ig]) [integrant.core :as ig])
(:import (:import
@ -30,7 +32,7 @@
(case name (case name
:assets-fs :fs :assets-fs :fs
:assets-s3 :s3 :assets-s3 :s3
:fs))) nil)))
(def valid-buckets (def valid-buckets
#{"file-media-object" #{"file-media-object"
@ -62,11 +64,19 @@
(defmethod ig/init-key ::storage (defmethod ig/init-key ::storage
[_ {:keys [::backends ::db/pool] :as cfg}] [_ {:keys [::backends ::db/pool] :as cfg}]
(let [backend (or (get-legacy-backend)
(cf/get :objects-storage-backend)
:fs)
backends (d/without-nils backends)]
(l/dbg :hint "initialize"
:default (d/name backend)
:available (str/join "," (map d/name (keys backends))))
(-> (d/without-nils cfg) (-> (d/without-nils cfg)
(assoc ::backends (d/without-nils backends)) (assoc ::backends backends)
(assoc ::backend (or (get-legacy-backend) (assoc ::backend backend)
(cf/get :objects-storage-backend :fs))) (assoc ::db/connectable pool))))
(assoc ::db/connectable pool)))
(s/def ::backend keyword?) (s/def ::backend keyword?)
(s/def ::storage (s/def ::storage