forked from guardian/grid
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request guardian#4241 from guardian/an/modern-testcontainers
use testcontainers directly instead of docker-testkit
- Loading branch information
Showing
8 changed files
with
86 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
common-lib/src/test/scala/com/gu/mediaservice/testlib/ElasticSearchDockerBase.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
package com.gu.mediaservice.testlib | ||
|
||
import org.scalatest.{BeforeAndAfterAll, Suite} | ||
import org.testcontainers.containers.wait.strategy.Wait | ||
import org.testcontainers.elasticsearch.ElasticsearchContainer | ||
|
||
import scala.util.Properties | ||
import scala.concurrent.duration._ | ||
import scala.compat.java8.DurationConverters._ | ||
import scala.jdk.CollectionConverters._ | ||
|
||
|
||
trait ElasticSearchDockerBase extends BeforeAndAfterAll { | ||
self: Suite => | ||
val useEsDocker = Properties.envOrElse("USE_DOCKER_FOR_TESTS", "true").toBoolean | ||
|
||
val esContainer: Option[ElasticsearchContainer] = if (useEsDocker) { | ||
{ | ||
val container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.16.2") | ||
.withExposedPorts(9200) | ||
.withAccessToHost(true) | ||
.withEnv(Map( | ||
"cluster.name" -> "media-service", | ||
"xpack.security.enabled" -> "false", | ||
"discovery.type" -> "single-node", | ||
"network.host" -> "0.0.0.0" | ||
).asJava) | ||
.waitingFor(Wait.forHttp("/") | ||
.forPort(9200) | ||
.forStatusCode(200) | ||
.withStartupTimeout(180.seconds.toJava) | ||
) | ||
container.start() | ||
Some(container) | ||
} | ||
} else None | ||
|
||
val esPort = esContainer.map(_.getMappedPort(9200)).getOrElse(9200) | ||
val esTestUrl = Properties.envOrElse("ES6_TEST_URL", s"http://localhost:$esPort") | ||
|
||
override protected def afterAll(): Unit = { | ||
super.afterAll() | ||
|
||
esContainer foreach { _.stop() } | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 4 additions & 20 deletions
24
media-api/test/lib/elasticsearch/ElasticSearchTestBase.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters