fix: upgrade vault and quill versions (#739)

Signed-off-by: Pat Losoponkul <[email protected]>
hyperledger · Sep 29, 2023 · c140857 · c140857
1 parent 4e63790
commit c140857
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ import org.scoverage.coveralls.Imports.CoverallsKeys.*
 inThisBuild(
   Seq(
     organization := "io.iohk.atala",
-    scalaVersion := "3.3.0",
+    scalaVersion := "3.3.1",
     fork := true,
     run / connectInput := true,
     releaseUseGlobalVersion := false,
@@ -44,7 +44,7 @@ lazy val V = new {
   val munitZio = "0.1.1"
 
   // https://mvnrepository.com/artifact/dev.zio/zio
-  val zio = "2.0.15"
+  val zio = "2.0.18"
   val zioConfig = "3.0.7"
   val zioLogging = "2.0.1"
   val zioJson = "0.3.0"
@@ -55,17 +55,17 @@ lazy val V = new {
   val mockito = "3.2.16.0"
 
   // https://mvnrepository.com/artifact/io.circe/circe-core
-  val circe = "0.14.5"
+  val circe = "0.14.6"
 
   val tapir = "1.6.0"
   val tapirLegacy = "1.2.3" // TODO: remove
 
   val typesafeConfig = "1.4.2"
   val protobuf = "3.1.9"
-  val testContainersScala = "0.40.17"
+  val testContainersScala = "0.41.0"
 
   val doobie = "1.0.0-RC2"
-  val quill = "4.6.0.1"
+  val quill = "4.7.3"
   val flyway = "9.8.3"
   val postgresDriver = "42.2.27"
   val logback = "1.4.8"
@@ -81,9 +81,7 @@ lazy val V = new {
 
   val jsonSchemaValidator = "1.0.86"
 
-  // https://github.com/jopenlibs/vault-java-driver/issues/36
-  // v5.4.0 is not available on Maven yet.
-  val vaultDriver = "5.4.0"
+  val vaultDriver = "6.1.0"
   val micrometer = "1.11.2"
 }
 

diff --git a/.../lib/sql-doobie/src/main/scala/io/iohk/atala/pollux/sql/model/db/VerificationPolicy.scala b/.../lib/sql-doobie/src/main/scala/io/iohk/atala/pollux/sql/model/db/VerificationPolicy.scala
@@ -1,7 +1,5 @@
 package io.iohk.atala.pollux.sql.model.db
 
-import io.getquill.InsertMeta
-
 import io.getquill.*
 import io.getquill.doobie.DoobieContext
 import io.iohk.atala.shared.models.WalletId
@@ -31,7 +29,6 @@ object VerificationPolicySql extends DoobieContext.Postgres(SnakeCase) {
   import io.iohk.atala.pollux.sql.repository.VerificationPolicyExtensions._
 
   def insert(verificationPolicy: VerificationPolicy) = {
-    inline given InsertMeta[VerificationPolicy] = insertMeta(exclude = _.id, _.createdAt, _.updatedAt)
     run(quote(query[VerificationPolicy].insertValue(lift(verificationPolicy)).returning(vp => vp)))
   }
 
@@ -83,8 +80,6 @@ object VerificationPolicySql extends DoobieContext.Postgres(SnakeCase) {
     )
 
   def update(verificationPolicy: VerificationPolicy, nonce: Int) =
-    // TODO, compiler marks this import as unused, since it is new to scala 3 it can be broken for givens or this given is indeed unused
-    inline given UpdateMeta[VerificationPolicy] = updateMeta(exclude = _.id)
     run(
       quote(
         query[VerificationPolicy]

diff --git a/...t/service/wallet-api/src/main/scala/io/iohk/atala/agent/walletapi/vault/VaultClient.scala b/...t/service/wallet-api/src/main/scala/io/iohk/atala/agent/walletapi/vault/VaultClient.scala
@@ -88,7 +88,7 @@ object VaultKVClientImpl {
         .address(address)
         .token(token)
         .build()
-      val vault = Vault(config)
+      val vault = Vault.create(config)
       VaultKVClientImpl(vault)
     }
 }
diff --git a/shared/src/main/scala/io/iohk/atala/shared/test/containers/VaultTestContainer.scala b/shared/src/main/scala/io/iohk/atala/shared/test/containers/VaultTestContainer.scala
@@ -5,7 +5,7 @@ import org.testcontainers.utility.DockerImageName
 
 object VaultTestContainer {
   def vaultContainer(
-      imageName: String = "vault:1.13.2",
+      imageName: String = "hashicorp/vault:1.15.0",
       vaultToken: Option[String] = None,
       verbose: Boolean = false
   ): VaultContainerCustom = {