[CTM-525] new workbench-libs and update ember

automation/src/test/scala/org/broadinstitute/dsde/workbench/GeneratedLeonardoClient.scala

@@ -18,6 +18,8 @@ import org.http4s.client.Client
 import org.http4s.client.middleware.{Logger, Retry, RetryPolicy}
 import org.http4s.headers.Authorization
 import org.http4s.ember.client.EmberClientBuilder
+import org.typelevel.log4cats.LoggerFactory
+import org.typelevel.log4cats.slf4j.Slf4jFactory
 
 import scala.concurrent.duration._
 
@@ -26,6 +28,7 @@ import scala.concurrent.duration._
  * Favor this client over `LeonardoApiClient`
  */
 object GeneratedLeonardoClient {
+  implicit val loggerFactory: LoggerFactory[IO] = Slf4jFactory.create[IO]
   private val rootUri = Uri.fromString(LeonardoConfig.Leonardo.apiUrl)
 
   val client: Resource[IO, Client[IO]] =

automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/LeonardoApiClient.scala

@@ -22,8 +22,8 @@ import org.http4s.client.Client
 import org.http4s.client.middleware.{Logger, Retry, RetryPolicy}
 import org.http4s.ember.client.EmberClientBuilder
 import org.http4s.headers._
-import org.typelevel.log4cats.StructuredLogger
-import org.typelevel.log4cats.slf4j.Slf4jLogger
+import org.typelevel.log4cats.{LoggerFactory, StructuredLogger}
+import org.typelevel.log4cats.slf4j.{Slf4jFactory, Slf4jLogger}
 
 import java.util.UUID
 import java.util.concurrent.TimeoutException
@@ -38,6 +38,7 @@ import scala.util.control.NoStackTrace
 object LeonardoApiClient {
   val defaultMediaType = `Content-Type`(MediaType.application.json)
   implicit val logger: StructuredLogger[IO] = Slf4jLogger.getLogger[IO]
+  implicit val loggerFactory: LoggerFactory[IO] = Slf4jFactory.create[IO]
 
   implicit def http4sBody[A](body: A)(implicit encoder: EntityEncoder[IO, A]): EntityBody[IO] =
     encoder.toEntity(body).body

automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/ProxyRedirectClient.scala

@@ -13,9 +13,12 @@ import org.http4s.headers.{`Content-Type`, Referer}
 import org.http4s.implicits._
 import org.http4s.server.Server
 import org.http4s._
+import org.typelevel.log4cats.LoggerFactory
+import org.typelevel.log4cats.slf4j.Slf4jFactory
 
 // This is for setting `REFERER` header in automation tests
 object ProxyRedirectClient {
+  implicit val loggerFactory: LoggerFactory[IO] = Slf4jFactory.create[IO]
   // serverRef is Singleton http4s server to serve the proxy redirect page.
   // Explanation of the type:
   //   `Ref` is a cats-effect reference, used to cache a single instance of the server

http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/http/BaselineDependenciesBuilder.scala

@@ -55,7 +55,8 @@ import org.broadinstitute.dsde.workbench.util2.messaging.{CloudPublisher, CloudS
 import org.broadinstitute.dsp.HelmInterpreter
 import org.http4s.Request
 import org.http4s.client.middleware.{Logger => Http4sLogger, Metrics, Retry, RetryPolicy}
-import org.typelevel.log4cats.StructuredLogger
+import org.typelevel.log4cats.{LoggerFactory, StructuredLogger}
+import org.typelevel.log4cats.slf4j.Slf4jFactory
 import scalacache.Cache
 import scalacache.caffeine.CaffeineCache
 import java.net.SocketException
@@ -119,6 +120,7 @@ class BaselineDependenciesBuilder {
       )(_.close)
 
       cloudAuthTokenProvider = CloudAuthTokenProvider[F](applicationConfig)
+      implicit0(loggerFactory: LoggerFactory[F]) = Slf4jFactory.create[F]
 
       samClientProvider = new HttpSamApiClientProvider(httpSamDaoConfig.samUri.renderString,
                                                        httpSamDaoConfig.maxConcurrentRequests
@@ -299,7 +301,7 @@ class BaselineDependenciesBuilder {
       .recordStats()
       .build[K, V]()
 
-  private def buildHttpClient[F[_]: Async: StructuredLogger: Network](
+  private def buildHttpClient[F[_]: Async: StructuredLogger: Network: LoggerFactory](
     sslContext: SSLContext,
     hostToIpMapping: Ref[F, Map[String, IP]],
     metricsPrefix: Option[String],

http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/dao/HTTPAppDescriptorDAOSpec.scala

@@ -10,10 +10,13 @@ import org.scalatest.matchers.should.Matchers
 import org.http4s.client.Client
 import org.http4s._
 import org.http4s.ember.client.EmberClientBuilder
+import org.typelevel.log4cats.LoggerFactory
+import org.typelevel.log4cats.slf4j.Slf4jFactory
 import org.broadinstitute.dsde.workbench.leonardo.TestUtils.appContext
 import scala.concurrent.ExecutionContext.global
 
 class HTTPAppDescriptorDAOSpec extends AnyFlatSpec with Matchers with BeforeAndAfterAll with LeonardoTestSuite {
+  implicit val loggerFactory: LoggerFactory[IO] = Slf4jFactory.create[IO]
   // NOTE: If this is not a valid link, tests will fail
   val appYamlURI: Uri = Uri.uri("https://raw.githubusercontent.com/DataBiosphere/terra-app/main/apps/rstudio/app.yaml")
   // NOTE: no tests here actually use the http response from this URI

http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/dao/HttpDockerDAOSpec.scala

@@ -12,13 +12,16 @@ import org.broadinstitute.dsde.workbench.leonardo.dao.HttpDockerDAO._
 import org.broadinstitute.dsde.workbench.leonardo.model.InvalidImage
 import org.http4s.ember.client.EmberClientBuilder
 import org.http4s.client.middleware.Logger
+import org.typelevel.log4cats.LoggerFactory
+import org.typelevel.log4cats.slf4j.Slf4jFactory
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import org.broadinstitute.dsde.workbench.leonardo.http.ctxConversion
 import org.broadinstitute.dsde.workbench.leonardo.TestUtils.appContext
 
 class HttpDockerDAOSpec extends AnyFlatSpec with Matchers with BeforeAndAfterAll with LeonardoTestSuite {
+  implicit val loggerFactory: LoggerFactory[IO] = Slf4jFactory.create[IO]
   val jupyterImages = List(
     // TODO this will break if AoU moves off Dockerhub and we delete these images
     // dockerhub with tag

http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/dao/HttpSamDAOSpec.scala

@@ -22,8 +22,8 @@ import org.http4s.client.middleware.{Retry, RetryPolicy}
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatestplus.mockito.MockitoSugar
-import org.typelevel.log4cats.Logger
-import org.typelevel.log4cats.slf4j.Slf4jLogger
+import org.typelevel.log4cats.{Logger, LoggerFactory}
+import org.typelevel.log4cats.slf4j.{Slf4jFactory, Slf4jLogger}
 import scalacache.caffeine.CaffeineCache
 
 import java.util.UUID
@@ -34,6 +34,7 @@ class HttpSamDAOSpec extends AnyFlatSpec with LeonardoTestSuite with BeforeAndAf
   val cloudAuthProvider = mock[CloudAuthTokenProvider[IO]]
   val config = HttpSamDaoConfig(Uri.unsafeFromString("localhost"), false, 1 seconds, 10, 15)
   implicit def unsafeLogger: Logger[IO] = Slf4jLogger.getLogger[IO]
+  implicit val loggerFactory: LoggerFactory[IO] = Slf4jFactory.create[IO]
   val underlyingPetTokenCache = Caffeine
     .newBuilder()
     .maximumSize(httpSamDaoConfig.petCacheMaxSize)

project/Dependencies.scala

@@ -9,7 +9,7 @@ object Dependencies {
   val automationGoogleV = "1.30.5"
   val scalaLoggingV = "3.9.5"
   val scalaTestV = "3.2.17"
-  val http4sVersion = "1.0.0-M38"
+  val http4sVersion = "1.0.0-M45"
   val slickV = "3.4.1"
   val nettyCodecHttpV = "4.1.133.Final"
   val guavaV = "32.1.3-jre"
@@ -19,13 +19,13 @@ object Dependencies {
   val munitCatsEffectV = "1.0.7"
   val commonsBeanUtilsV = "1.11.0"
 
-  private val workbenchLibsHash = "3a18911"
+  private val workbenchLibsHash = "a91095a"
   val serviceTestV = s"6.1-$workbenchLibsHash"
   val workbenchModelV = s"0.21-$workbenchLibsHash"
   val workbenchGoogleV = s"0.35-$workbenchLibsHash"
-  val workbenchGoogle2V = s"0.40-$workbenchLibsHash"
+  val workbenchGoogle2V = s"0.41-$workbenchLibsHash"
   val workbenchOpenTelemetryV = s"0.9-$workbenchLibsHash"
-  val workbenchOauth2V = s"0.9-$workbenchLibsHash"
+  val workbenchOauth2V = s"0.10-$workbenchLibsHash"
 
   val helmScalaSdkV = "0.0.9.1"
 

project/Settings.scala

@@ -90,7 +90,8 @@ object Settings {
     scalaVersion  := "2.13.12",
     resolvers ++= commonResolvers,
     scalacOptions ++= commonCompilerSettings,
-    dependencyOverrides ++= Dependencies.commonOverrides
+    dependencyOverrides ++= Dependencies.commonOverrides,
+    libraryDependencySchemes += "org.http4s" %% "http4s-core" % "always"
   )
 
   val coreSettings = commonSettings ++ commonTestSettings ++ List(