Merge pull request #803 from NDLANO/updgrade-testcontainers

Support newer docker engine

Author: gunnarvelle

integration-tests/src/test/scala/no/ndla/integrationtests/draftapi/articleapi/ArticleApiClientTest.scala

@@ -23,7 +23,7 @@ import no.ndla.network.{AuthUser, NdlaClient}
 import no.ndla.scalatestsuite.{DatabaseIntegrationSuite, ElasticsearchIntegrationSuite}
 import no.ndla.validation.HtmlTagRules
 import no.ndla.{articleapi, draftapi}
-import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
 
 import java.util.UUID
 import java.util.concurrent.Executors
@@ -45,7 +45,7 @@ class ArticleApiClientTest
   val WeNeedThisToMakeTheTestsWorkNoIdeaWhyReadTheComment: Set[String] = HtmlTagRules.PermittedHTML.tags
 
   val articleApiPort: Int                        = findFreePort
-  val pgc: PostgreSQLContainer[?]                = postgresContainer.get
+  val pgc: PostgreSQLContainer                   = postgresContainer.get
   val esHost: String                             = elasticSearchHost.get
   val articleApiProperties: ArticleApiProperties = new ArticleApiProperties {
     override def ApplicationPort: Int              = articleApiPort

integration-tests/src/test/scala/no/ndla/integrationtests/searchapi/articleapi/ArticleApiClientTest.scala

@@ -22,7 +22,7 @@ import no.ndla.searchapi.service.ConverterService
 import no.ndla.searchapi.service.search.SearchConverterService
 import no.ndla.searchapi.{TestData, UnitSuite}
 import no.ndla.{articleapi, searchapi}
-import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
 
 import java.util.concurrent.Executors
 import scala.concurrent.{ExecutionContext, ExecutionContextExecutorService, Future}
@@ -40,7 +40,7 @@ class ArticleApiClientTest
   override implicit lazy val searchConverterService: SearchConverterService = new SearchConverterService
 
   val articleApiPort: Int                        = findFreePort
-  val pgc: PostgreSQLContainer[?]                = postgresContainer.get
+  val pgc: PostgreSQLContainer                   = postgresContainer.get
   val esHost: String                             = elasticSearchHost.get
   val articleApiProperties: ArticleApiProperties = new ArticleApiProperties {
     override def ApplicationPort: Int              = articleApiPort

integration-tests/src/test/scala/no/ndla/integrationtests/searchapi/draftapi/DraftApiClientTest.scala

@@ -23,7 +23,7 @@ import no.ndla.searchapi.service.search.SearchConverterService
 import no.ndla.{draftapi, searchapi}
 import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito.when
-import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
 
 import java.util.concurrent.Executors
 import scala.concurrent.{ExecutionContext, ExecutionContextExecutorService, Future}
@@ -41,7 +41,7 @@ class DraftApiClientTest
   override implicit lazy val DBUtil: DBUtility                              = new DBUtility
 
   val draftApiPort: Int                      = findFreePort
-  val pgc: PostgreSQLContainer[?]            = postgresContainer.get
+  val pgc: PostgreSQLContainer               = postgresContainer.get
   val esHost: String                         = elasticSearchHost.get
   val draftApiProperties: DraftApiProperties = new DraftApiProperties {
     override def ApplicationPort: Int                  = draftApiPort

integration-tests/src/test/scala/no/ndla/integrationtests/searchapi/learningpathapi/LearningpathApiClientTest.scala

@@ -23,7 +23,7 @@ import no.ndla.searchapi.service.search.SearchConverterService
 import no.ndla.{learningpathapi, searchapi}
 import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito.when
-import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
 
 import java.util.concurrent.Executors
 import scala.concurrent.{ExecutionContext, ExecutionContextExecutorService, Future}
@@ -40,7 +40,7 @@ class LearningpathApiClientTest
   override implicit lazy val searchConverterService: SearchConverterService = new SearchConverterService
 
   val learningpathApiPort: Int                             = findFreePort
-  val pgc: PostgreSQLContainer[?]                          = postgresContainer.get
+  val pgc: PostgreSQLContainer                             = postgresContainer.get
   val esHost: String                                       = elasticSearchHost.get
   val learningpathApiProperties: LearningpathApiProperties = new LearningpathApiProperties {
     override def ApplicationPort: Int       = learningpathApiPort

learningpath-api/src/test/scala/no/ndla/learningpathapi/e2e/LearningPathAndStepCreationTests.scala

@@ -21,7 +21,7 @@ import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito.{spy, when, withSettings}
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.quality.Strictness
-import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
 import sttp.client3.quick.*
 
 import java.util.concurrent.Executors
@@ -36,7 +36,7 @@ class LearningPathAndStepCreationTests
     with TestEnvironment {
 
   val learningpathApiPort: Int                             = findFreePort
-  val pgc: PostgreSQLContainer[?]                          = postgresContainer.get
+  val pgc: PostgreSQLContainer                             = postgresContainer.get
   val learningpathApiProperties: LearningpathApiProperties = new LearningpathApiProperties {
     override def ApplicationPort: Int       = learningpathApiPort
     override val MetaServer: Prop[String]   = propFromTestValue("META_SERVER", pgc.getHost)

modules/versions.mill

@@ -19,7 +19,7 @@ object SharedDependencies {
   val SttpV                 = "3.11.0"
   val CirceV                = "0.14.14"
   val ScalikeJDBCV          = "4.3.4"
-  val TestContainersV       = "1.21.1"
+  val TestContainersV       = "2.0.2"
   val JsoupV                = "1.21.2"
   val JavaMelodyV           = "2.5.0"
   val EnumeratumV           = "1.9.0"
@@ -43,9 +43,9 @@ object SharedDependencies {
   def testing: Seq[Dep] = Seq(
     mvn"org.scalatest::scalatest:$ScalaTestV",
     mvn"org.scalatestplus::mockito-5-18:3.2.19.0",
-    mvn"org.testcontainers:elasticsearch:$TestContainersV",
+    mvn"org.testcontainers:testcontainers-elasticsearch:$TestContainersV",
     mvn"org.testcontainers:testcontainers:$TestContainersV",
-    mvn"org.testcontainers:postgresql:$TestContainersV",
+    mvn"org.testcontainers:testcontainers-postgresql:$TestContainersV",
   )
 
   val scalikejdbc = mvn"org.scalikejdbc::scalikejdbc:$ScalikeJDBCV"

myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/CloneFolderTest.scala

@@ -24,7 +24,7 @@ import no.ndla.scalatestsuite.{DatabaseIntegrationSuite, RedisIntegrationSuite}
 import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito.{reset, spy, times, verify, when, withSettings}
 import org.mockito.quality.Strictness
-import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
 import sttp.client3.quick.*
 
 import java.util.UUID
@@ -35,7 +35,7 @@ import scala.util.{Failure, Success}
 
 class CloneFolderTest extends DatabaseIntegrationSuite with RedisIntegrationSuite with UnitSuite with TestEnvironment {
   val myndlaApiPort: Int                                  = findFreePort
-  val pgc: PostgreSQLContainer[?]                         = postgresContainer.get
+  val pgc: PostgreSQLContainer                            = postgresContainer.get
   val redisPort: Int                                      = redisContainer.get.port
   implicit lazy val myndlaproperties: MyNdlaApiProperties = new MyNdlaApiProperties {
     override def ApplicationPort: Int       = myndlaApiPort

myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/FolderTest.scala

@@ -22,7 +22,7 @@ import no.ndla.scalatestsuite.{DatabaseIntegrationSuite, RedisIntegrationSuite}
 import org.mockito.ArgumentMatchers.{any, eq as eqTo}
 import org.mockito.Mockito.{reset, spy, when, withSettings}
 import org.mockito.quality.Strictness
-import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
 import scalikejdbc.DBSession
 import sttp.client3.quick.*
 
@@ -34,7 +34,7 @@ import scala.util.Success
 class FolderTest extends DatabaseIntegrationSuite with RedisIntegrationSuite with UnitSuite with TestEnvironment {
 
   val myndlaApiPort: Int                    = findFreePort
-  val pgc: PostgreSQLContainer[?]           = postgresContainer.get
+  val pgc: PostgreSQLContainer              = postgresContainer.get
   val redisPort: Int                        = redisContainer.get.port
   val myndlaproperties: MyNdlaApiProperties = new MyNdlaApiProperties {
     override def ApplicationPort: Int = myndlaApiPort

scalatestsuite/src/main/scala/no/ndla/scalatestsuite/DatabaseIntegrationSuite.scala

@@ -13,7 +13,7 @@ import no.ndla.common.configuration.BaseProps
 import no.ndla.database.{DataSource, DatabaseProps}
 import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito.when
-import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
 
 import scala.util.{Failure, Success, Try}
 import sys.env
@@ -25,14 +25,14 @@ trait DatabaseIntegrationSuite extends UnitTestSuite with ContainerSuite {
   val PostgresqlVersion: String        = "17.5"
   lazy val schemaName: String          = "testschema"
 
-  val postgresContainer: Try[PostgreSQLContainer[?]] =
+  val postgresContainer: Try[PostgreSQLContainer] =
     if (EnablePostgresContainer) {
       val defaultUsername: String     = "postgres"
       val defaultDatabaseName: String = "postgres"
       val defaultPassword: String     = "hemmelig"
 
       if (skipContainerSpawn) {
-        val x = mock[PostgreSQLContainer[Nothing]]
+        val x = mock[PostgreSQLContainer]
         when(x.getPassword).thenReturn(env.getOrElse("META_PASSWORD", defaultPassword)): Unit
         when(x.getUsername).thenReturn(env.getOrElse("META_USERNAME", defaultUsername)): Unit
         when(x.getDatabaseName).thenReturn(env.getOrElse("META_RESOURCE", defaultDatabaseName)): Unit

scalatestsuite/src/main/scala/no/ndla/scalatestsuite/PgContainer.scala

@@ -8,7 +8,7 @@
 
 package no.ndla.scalatestsuite
 
-import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
 import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy
 
 import java.time.Duration
@@ -17,9 +17,9 @@ case class PgContainer(PostgresqlVersion: String, username: String, password: St
     extends PostgreSQLContainer(s"postgres:$PostgresqlVersion") {
   this.setWaitStrategy(new HostPortWaitStrategy().withStartupTimeout(Duration.ofSeconds(100)))
 
-  def setPassword(password: String): Unit = this.withPassword(password)
-  def setUsername(username: String): Unit = this.withUsername(username)
-  def setDatabase(database: String): Unit = this.withDatabaseName(database)
+  def setPassword(password: String): Unit = this.withPassword(password): Unit
+  def setUsername(username: String): Unit = this.withUsername(username): Unit
+  def setDatabase(database: String): Unit = this.withDatabaseName(database): Unit
 
   def configure(username: String, password: String, databaseName: String): Unit = {
     setUsername(username)