Add missing local changes

snowplow · Jun 3, 2024 · 6f22ddf · 6f22ddf
1 parent b0594ff
commit 6f22ddf
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/src/main/scala/com.snowplowanalytics.snowplow.collector.core/HttpServer.scala b/core/src/main/scala/com.snowplowanalytics.snowplow.collector.core/HttpServer.scala
@@ -217,16 +217,16 @@ object HttpServer {
         )
     }
 
-    def mkTls(secure: Boolean): Resource[F, KeyManagerFactory] =
+    def mkTls(secure: Boolean): Resource[F, Option[KeyManagerFactory]] =
       if (secure) {
         for {
           tlsConfig <- Resource.eval(ArmeriaTlsConfig.from(System.getProperties()))
           kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm)
           ks  = KeyStore.getInstance(tlsConfig.ksType)
           _ <- Resource.eval(Async[F].delay(ks.load(new FileInputStream(tlsConfig.ksPath), tlsConfig.ksPass.toArray)))
           _ <- Resource.eval(Async[F].delay(kmf.init(ks, tlsConfig.ksPass.toArray)))
-        } yield kmf
-      } else Resource.never
+        } yield Some(kmf)
+      } else Resource.pure(None)
 
     for {
       _   <- Resource.eval(Logger[F].info(s"Building Armeria server"))
@@ -238,7 +238,7 @@ object HttpServer {
           "/",
           loggerMiddleware(timeoutMiddleware(hstsMiddleware(hsts, routes.orNotFound), networking), debugHttp)
         )
-        .cond(secure, _.withTls(kmf))
+        .cond(secure && kmf.isDefined, _.withTls(kmf.get))
         .withIdleTimeout(networking.idleTimeout)
         .withRequestTimeout(networking.responseHeaderTimeout)
         .resource