Added better elastic container

kotest-extensions-testcontainers-elastic/src/main/kotlin/io/kotest/extensions/testcontainers/elastic/ElasticsearchContainerExtension.kt

@@ -0,0 +1,51 @@
+package io.kotest.extensions.testcontainers.elastic
+
+import co.elastic.clients.elasticsearch.ElasticsearchClient
+import co.elastic.clients.json.jackson.JacksonJsonpMapper
+import co.elastic.clients.transport.rest_client.RestClientTransport
+import io.kotest.core.extensions.MountableExtension
+import io.kotest.core.listeners.AfterProjectListener
+import io.kotest.core.listeners.AfterSpecListener
+import io.kotest.core.spec.Spec
+import io.kotest.extensions.testcontainers.TestContainerLifecycleMode
+import org.apache.http.HttpHost
+import org.elasticsearch.client.RestClient
+import org.testcontainers.elasticsearch.ElasticsearchContainer
+import org.testcontainers.utility.DockerImageName
+
+class ElasticsearchContainerExtension(
+   private val container: ElasticsearchContainer,
+   private val mode: TestContainerLifecycleMode = TestContainerLifecycleMode.Project,
+) : AfterProjectListener,
+   AfterSpecListener,
+   MountableExtension<ElasticsearchContainer, ElasticsearchContainer>,
+   AutoCloseable {
+
+   constructor(
+      image: DockerImageName,
+      mode: TestContainerLifecycleMode = TestContainerLifecycleMode.Project
+   ) : this(ElasticsearchContainer(image), mode)
+
+   override suspend fun afterProject() {
+      if (container.isRunning) close()
+   }
+
+   override suspend fun afterSpec(spec: Spec) {
+      if (mode == TestContainerLifecycleMode.Spec && container.isRunning) close()
+   }
+
+   override fun mount(configure: ElasticsearchContainer.() -> Unit): ElasticsearchContainer {
+      container.start()
+      return container
+   }
+
+   override fun close() {
+      container.stop()
+   }
+}
+
+fun ElasticsearchContainer.client(): ElasticsearchClient {
+   val restClient = RestClient.builder(HttpHost.create(httpHostAddress)).build()
+   val transport = RestClientTransport(restClient, JacksonJsonpMapper())
+   return ElasticsearchClient(transport)
+}

kotest-extensions-testcontainers-elastic/src/test/kotlin/io/kotest/extensions/testcontainers/elastic/ElasticTestContainerExtensionTest.kt

@@ -7,18 +7,19 @@ import co.elastic.clients.elasticsearch.indices.CreateIndexRequest
 import io.kotest.core.extensions.install
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
-import org.testcontainers.elasticsearch.ElasticsearchContainer
 import org.testcontainers.utility.DockerImageName
 
 class ElasticTestContainerExtensionTest : FunSpec() {
    init {
 
-      val container = ElasticsearchContainer(
-         DockerImageName.parse("elasticsearch:7.17.6")
-            .asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch")
+      val container = install(
+         ElasticsearchContainerExtension(
+            DockerImageName.parse("elasticsearch:7.17.6")
+               .asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch")
+         )
       )
 
-      val client = install(ElasticTestContainerExtension(container))
+      val client = container.client()
 
       test("elastic happy path") {
 

kotest-extensions-testcontainers-kafka/src/main/kotlin/io/kotest/extensions/testcontainers/kafka/KafkaContainerExtension.kt

@@ -14,6 +14,7 @@ import org.apache.kafka.common.serialization.BytesDeserializer
 import org.apache.kafka.common.serialization.BytesSerializer
 import org.apache.kafka.common.utils.Bytes
 import org.testcontainers.containers.KafkaContainer
+import org.testcontainers.utility.DockerImageName
 import java.util.Properties
 
 class KafkaContainerExtension(
@@ -24,6 +25,11 @@ class KafkaContainerExtension(
    MountableExtension<KafkaContainer, KafkaContainer>,
    AutoCloseable {
 
+   constructor(
+      image: DockerImageName,
+      mode: TestContainerLifecycleMode = TestContainerLifecycleMode.Project
+   ) : this(KafkaContainer(image), mode)
+
    override suspend fun afterProject() {
       if (container.isRunning) close()
    }

src/main/kotlin/io/kotest/extensions/testcontainers/LifecycleMode.kt

@@ -1,5 +1,6 @@
 package io.kotest.extensions.testcontainers
 
+@Deprecated("To be removed")
 enum class LifecycleMode {
    Spec, EveryTest, Leaf, Root
 }