Cross-compile with scala 3 (#146)

* bump scalatest

* actualy commit the changes 🤦

* toDockerContainer() always adds a HostConfig -- how did this test pass before???

* kafka container needs hostname to match advertised listeners

* Manually trigger for github actions

Co-authored-by: C.Solovev <[email protected]>

Author: hughsimpson

.github/workflows/ci.yaml

@@ -1,6 +1,6 @@
 name: CI
 on:
-  push:
+  [ push, workflow_dispatch ]
 jobs:
   test:
     runs-on: ubuntu-latest

README.md

@@ -202,7 +202,7 @@ class MyMongoSpec extends FlatSpec with Matchers with DockerMongodbService {
 class AllAtOnceSpec extends FlatSpec with Matchers with BeforeAndAfterAll with GivenWhenThen with ScalaFutures
     with DockerElasticsearchService with DockerCassandraService with DockerNeo4jService with DockerMongodbService {
 
-  implicit val pc = PatienceConfig(Span(20, Seconds), Span(1, Second))
+  implicit val pc: PatienceConfig = PatienceConfig(Span(20, Seconds), Span(1, Second))
 
   "all containers" should "be ready at the same time" in {
     dockerContainers.map(_.image).foreach(println)

build.sbt

@@ -1,8 +1,8 @@
 lazy val commonSettings = Seq(
   organization := "com.whisk",
   version := "0.9.9",
-  scalaVersion := "2.13.5",
-  crossScalaVersions := Seq("2.13.5", "2.12.8", "2.11.12"),
+  scalaVersion := "2.13.6",
+  crossScalaVersions := Seq("2.13.6", "2.12.15", "2.11.12", "3.0.2"),
   scalacOptions ++= Seq("-feature", "-deprecation"),
   Test / fork := true,
   licenses += ("MIT", url("http://opensource.org/licenses/MIT")),
@@ -36,7 +36,14 @@ lazy val root =
     .in(file("."))
     .settings(commonSettings: _*)
     .settings(publish := {}, publishLocal := {}, packagedArtifacts := Map.empty)
-    .aggregate(core, testkitSpotifyImpl, testkitSpotifyShadedImpl, testkitDockerJavaImpl, config, scalatest, specs2, samples)
+    .aggregate(core,
+               testkitSpotifyImpl,
+               testkitSpotifyShadedImpl,
+               testkitDockerJavaImpl,
+               config,
+               scalatest,
+               specs2,
+               samples)
 
 lazy val core =
   project
@@ -58,12 +65,13 @@ lazy val testkitSpotifyShadedImpl =
   project
     .in(file("impl/spotify"))
     .settings(commonSettings: _*)
-    .settings(name := "docker-testkit-impl-spotify-shaded",
-              libraryDependencies ++=
-                Seq("com.spotify" % "docker-client" % "8.11.5" classifier "shaded",
-                    "com.google.code.findbugs" % "jsr305" % "3.0.1"),
-              target := baseDirectory.value / "target-shaded"
-              )
+    .settings(
+      name := "docker-testkit-impl-spotify-shaded",
+      libraryDependencies ++=
+        Seq("com.spotify" % "docker-client" % "8.11.5" classifier "shaded",
+            "com.google.code.findbugs" % "jsr305" % "3.0.1"),
+      target := baseDirectory.value / "target-shaded"
+    )
     .dependsOn(core)
 
 lazy val testkitDockerJavaImpl =
@@ -90,9 +98,12 @@ lazy val scalatest =
     .settings(
       name := "docker-testkit-scalatest",
       libraryDependencies ++=
-        Seq("org.scalatest" %% "scalatest" % "3.0.8",
-            "ch.qos.logback" % "logback-classic" % "1.2.1" % "test",
-            "org.postgresql" % "postgresql" % "9.4.1210" % "test")
+        Seq(
+          "org.scalatest" %% "scalatest" % "3.2.9",
+          "ch.qos.logback" % "logback-classic" % "1.2.1" % "test",
+          "org.postgresql" % "postgresql" % "9.4.1210" % "test",
+          "javax.activation" % "activation" % "1.1.1" % "test"
+        )
     )
     .dependsOn(core, testkitSpotifyShadedImpl % "test", testkitDockerJavaImpl % "test", samples % "test")
 
@@ -102,9 +113,13 @@ lazy val specs2 =
     .settings(
       name := "docker-testkit-specs2",
       libraryDependencies ++=
-        Seq("org.specs2" %% "specs2-core" % "4.5.1",
-            "ch.qos.logback" % "logback-classic" % "1.2.1" % "test",
-            "org.postgresql" % "postgresql" % "9.4.1210" % "test")
+        Seq(
+          "org.specs2" %% "specs2-core" % (if (scalaVersion.value.startsWith("2.1")) "4.5.1"
+                                           else "5.0.0-RC-11"),
+          "ch.qos.logback" % "logback-classic" % "1.2.1" % "test",
+          "org.postgresql" % "postgresql" % "9.4.1210" % "test",
+          "javax.activation" % "activation" % "1.1.1" % "test"
+        )
     )
     .dependsOn(core, samples % "test", testkitDockerJavaImpl % "test")
 
@@ -114,9 +129,6 @@ lazy val config =
     .settings(
       name := "docker-testkit-config",
       libraryDependencies ++=
-        Seq(
-          "com.iheart" %% "ficus" % "1.4.7",
-          "org.scalatest" %% "scalatest" % "3.0.8" % "test"
-        )
+        Seq("com.typesafe" % "config" % "1.4.1", "org.scalatest" %% "scalatest" % "3.2.9" % "test")
     )
     .dependsOn(core, testkitDockerJavaImpl)

config/src/main/scala/com/whisk/docker/config/DockerKitConfig.scala

@@ -1,16 +1,69 @@
 package com.whisk.docker.config
 
-import com.typesafe.config.ConfigFactory
-import com.whisk.docker.DockerContainer
+import scala.collection.JavaConverters._
+
+import com.typesafe.config.{Config, ConfigFactory}
+import com.whisk.docker.{DockerContainer, VolumeMapping}
 import com.whisk.docker.config.DockerTypesafeConfig._
 import com.whisk.docker.impl.dockerjava.DockerKitDockerJava
-import net.ceedubs.ficus.Ficus._
-import net.ceedubs.ficus.readers.ArbitraryTypeReader._
 
 trait DockerKitConfig extends DockerKitDockerJava {
   def dockerConfig = ConfigFactory.load()
 
+  implicit class RichConfig(c: Config) {
+    def getOpt[T](fn: (Config, String) => T, path: String): Option[T] =
+      if (c.hasPath(path)) Some(fn(c, path)) else None
+  }
+
+  private def toPortMapping(c: Config): DockerConfigPortMap = DockerConfigPortMap(
+    c.getInt("internal"),
+    c.getOpt(_ getInt _, "external")
+  )
+  private def toPortMappings(c: Config): Map[String, DockerConfigPortMap] =
+    c.entrySet()
+      .asScala
+      .map { e =>
+        val k = e.getKey.split('.').head
+        k -> toPortMapping(c.getConfig(k))
+      }
+      .toMap
+  private def toReadyCheckerLooped(c: Config): DockerConfigReadyCheckerLooped =
+    DockerConfigReadyCheckerLooped(c.getInt("attempts"), c.getInt("delay"))
+  private def toReadyResponse(c: Config): DockerConfigHttpResponseReady =
+    DockerConfigHttpResponseReady(
+      c.getInt("port"),
+      c.getOpt(_ getString _, "path") getOrElse "/",
+      c.getOpt(_ getString _, "host"),
+      c.getOpt(_ getInt _, "code").getOrElse(200),
+      c.getOpt(_ getInt _, "within"),
+      c.getOpt((c, s) => toReadyCheckerLooped(c.getConfig(s)), "looped")
+    )
+  private def toReadyChecker(c: Config): DockerConfigReadyChecker = DockerConfigReadyChecker(
+    c.getOpt(_ getString _, "log-line"),
+    c.getOpt((c, s) => toReadyResponse(c.getConfig(s)), "http-response-code")
+  )
+  private def toVolumeMaps(c: Config): VolumeMapping =
+    VolumeMapping(c.getString("host"),
+                  c.getString("container"),
+                  c.getOpt(_ getBoolean _, "rw").getOrElse(false))
+  private def toDockerConfig(c: Config): DockerConfig = DockerConfig(
+    c.getString("image-name"),
+    c.getOpt(_ getString _, "container-name"),
+    c.getOpt((c, s) => c.getStringList(s).asScala.toSeq, "command"),
+    c.getOpt((c, s) => c.getStringList(s).asScala.toSeq, "entrypoint"),
+    c.getOpt((c, s) => c.getStringList(s).asScala.toSeq, "environmental-variables")
+      .getOrElse(Nil),
+    c.getOpt((c, s) => toPortMappings(c.getConfig(s)), "port-maps"),
+    c.getOpt((c, s) => toReadyChecker(c.getConfig(s)), "ready-checker"),
+    c.getOpt((c, s) => c.getConfigList(s).asScala.toSeq.map(toVolumeMaps), "volume-maps")
+      .getOrElse(Nil),
+    c.getOpt(_ getLong _, "memory"),
+    c.getOpt(_ getLong _, "memory-reservation")
+  )
   def configureDockerContainer(configurationName: String): DockerContainer = {
-    dockerConfig.as[DockerConfig](configurationName).toDockerContainer()
+    val config =
+      if (configurationName == "." || configurationName == "") dockerConfig
+      else dockerConfig.getConfig(configurationName)
+    toDockerConfig(config).toDockerContainer()
   }
 }

config/src/test/scala/com/whisk/docker/config/test/DockerConfigSpec.scala

@@ -2,11 +2,12 @@ package com.whisk.docker.config.test
 
 import com.whisk.docker.{DockerContainer, DockerReadyChecker, HostConfig, VolumeMapping}
 import com.whisk.docker.config.DockerKitConfig
-import org.scalatest._
 
 import scala.concurrent.duration._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class DockerConfigSpec extends FlatSpec with Matchers with DockerKitConfig {
+class DockerConfigSpec extends AnyFlatSpec with Matchers with DockerKitConfig {
 
   "Config-based configurations" should "produce same containers as code-based ones" in {
     val volumes = Seq(
@@ -26,11 +27,9 @@ class DockerConfigSpec extends FlatSpec with Matchers with DockerKitConfig {
       .withPorts((5432, None))
       .withEnv(s"POSTGRES_USER=nph", s"POSTGRES_PASSWORD=suitup")
       .withReadyChecker(
-        DockerReadyChecker.LogLineContains("database system is ready to accept connections")
-      )
+        DockerReadyChecker.LogLineContains("database system is ready to accept connections"))
       .withHostConfig(HostConfig(None, None, None))
 
-
     configureDockerContainer("docker.postgres") shouldBe postgresExpected
 
     val mongodbExpected = DockerContainer("mongo:3.0.6")

core/src/main/scala/com/whisk/docker/DockerContainerManager.scala

@@ -11,7 +11,7 @@ class DockerContainerManager(containers: Seq[DockerContainer], executor: DockerC
     implicit ec: ExecutionContext) {
 
   private lazy val log = LoggerFactory.getLogger(this.getClass)
-  private implicit val dockerExecutor = executor
+  private implicit val dockerExecutor: DockerCommandExecutor = executor
 
   private val dockerStatesMap: Map[DockerContainer, DockerContainerState] =
     containers.map(c => c -> new DockerContainerState(c)).toMap

core/src/main/scala/com/whisk/docker/DockerContainerState.scala

@@ -50,7 +50,7 @@ class DockerContainerState(spec: DockerContainer) {
       spec.logLineReceiver.foreach {
         case LogLineReceiver(withErr, f) => docker.withLogStreamLines(s, withErr)(f)
       }
-      runReadyCheck
+      runReadyCheck()
       this
     }
   }
@@ -79,13 +79,13 @@ class DockerContainerState(spec: DockerContainer) {
     id.flatMap(docker.inspectContainer)
 
   def getName()(implicit docker: DockerCommandExecutor, ec: ExecutionContext): Future[String] =
-    getRunningContainer.flatMap {
+    getRunningContainer().flatMap {
       case Some(res) => Future.successful(res.name)
       case None      => Future.failed(new RuntimeException(s"Container ${spec.image} is not running"))
     }
 
   def getIpAddresses()(implicit docker: DockerCommandExecutor,
-                       ec: ExecutionContext): Future[Seq[String]] = getRunningContainer.flatMap {
+                       ec: ExecutionContext): Future[Seq[String]] = getRunningContainer().flatMap {
     case Some(res) => Future.successful(res.ipAddresses)
     case None      => Future.failed(new RuntimeException(s"Container ${spec.image} is not running"))
   }

core/src/main/scala/com/whisk/docker/DockerKit.scala

@@ -25,7 +25,7 @@ trait DockerKit {
     ExecutionContext.fromExecutor(
       Executors.newFixedThreadPool(Math.max(1, dockerContainers.length * 2)))
   }
-  implicit lazy val dockerExecutor = dockerFactory.createExecutor()
+  implicit lazy val dockerExecutor: DockerCommandExecutor = dockerFactory.createExecutor()
 
   lazy val containerManager = new DockerContainerManager(dockerContainers, dockerExecutor)
 

impl/docker-java/src/main/scala/com/whisk/docker/impl/dockerjava/DockerJavaExecutor.scala

@@ -4,14 +4,14 @@ import java.util.concurrent.TimeUnit
 
 import com.github.dockerjava.api.DockerClient
 import com.github.dockerjava.api.exception.NotFoundException
-import com.github.dockerjava.api.model.{PortBinding => _, ContainerPort => _, _}
+import com.github.dockerjava.api.model.{ContainerPort => _, PortBinding => _, _}
 import com.github.dockerjava.core.command.{LogContainerResultCallback, PullImageResultCallback}
 import com.google.common.io.Closeables
 import com.whisk.docker._
-
 import scala.collection.JavaConverters._
 import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.{ExecutionContext, Future, Promise}
+import scala.reflect.ClassTag
 
 class DockerJavaExecutor(override val host: String, client: DockerClient)
     extends DockerCommandExecutor {
@@ -175,7 +175,7 @@ class DockerJavaExecutor(override val host: String, client: DockerClient)
         .listImagesCmd()
         .exec()
         .asScala
-        .flatMap(img => Option(img.getRepoTags).getOrElse(Array()))
+        .flatMap(img => Option(img.getRepoTags).getOrElse(Array.empty(ClassTag(classOf[String]))))
         .toSet)
   }
 

project/plugins.sbt

@@ -3,3 +3,5 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
 
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5")
+
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.18-1")