Merge pull request #241 from lichess-org/io-all-the-ways

Simplify ESClient creation
lichess-org · Jun 19, 2024 · 66f0259 · 66f0259
2 parents 95fcccf + 0f8c9df
commit 66f0259
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/build.sbt b/build.sbt
@@ -22,8 +22,10 @@ lazy val core = project
     publish        := {},
     publish / skip := true,
     libraryDependencies ++= Seq(
-      elastic4sJavaClient,
       catsCore,
+      catsEffect,
+      elastic4sJavaClient,
+      elastic4sCatsEffect,
       "joda-time" % "joda-time" % "2.12.7"
     )
   )
@@ -45,7 +47,6 @@ lazy val ingestor = (project in file("modules/ingestor"))
     publish        := {},
     publish / skip := true,
     libraryDependencies ++= Seq(
-      elastic4sCatsEffect,
       catsCore,
       fs2,
       fs2IO,
@@ -88,7 +89,6 @@ lazy val app = (project in file("modules/app"))
       jsoniterCore,
       jsoniterMacro,
       smithy4sHttp4sSwagger,
-      elastic4sCatsEffect,
       catsCore,
       catsEffect,
       ducktape,

diff --git a/modules/app/src/main/scala/app.resources.scala b/modules/app/src/main/scala/app.resources.scala
@@ -2,20 +2,11 @@ package lila.search
 package app
 
 import cats.effect.*
-import com.sksamuel.elastic4s.cats.effect.instances.*
-import com.sksamuel.elastic4s.http.JavaClient
-import com.sksamuel.elastic4s.{ ElasticClient, ElasticProperties }
 import org.typelevel.log4cats.Logger
 
 class AppResources(val esClient: ESClient[IO])
 
 object AppResources:
 
   def instance(conf: AppConfig)(using Logger[IO]): Resource[IO, AppResources] =
-    makeClient(conf.elastic)
-      .map(ESClient.apply[IO])
-      .map(AppResources(_))
-
-  def makeClient(conf: ElasticConfig): Resource[IO, ElasticClient] =
-    Resource.make(IO(ElasticClient(JavaClient(ElasticProperties(conf.uri))))): client =>
-      IO(client.close())
+    ESClient.apply(conf.elastic.uri).map(AppResources.apply)
diff --git a/modules/core/src/main/scala/ESClient.scala b/modules/core/src/main/scala/ESClient.scala
@@ -1,12 +1,16 @@
 package lila.search
 
 import cats.MonadThrow
+import cats.effect.*
 import cats.syntax.all.*
 import com.sksamuel.elastic4s.ElasticDsl.*
+import com.sksamuel.elastic4s.cats.effect.instances.*
 import com.sksamuel.elastic4s.fields.ElasticField
+import com.sksamuel.elastic4s.http.JavaClient
 import com.sksamuel.elastic4s.{
   ElasticClient,
   ElasticDsl,
+  ElasticProperties,
   Executor,
   Functor,
   Index as ESIndex,
@@ -31,6 +35,11 @@ trait ESClient[F[_]]:
 
 object ESClient:
 
+  def apply(uri: String): Resource[IO, ESClient[IO]] =
+    Resource
+      .make(IO(ElasticClient(JavaClient(ElasticProperties(uri)))))(client => IO(client.close()))
+      .map(ESClient.apply[IO])
+
   def apply[F[_]: MonadThrow: Functor: Executor](client: ElasticClient) = new ESClient[F]:
 
     def status: F[String] =

diff --git a/modules/ingestor/src/main/scala/app.resources.scala b/modules/ingestor/src/main/scala/app.resources.scala
@@ -4,9 +4,6 @@ package ingestor
 import cats.effect.{ IO, Resource }
 import cats.syntax.all.*
 import com.mongodb.ReadPreference
-import com.sksamuel.elastic4s.cats.effect.instances.*
-import com.sksamuel.elastic4s.http.JavaClient
-import com.sksamuel.elastic4s.{ ElasticClient, ElasticProperties }
 import mongo4cats.client.MongoClient
 import mongo4cats.database.MongoDatabase
 import org.typelevel.log4cats.Logger
@@ -20,9 +17,7 @@ object AppResources:
       .parMapN(AppResources.apply)
 
   def makeElasticClient(conf: ElasticConfig) =
-    Resource
-      .make(IO(ElasticClient(JavaClient(ElasticProperties(conf.uri)))))(client => IO(client.close()))
-      .map(ESClient.apply[IO])
+    ESClient.apply(conf.uri)
 
   def makeMongoClient(conf: MongoConfig) =
     MongoClient