Move http-specific items out of system component

Author: bryanmikaelian

components/http/deps.edn

@@ -0,0 +1,9 @@
+{:paths ["src" "resources"]
+ :deps {luminus/ring-undertow-adapter {:mvn/version "1.3.1"}
+        metosin/reitit-core {:mvn/version "0.7.0-alpha5"}
+        metosin/reitit-middleware {:mvn/version "0.7.0-alpha5"}
+        metosin/reitit-malli {:mvn/version "0.7.0-alpha5"}
+        metosin/reitit-ring {:mvn/version "0.7.0-alpha5"}
+        metosin/ring-http-response {:mvn/version "0.9.3"}}
+ :aliases {:test {:extra-paths ["test"]
+                  :extra-deps {}}}}

components/http/resources/http/.keep

@@ -0,0 +1 @@
+

components/http/src/com/vennbilling/http/interface.clj

@@ -0,0 +1,22 @@
+(ns com.vennbilling.http.interface
+  (:require [com.vennbilling.http.undertow :as undertow]
+            [com.vennbilling.http.ring :as ring]))
+
+(defn serve
+  "Starts up an HTTP server with a io.undertow config and ring handler. Returns an undertow server"
+  [config handler]
+  (undertow/serve config handler))
+
+(defn new-ring-handler
+  "Returns a ring handler function that wraps a ring router and can be used with an HTTP server."
+  [router]
+  (ring/new-handler router))
+
+(defn new-ring-router
+  "Returns a new ring router that can be used with an ring handler"
+  ([routes]
+   (new-ring-router "" routes []))
+  ([base-path routes]
+   (new-ring-router base-path routes []))
+  ([base-path routes middleware]
+   (ring/new-router base-path routes middleware)))

components/http/src/com/vennbilling/http/rest.clj

@@ -0,0 +1 @@
+(ns com.vennbilling.http.rest)

components/http/src/com/vennbilling/http/ring.clj

@@ -0,0 +1,42 @@
+(ns com.vennbilling.http.ring
+
+  (:require [muuntaja.core :as m]
+            [reitit.coercion.malli :as malli]
+            [reitit.ring :as ring]
+            [reitit.ring.coercion :as coercion]
+            [reitit.ring.middleware.exception :as exception]
+            [reitit.ring.middleware.muuntaja :as muuntaja]
+            [reitit.ring.middleware.parameters :as parameters]
+            [ring.logger :as logger]))
+
+(def ^:private default-middleware [;; query-params & form-params
+                                   parameters/parameters-middleware
+                                   ;; content-negotiation
+                                   muuntaja/format-negotiate-middleware
+                                   ;; encoding response body
+                                   muuntaja/format-response-middleware
+                                   ;; exception handling
+                                   exception/exception-middleware
+                                   ;; decoding request body
+                                   muuntaja/format-request-middleware
+                                   ;; coercing response bodys
+                                   coercion/coerce-response-middleware
+                                   ;; coercing request parameters
+                                   coercion/coerce-request-middleware])
+
+(def ^:private ring-router-config
+  {:coercion malli/coercion
+   :muuntaja m/instance})
+
+(defn new-handler
+  [router]
+  (logger/wrap-with-logger
+   (ring/ring-handler
+    router
+    (ring/create-default-handler))))
+
+(defn new-router
+  [base-path routes & middleware]
+  (let [middlewares (vec (set (into default-middleware middleware)))
+        config (assoc ring-router-config :middleware middlewares)]
+    (ring/router [base-path config routes])))

components/http/src/com/vennbilling/http/undertow.clj

@@ -0,0 +1,12 @@
+(ns com.vennbilling.http.undertow
+  (:require
+   [ring.adapter.undertow :refer [run-undertow]]
+   [com.vennbilling.logging.interface :as log]))
+
+(defn serve
+  [config handler]
+  (let [handler-fn (atom (delay handler))]
+    ;; TODO: Dependency injection of any system/storage
+    ;; https://github.com/vennbilling/venn/issues/55
+    (log/info "Starting undertow server")
+    (run-undertow (fn [req] (@@handler-fn req)) config)))

components/http/test/com/vennbilling/http/interface_test.clj

@@ -0,0 +1 @@
+(ns com.vennbilling.http.interface-test)

components/system/deps.edn

