Fix config loading in nexus ship (#4900)

BlueBrain · Apr 24, 2024 · 4f3b018 · 4f3b018
1 parent cfccd07
commit 4f3b018
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/InitShip.scala b/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/InitShip.scala
@@ -10,22 +10,21 @@ object InitShip {
 
   def configAndStream(
       run: RunCommand,
+      defaultConfig: ShipConfig,
       s3Client: S3StorageClient
   ): IO[(ShipConfig, fs2.Stream[IO, RowEvent])] = {
-    ShipConfig.load(run.config).flatMap { shipConfig =>
-      run.mode match {
-        case RunMode.Local =>
-          val eventsStream = EventStreamer.localStreamer.stream(run.path, run.offset)
-          ShipConfig.load(run.config).map((_, eventsStream))
-        case RunMode.S3    =>
-          val eventsStream =
-            EventStreamer.s3eventStreamer(s3Client, shipConfig.s3.importBucket).stream(run.path, run.offset)
-          val config       = run.config match {
-            case Some(configPath) => ShipConfig.loadFromS3(s3Client, shipConfig.s3.importBucket, configPath)
-            case None             => IO.pure(shipConfig)
-          }
-          config.map((_, eventsStream))
-      }
+    run.mode match {
+      case RunMode.Local =>
+        val eventsStream = EventStreamer.localStreamer.stream(run.path, run.offset)
+        ShipConfig.load(run.config).map((_, eventsStream))
+      case RunMode.S3    =>
+        val eventsStream =
+          EventStreamer.s3eventStreamer(s3Client, defaultConfig.s3.importBucket).stream(run.path, run.offset)
+        val config       = run.config match {
+          case Some(configPath) => ShipConfig.loadFromS3(s3Client, defaultConfig.s3.importBucket, configPath)
+          case None             => IO.pure(defaultConfig)
+        }
+        config.map((_, eventsStream))
     }
   }
 }
diff --git a/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/Main.scala b/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/Main.scala
@@ -62,10 +62,10 @@ object Main
     val clock = Clock[IO]
 
     val resources = for {
-      initialConfig          <- Resource.eval(ShipConfig.load(r.config))
-      client                 <- S3StorageClient.resource(initialConfig.s3.endpoint, DefaultCredentialsProvider.create())
-      xas                    <- Transactors.init(initialConfig.database)
-      (config, eventsStream) <- Resource.eval(InitShip.configAndStream(r, client))
+      defaultConfig          <- Resource.eval(ShipConfig.load(None))
+      client                 <- S3StorageClient.resource(defaultConfig.s3.endpoint, DefaultCredentialsProvider.create())
+      xas                    <- Transactors.init(defaultConfig.database)
+      (config, eventsStream) <- Resource.eval(InitShip.configAndStream(r, defaultConfig, client))
     } yield (client, config, eventsStream, xas)
 
     resources.use { case (client, config, eventsStream, xas) =>