Merge branch 'main' into NO-JIRA-fix-inorrect-parsing-of-pk-cords

hyperledger · Jun 21, 2024 · e2474e5 · e2474e5
2 parents 35cd986 + cb4d479
commit e2474e5
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 3 deletions.
diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/MainApp.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/MainApp.scala
@@ -100,9 +100,9 @@ object MainApp extends ZIOAppDefault {
   } yield ()
 
   private val migrations = for {
-    _ <- ZIO.serviceWithZIO[PolluxMigrations](_.migrate)
-    _ <- ZIO.serviceWithZIO[ConnectMigrations](_.migrate)
-    _ <- ZIO.serviceWithZIO[AgentMigrations](_.migrate)
+    _ <- ZIO.serviceWithZIO[PolluxMigrations](_.migrateAndRepair)
+    _ <- ZIO.serviceWithZIO[ConnectMigrations](_.migrateAndRepair)
+    _ <- ZIO.serviceWithZIO[AgentMigrations](_.migrateAndRepair)
     _ <- ZIO.logInfo("Running post-migration RLS checks for DB application users")
     _ <- PolluxMigrations.validateRLS.provide(RepoModule.polluxContextAwareTransactorLayer)
     _ <- ConnectMigrations.validateRLS.provide(RepoModule.connectContextAwareTransactorLayer)

diff --git a/...t/service/server/src/main/scala/org/hyperledger/identus/agent/server/sql/Migrations.scala b/...t/service/server/src/main/scala/org/hyperledger/identus/agent/server/sql/Migrations.scala
@@ -3,6 +3,7 @@ package org.hyperledger.identus.agent.server.sql
 import doobie.*
 import doobie.implicits.*
 import doobie.util.transactor.Transactor
+import org.flywaydb.core.api.exception.FlywayValidateException
 import org.flywaydb.core.Flyway
 import org.hyperledger.identus.shared.db.{ContextAwareTask, DbConfig}
 import org.hyperledger.identus.shared.db.Implicits.*
@@ -30,6 +31,24 @@ final case class Migrations(config: DbConfig) {
       }
     } yield ()
 
+  def repair: Task[Unit] =
+    for {
+      _ <- ZIO.logInfo("Repairing Flyway schema history")
+      _ <- ZIO.attempt {
+        Flyway
+          .configure()
+          .dataSource(config.jdbcUrl, config.username, config.password)
+          .locations(migrationScriptsLocation)
+          .load()
+          .repair()
+      }
+    } yield ()
+
+  def migrateAndRepair: Task[Unit] =
+    migrate.catchSome { case e: FlywayValidateException =>
+      ZIO.logError("Migration validation failed, attempting to repair") *> repair *> migrate
+    }
+
 }
 
 object Migrations {

diff --git a/...sql-doobie/src/main/scala/org/hyperledger/identus/connect/sql/repository/Migrations.scala b/...sql-doobie/src/main/scala/org/hyperledger/identus/connect/sql/repository/Migrations.scala
@@ -3,6 +3,7 @@ package org.hyperledger.identus.connect.sql.repository
 import doobie.*
 import doobie.implicits.*
 import doobie.util.transactor.Transactor
+import org.flywaydb.core.api.exception.FlywayValidateException
 import org.flywaydb.core.Flyway
 import org.hyperledger.identus.shared.db.{ContextAwareTask, DbConfig}
 import org.hyperledger.identus.shared.db.Implicits.*
@@ -30,6 +31,24 @@ final case class Migrations(config: DbConfig) {
       }
     } yield ()
 
+  def repair: Task[Unit] =
+    for {
+      _ <- ZIO.logInfo("Repairing Flyway schema history")
+      _ <- ZIO.attempt {
+        Flyway
+          .configure()
+          .dataSource(config.jdbcUrl, config.username, config.password)
+          .locations(migrationScriptsLocation)
+          .load()
+          .repair()
+      }
+    } yield ()
+
+  def migrateAndRepair: Task[Unit] =
+    migrate.catchSome { case e: FlywayValidateException =>
+      ZIO.logError("Migration validation failed, attempting to repair") *> repair *> migrate
+    }
+
 }
 
 object Migrations {

diff --git a/.../sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/Migrations.scala b/.../sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/Migrations.scala
@@ -3,6 +3,7 @@ package org.hyperledger.identus.pollux.sql.repository
 import doobie.*
 import doobie.implicits.*
 import doobie.util.transactor.Transactor
+import org.flywaydb.core.api.exception.FlywayValidateException
 import org.flywaydb.core.Flyway
 import org.hyperledger.identus.shared.db.{ContextAwareTask, DbConfig}
 import org.hyperledger.identus.shared.db.Implicits.*
@@ -31,6 +32,24 @@ final case class Migrations(config: DbConfig) {
       }
     } yield ()
 
+  def repair: Task[Unit] =
+    for {
+      _ <- ZIO.logInfo("Repairing Flyway schema history")
+      _ <- ZIO.attempt {
+        Flyway
+          .configure()
+          .dataSource(config.jdbcUrl, config.username, config.password)
+          .locations(migrationScriptsLocation)
+          .load()
+          .repair()
+      }
+    } yield ()
+
+  def migrateAndRepair: Task[Unit] =
+    migrate.catchSome { case e: FlywayValidateException =>
+      ZIO.logError("Migration validation failed, attempting to repair") *> repair *> migrate
+    }
+
 }
 
 object Migrations {