From 1f5154e2af908a2187844f39596eb96f5497b2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6tzsch?= Date: Fri, 11 Mar 2022 17:10:07 +0100 Subject: [PATCH] backend: warning when started without DB_SEED --- backend/src/beherbergung/config/state.clj | 2 +- backend/src/beherbergung/db/state.clj | 15 +++++++-------- backend/src/config.edn | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/backend/src/beherbergung/config/state.clj b/backend/src/beherbergung/config/state.clj index 0530b5f..0c2dae9 100644 --- a/backend/src/beherbergung/config/state.clj +++ b/backend/src/beherbergung/config/state.clj @@ -16,7 +16,7 @@ (s/def ::db-inmemory boolean?) ;; we run unit tests in an in-memory instance, otherwise the default db would be looked (s/def ::db-dir string?) ;; ignored when ::db-inmemory -(s/def ::db-seed string?) ;; an edn-file to be used for seeding +(s/def ::db-seed (s/nilable string?)) ;; an edn-file to be used for seeding (s/def ::db-export-prefix (s/nilable string?)) ;; path where during startup an export should be written (s/def ::db-validate boolean?) diff --git a/backend/src/beherbergung/db/state.clj b/backend/src/beherbergung/db/state.clj index 4ea6234..2df6151 100644 --- a/backend/src/beherbergung/db/state.clj +++ b/backend/src/beherbergung/db/state.clj @@ -63,14 +63,13 @@ (export-named-by-date db_ctx "start") ;; before seeding - (let [seed-file (when (not-empty (:db-seed env)) - (:db-seed env) - ;; TODO configuration for tests - #_(io/resource "beherbergung/db/seed/test.edn"))] - (when (:verbose env) - (println "Seed the database from:" seed-file)) - (when seed-file - (seed seed-file db_ctx))) + ;; There is no default seed file, to prevent loading it into the production system + (if (:db-seed env) + (do (when (:verbose env) + (println "Seed the database from:" (:db-seed env))) + (seed (:db-seed env) db_ctx)) + (println "WARNING: Seeding the database requires setting $DB_SEED" + "consider: DB_SEED=src/beherbergung/db/seed/test.edn")) (if (:db-validate env) (or (validate-db db_ctx) diff --git a/backend/src/config.edn b/backend/src/config.edn index d18ee2d..8cf84cb 100644 --- a/backend/src/config.edn +++ b/backend/src/config.edn @@ -6,7 +6,7 @@ :db-inmemory false :db-dir "./data/xtdb/rocksdb" - :db-seed "" + :db-seed nil :db-export-prefix "./data/export/" :db-validate true