Change config check from :ziggurat to just :ssl

gojek · Nov 12, 2024 · b9e182b · b9e182b
1 parent 490adcf
commit b9e182b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/resources/config.test.edn b/resources/config.test.edn
@@ -96,4 +96,5 @@
             :new-relic            {:report-errors false}
             :prometheus           {:port 8002
                                    :enabled false}
+            :ssl                  {:enabled false}
             :log-format           "text"}}
diff --git a/src/ziggurat/config.clj b/src/ziggurat/config.clj
@@ -94,10 +94,10 @@
   (get config :ziggurat))
 
 (defn ssl-config []
-  (get-in config [:ziggurat :ssl]))
+  (get-in config [:ssl]))
 
 (defn sasl-config []
-  (get-in config [:ziggurat :sasl]))
+  (get-in config [:sasl]))
 
 (defn rabbitmq-config []
   (get (ziggurat-config) :rabbit-mq))

diff --git a/src/ziggurat/streams.clj b/src/ziggurat/streams.clj
@@ -219,15 +219,19 @@
   ([global-config stream-config]
    (if (:ssl stream-config)
      stream-config
-     (assoc stream-config :ssl (:ssl global-config)))))
+     (if-let [global-ssl-config (:ssl global-config)]
+       (assoc stream-config :ssl global-ssl-config)
+       stream-config))))
 
 (defn- attach-sasl-from-config-if-not-present
   ([stream-config]
    (attach-sasl-from-config-if-not-present (ziggurat-config) stream-config))
   ([global-config stream-config]
    (if (:sasl stream-config)
      stream-config
-     (assoc stream-config :sasl (:sasl global-config)))))
+     (if-let [global-sasl-config (:sasl global-config)]
+       (assoc stream-config :sasl global-sasl-config)
+       stream-config))))
 
 (defn start-streams
   ([stream-routes]