[IA-4681] Update terra-common-lib

http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/db/DbReference.scala

@@ -33,6 +33,7 @@ object DbReference extends LazyLogging {
       changelogParameters.foreach { case (key, value) => liquibase.setChangeLogParameter(key, value) }
 
       liquibase.update(new Contexts(), new LabelExpression())
+
     } catch {
       case e: SQLTimeoutException =>
         val isCertProblem = Throwables.getRootCause(e).isInstanceOf[SunCertPathBuilderException]

http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/monitor/LeoMetricsMonitor.scala

@@ -365,19 +365,7 @@ class LeoMetricsMonitor[F[_]](config: LeoMetricsMonitorConfig,
                 val labelSelector = s"leoAppName=${app.appName.value}"
                 for {
                   pods <- F.blocking(
-                    client.listNamespacedPod(namespace.value,
-                                             null,
-                                             null,
-                                             null,
-                                             null,
-                                             labelSelector,
-                                             null,
-                                             null,
-                                             null,
-                                             null,
-                                             null,
-                                             null
-                    )
+                    client.listNamespacedPod(namespace.value).labelSelector(labelSelector).execute()
                   )
                   res = pods.getItems.asScala.flatMap { pod =>
                     pod.getMetadata.getLabels.asScala.get("leoServiceName").toList.flatMap { service =>

http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/util/KubernetesInterpreter.scala

@@ -80,25 +80,13 @@
       ctx <- ev.ask
       call =
         F.blocking(
-          client.listNamespacedPod(namespace.name.value,
-                                   "true",
-                                   null,
-                                   null,
-                                   null,
-                                   null,
-                                   null,
-                                   null,
-                                   null,
-                                   null,
-                                   null,
-                                   null
-          )
+          client.listNamespacedPod(namespace.name.value).pretty("true").execute()
         )
 
       response <- withLogging(
         call,
         Some(ctx.traceId),
-        s"io.kubernetes.client.apis.CoreV1Api.listNamespacedPod(${namespace.name.value}, true, null, null, null, null, null, null, null, null)"
+        s"io.kubernetes.client.apis.CoreV1Api.listNamespacedPod(${namespace.name.value})"
       )
 
       listPodStatus: List[PodStatus] = response.getItems.asScala.toList.flatMap(v1Pod =>
@@ -115,12 +103,10 @@
       ctx <- ev.ask
       call = F
         .blocking(
-          client.createNamespace(new V1Namespace().metadata(new V1ObjectMeta().name(namespace.name.value)),
-                                 "true",
-                                 null,
-                                 null,
-                                 null
-          )
+          client
+            .createNamespace(new V1Namespace().metadata(new V1ObjectMeta().name(namespace.name.value)))
+            .pretty("true")
+            .execute()
         )
         .void
       _ <- withLogging(
@@ -138,15 +124,7 @@
       call =
         recoverF(
           F.blocking(
-            client.deleteNamespace(
-              namespace.name.value,
-              "true",
-              null,
-              null,
-              null,
-              null,
-              null
-            )
+            client.deleteNamespace(namespace.name.value).pretty("true").execute()
           ).void
             .recoverWith {
               case e: com.google.gson.JsonSyntaxException
@@ -179,9 +157,7 @@
       ctx <- ev.ask
       call =
         recoverF(
-          F.blocking(
-            client.listNamespace("true", false, null, null, null, null, null, null, null, null, false)
-          ),
+          F.blocking(client.listNamespace().pretty("true").allowWatchBookmarks(false).watch(false).execute()),
           whenStatusCode(409)
         )
       v1NamespaceList <- withLogging(

http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/monitor/LeoMetricsMonitorSpec.scala

@@ -49,7 +49,7 @@ import org.broadinstitute.dsde.workbench.leonardo.{
 import org.broadinstitute.dsde.workbench.model.{IP, TraceId}
 import org.broadinstitute.dsde.workbench.model.google.GoogleProject
 import org.mockito.ArgumentMatchers.{any, anyString}
-import org.mockito.Mockito.when
+import org.mockito.Mockito.{mock, when}
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatestplus.mockito.MockitoSugar
 
@@ -750,6 +750,8 @@ class LeoMetricsMonitorSpec extends AnyFlatSpec with LeonardoTestSuite with Test
     val spec = mock[V1PodSpec]
     val container = mock[V1Container]
     val kube = mock[KubernetesAlgebra[IO]]
+
+    val mockRequest = mock[client.APIlistNamespacedPodRequest]
     when {
       container.getResources
     } thenReturn new V1ResourceRequirements()
@@ -772,8 +774,14 @@ class LeoMetricsMonitorSpec extends AnyFlatSpec with LeonardoTestSuite with Test
       podList.getItems
     } thenReturn List(pod).asJava
     when {
-      client.listNamespacedPod(any, any, any, any, any, any, any, any, any, any, any, any)
+      mockRequest.execute()
     } thenReturn podList
+    when {
+      mockRequest.labelSelector(any[String])
+    } thenReturn mockRequest
+    when {
+      client.listNamespacedPod(any[String])
+    } thenReturn mockRequest
     when {
       kube.createAzureClient(any, any[String].asInstanceOf[AKSClusterName])(any)
     } thenReturn IO.pure(client)

project/Dependencies.scala

@@ -17,14 +17,14 @@ object Dependencies {
   val munitCatsEffectV = "1.0.7"
   val pact4sV = "0.10.0"
 
-  private val workbenchLibsHash = "9138393"
+  private val workbenchLibsHash = "3cea4eb"
   val serviceTestV = s"5.0-$workbenchLibsHash"
   val workbenchModelV = s"0.20-$workbenchLibsHash"
   val workbenchGoogleV = s"0.32-$workbenchLibsHash"
   val workbenchGoogle2V = s"0.36-$workbenchLibsHash"
   val workbenchOpenTelemetryV = s"0.8-$workbenchLibsHash"
   val workbenchOauth2V = s"0.7-$workbenchLibsHash"
-  val workbenchAzureV = s"0.7-$workbenchLibsHash"
+  val workbenchAzureV = s"0.8-$workbenchLibsHash"
 
   val helmScalaSdkV = "0.0.8.5"
 
@@ -108,7 +108,9 @@ object Dependencies {
   val workbenchAzureTest: ModuleID =  "org.broadinstitute.dsde.workbench" %% "workbench-azure"  % workbenchAzureV % "test" classifier "tests"
   val workbenchOpenTelemetry: ModuleID =     "org.broadinstitute.dsde.workbench" %% "workbench-opentelemetry" % workbenchOpenTelemetryV excludeAll (
     excludeIoGrpc,
-    excludeGuava)
+    excludeGuava
+  )
+
   val workbenchOpenTelemetryTest: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-opentelemetry" % workbenchOpenTelemetryV % Test classifier "tests" excludeAll (excludeGuava)
 
   val helmScalaSdk: ModuleID = "org.broadinstitute.dsp" %% "helm-scala-sdk" % helmScalaSdkV
@@ -134,7 +136,7 @@ object Dependencies {
   val okHttp =            "com.squareup.okhttp3"  % "okhttp"            % "4.12.0"
 
   val workSpaceManagerV = "0.254.1127-SNAPSHOT"
-  val terraCommonLibV = "0.0.94-SNAPSHOT"
+  val terraCommonLibV = "1.1.17-SNAPSHOT"
   val bpmV = "0.1.548-SNAPSHOT"
 
   def excludeJakartaActivationApi = ExclusionRule("jakarta.activation", "jakarta.activation-api")
@@ -149,9 +151,12 @@ object Dependencies {
   def excludeBroadWorkbench = ExclusionRule("org.broadinstitute.dsde.workbench")
   def excludePostgresql = ExclusionRule("org.postgresql", "postgresql")
   def excludeSnakeyaml = ExclusionRule("org.yaml", "snakeyaml")
+  def excludeLiquibase = ExclusionRule("org.liquibase", "liquibase-core")
+
+
   // [IA-4939] commons-text:1.9 is unsafe
   def excludeCommonsText = ExclusionRule("org.apache.commons", "commons-text")
-  def tclExclusions(m: ModuleID): ModuleID = m.excludeAll(excludeSpringBoot, excludeSpringAop, excludeSpringData, excludeSpringFramework, excludeOpenCensus, excludeGoogleFindBugs, excludeBroadWorkbench, excludePostgresql, excludeSnakeyaml, excludeSlf4j, excludeCommonsText)
+  def tclExclusions(m: ModuleID): ModuleID = m.excludeAll(excludeSpringBoot, excludeSpringAop, excludeSpringData, excludeSpringFramework, excludeOpenCensus, excludeGoogleFindBugs, excludeBroadWorkbench, excludePostgresql, excludeSnakeyaml, excludeSlf4j, excludeCommonsText, excludeLiquibase)
   val workspaceManager = excludeJakarta("bio.terra" % "workspace-manager-client" % workSpaceManagerV)
   val bpm = excludeJakarta("bio.terra" % "billing-profile-manager-client" % bpmV)
   val terraCommonLib = tclExclusions(excludeJakarta("bio.terra" % "terra-common-lib" % terraCommonLibV classifier "plain"))

project/Merging.scala

@@ -2,6 +2,7 @@ import sbtassembly.{MergeStrategy, PathList}
 
 object Merging {
   def customMergeStrategy(oldStrategy: (String) => MergeStrategy): (String => MergeStrategy) = {
+    case PathList("META-INF", "spring-configuration-metadata.json") => MergeStrategy.first
     // For the following error:
     // [error] Deduplicate found different file contents in the following:
     // [error]   Jar name = auto-value-1.10.1.jar, jar org = com.google.auto.value, entry target = META-INF/kotlin-stdlib.kotlin_module