@@ -1,17 +1,7 @@
 {:paths ["src" "resources"]
- :deps {;; configuration via edn files
-        aero/aero {:mvn/version "1.1.6"}
+ :deps {aero/aero {:mvn/version "1.1.6"}
         integrant/integrant {:mvn/version "0.8.1"}
-
-        metosin/malli {:mvn/version "0.17.0"}
-
-        ;; http
-        luminus/ring-undertow-adapter {:mvn/version "1.3.1"}
-        metosin/reitit-core {:mvn/version "0.7.0-alpha5"}
-        metosin/reitit-middleware {:mvn/version "0.7.0-alpha5"}
-        metosin/reitit-malli {:mvn/version "0.7.0-alpha5"}
-        metosin/reitit-ring {:mvn/version "0.7.0-alpha5"}
-        metosin/ring-http-response {:mvn/version "0.9.3"}}
+        metosin/malli {:mvn/version "0.17.0"}}
 
  :aliases {:test {:extra-paths ["test"]
                   :extra-deps {}}}}

components/system/src/com/vennbilling/system/server.clj

@@ -1,42 +1,17 @@
 (ns com.vennbilling.system.server
   (:require
-   [com.vennbilling.logging.interface :as log]
    [integrant.core :as ig]
    [malli.core :as ma]
-   [muuntaja.core :as m]
-   [reitit.coercion.malli :as malli]
-   [reitit.ring :as ring]
-   [reitit.ring.coercion :as coercion]
-   [reitit.ring.middleware.exception :as exception]
-   [reitit.ring.middleware.muuntaja :as muuntaja]
-   [reitit.ring.middleware.parameters :as parameters]
-   [ring.adapter.undertow :refer [run-undertow]]
-   [ring.logger :as logger])
+
+   [com.vennbilling.logging.interface :as log]
+   [com.vennbilling.http.interface :as http])
 
   (:import
    [clojure.lang ExceptionInfo]))
 
 (def ^:private ServerConfig
   :map)
 
-(def ^:private router-config
-  {:coercion malli/coercion
-   :muuntaja m/instance
-   :middleware [;; query-params & form-params
-                parameters/parameters-middleware
-                ;; content-negotiation
-                muuntaja/format-negotiate-middleware
-                ;; encoding response body
-                muuntaja/format-response-middleware
-                ;; exception handling
-                exception/exception-middleware
-                ;; decoding request body
-                muuntaja/format-request-middleware
-                ;; coercing response bodys
-                coercion/coerce-response-middleware
-                ;; coercing request parameters
-                coercion/coerce-request-middleware]})
-
 (defn with-http-server
   [routes]
   {:system/server {:handler (ig/ref :http/handler)
@@ -52,14 +27,10 @@
   [_ server-config]
   (try
     (let [valid (ma/coerce ServerConfig server-config)
-          handler (atom (delay (:handler valid)))
+          handler (:handler valid)
           undertow-opts (dissoc valid :handler)]
 
-      (log/info "Starting undertow server")
-
-      ;; TODO: Dependency injection of localdb and serverdb
-      ;; https://github.com/vennbilling/venn/issues/55
-      {:undertow (run-undertow (fn [req] (@@handler req)) undertow-opts)})
+      {:undertow (http/serve undertow-opts handler)})
 
     (catch ExceptionInfo e
       (log/exception e)
@@ -70,15 +41,10 @@
   (log/info "Stopping undertow server")
   (.stop undertow))
 
-;; TODO These should probably live in a different component or namespace
 (defmethod ig/init-key :http/handler
   [_ {:keys [router]}]
-
-  (logger/wrap-with-logger
-   (ring/ring-handler
-    router
-    (ring/create-default-handler))))
+  (http/new-ring-handler router))
 
 (defmethod ig/init-key :http/router
   [_ {:keys [routes]}]
-  (ring/router ["" router-config routes]))
+  (http/new-ring-router routes))

deps.edn

@@ -13,12 +13,13 @@
                                "--middleware" "[cider.nrepl/cider-middleware]"
                                "-i"]}
 
-           :dev {:extra-deps {poly/spec {:local/root "components/spec"}
+           :dev {:extra-deps {poly/customer {:local/root "components/customer"}
+                              poly/database {:local/root "components/database"}
                               poly/healthcheck {:local/root "components/healthcheck"}
-                              poly/customer {:local/root "components/customer"}
-                              poly/system {:local/root "components/system"}
+                              poly/http {:local/root "components/http"}
                               poly/logging {:local/root "components/logging"}
-                              poly/database {:local/root "components/database"}
+                              poly/spec {:local/root "components/spec"}
+                              poly/system {:local/root "components/system"}
 
                               poly/agent {:local/root "bases/agent"}
                               poly/server {:local/root "bases/server"}