Merge pull request #13 from parenthesin/feat/args-webserver-migration…

…-bump

feat: adds extra args on migration server and bump

.github/workflows/release.yaml

@@ -30,7 +30,7 @@ jobs:
       - name: Install clojure cli
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: 1.11.1.1435
+          cli: 1.11.2.1446
 
       - name: Cache Maven packages
         uses: actions/cache@v4

.github/workflows/tests.yaml

@@ -33,7 +33,7 @@ jobs:
       - name: Install clojure cli
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: 1.11.1.1435
+          cli: 1.11.2.1446
 
       - name: Cache Maven packages
         uses: actions/cache@v4
@@ -60,12 +60,12 @@ jobs:
       - name: Install clojure cli
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: 1.11.1.1435
+          cli: 1.11.2.1446
 
       - name: Setup clojure-lsp
-        uses: clojure-lsp/setup-clojure-lsp@v1
+        uses: clojure-lsp/setup-clojure-lsp@v1.0.2
         with:
-          clojure-lsp-version: 2024.02.01-11.01.59
+          clojure-lsp-version: 2024.03.13-13.11.00
 
       - name: Execute lint checks
         run: |

deps.edn

@@ -1,42 +1,42 @@
 {:paths ["src" "resources"]
 
- :deps {org.clojure/clojure {:mvn/version "1.11.1"}
+ :deps {org.clojure/clojure {:mvn/version "1.11.2"}
         aero/aero {:mvn/version "1.1.6"}
         cheshire/cheshire {:mvn/version "5.12.0"}
         clj-http/clj-http {:mvn/version "3.12.3"}
-        com.github.seancorfield/next.jdbc {:mvn/version "1.3.909"}
+        com.github.seancorfield/next.jdbc {:mvn/version "1.3.925"}
         com.stuartsierra/component {:mvn/version "1.1.0"}
-        com.taoensso/timbre {:mvn/version "6.3.1"}
+        com.taoensso/timbre {:mvn/version "6.5.0"}
         com.zaxxer/HikariCP {:mvn/version "5.1.0"}
         io.pedestal/pedestal.jetty  {:mvn/version "0.6.3"}
         io.pedestal/pedestal.service  {:mvn/version "0.6.3"}
-        metosin/malli {:mvn/version "0.14.0"}
-        metosin/muuntaja {:mvn/version "0.6.8"}
+        metosin/malli {:mvn/version "0.15.0"}
+        metosin/muuntaja {:mvn/version "0.6.10"}
         metosin/reitit {:mvn/version "0.6.0"}
         metosin/reitit-pedestal {:mvn/version "0.6.0"}
         metosin/reitit-swagger {:mvn/version "0.6.0"}
         metosin/reitit-swagger-ui {:mvn/version "0.6.0"}
-        migratus/migratus {:mvn/version "1.5.4"}
+        migratus/migratus {:mvn/version "1.5.6"}
         org.slf4j/slf4j-simple {:mvn/version "2.0.12"}
         prismatic/schema {:mvn/version "1.4.1"}}
 
  :aliases
  {:test {:extra-paths ["test" "test/resources"]
-         :extra-deps  {org.postgresql/postgresql {:mvn/version "42.7.1"}
+         :extra-deps  {org.postgresql/postgresql {:mvn/version "42.7.3"}
                        org.clojars.bigsy/pg-embedded-clj {:mvn/version "1.0.1"}
-                       lambdaisland/kaocha {:mvn/version "1.87.1366"}
+                       lambdaisland/kaocha {:mvn/version "1.88.1376"}
                        lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"}
                        nubank/matcher-combinators {:mvn/version "3.9.1"}
-                       nubank/state-flow {:mvn/version "5.14.5"}}
+                       nubank/state-flow {:mvn/version "5.15.0"}}
          :main-opts   ["-m" "kaocha.runner"]}
 
-  :clojure-lsp {:replace-deps {com.github.clojure-lsp/clojure-lsp-standalone {:mvn/version "2024.02.01-11.01.59"}}
+  :clojure-lsp {:replace-deps {com.github.clojure-lsp/clojure-lsp-standalone {:mvn/version "2024.03.13-13.11.00"}}
                 :main-opts ["-m" "clojure-lsp.main"]}
 
-  :nrepl {:extra-deps {cider/cider-nrepl {:mvn/version "0.45.0"}}
+  :nrepl {:extra-deps {cider/cider-nrepl {:mvn/version "0.47.1"}}
           :main-opts ["-m" "nrepl.cmdline" "--middleware" "[cider.nrepl/cider-middleware]"]}
 
-  :build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}
+  :build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.0"}
                  slipset/deps-deploy {:mvn/version "0.2.2"}}
           :ns-default build
           :exec-args {:jar-file "target/components.jar"}}}}

pom.xml

@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>clojure</artifactId>
-      <version>1.11.1</version>
+      <version>1.11.2</version>
     </dependency>
   </dependencies>
   <build>

src/parenthesin/components/server/reitit_pedestal_jetty.clj

@@ -55,7 +55,7 @@
       (server/default-interceptors)
       (pedestal/replace-last-interceptor router)))
 
-(defrecord WebServer [config router]
+(defrecord WebServer [service-map config router]
   component/Lifecycle
   (start [this]
     (let [{:webserver/keys [port allowed-origins]
@@ -65,6 +65,7 @@
       (assoc this :webserver
              (-> (base-service port allowed-origins)
                  (init-fn (:router router))
+                 (merge service-map)
                  (system-interceptors this)
                  (server/create-server)
                  (server/start)))))
@@ -75,6 +76,8 @@
     (dissoc this :webserver)
     this))
 
-(defn new-webserver []
-  (map->WebServer {}))
-
+(defn new-webserver
+  ([]
+   (new-webserver {}))
+  ([service-map]
+   (map->WebServer {:service-map service-map})))

src/parenthesin/helpers/migrations.clj

@@ -4,16 +4,22 @@
             [parenthesin.components.config.aero :as config.aero])
   (:gen-class))
 
-(defn get-connection []
-  (let [{:keys [username] :as db} (-> (config.aero/read-config {}) :database)]
-    (jdbc/get-connection (assoc db :user username))))
+(defn get-connection
+  ([]
+   (get-connection {}))
+  ([input-map]
+   (let [{:keys [username] :as db} (-> (config.aero/read-config input-map) :database)]
+     (jdbc/get-connection (assoc db :user username)))))
 
 (def configuration
   {:store         :database
    :migration-dir "migrations/"})
 
-(defn configuration-with-db []
-  (assoc configuration :db {:connection (get-connection)}))
+(defn configuration-with-db
+  ([]
+   (configuration-with-db {}))
+  ([input-map]
+   (assoc configuration :db {:connection (get-connection input-map)})))
 
 (defn init
   [config]