ComposeContainer (#372)

sideeffffect · Oct 14, 2024 · f0e12ee · f0e12ee
1 parent c76b9c7
commit f0e12ee
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.8.0")
-addSbtPlugin("com.github.sideeffffect" % "sbt-decent-scala" % "1.0.27-1-d4333dfd")
+addSbtPlugin("com.github.sideeffffect" % "sbt-decent-scala" % "1.0.57-2-c02df126")
diff --git a/src/main/scala/zio/testcontainers/ZIOTestcontainers.scala b/src/main/scala/zio/testcontainers/ZIOTestcontainers.scala
@@ -1,12 +1,19 @@
 package zio.testcontainers
 
 import com.dimafeng.testcontainers.{DockerComposeContainer, SingleContainer}
-import org.testcontainers.containers.{GenericContainer => JavaGenericContainer}
+import org.testcontainers.containers.{ComposeContainer, GenericContainer => JavaGenericContainer}
 import org.testcontainers.lifecycle.Startable
 import zio.{Scope, Tag, UIO, ULayer, URIO, ZIO, ZLayer}
 
 object ZIOTestcontainers {
 
+  def getHostAndPort(
+      container: ComposeContainer
+  )(serviceName: String)(servicePort: Int): UIO[(String, Int)] = for {
+    host <- ZIO.succeed(container.getServiceHost(serviceName, servicePort))
+    port <- ZIO.succeed(container.getServicePort(serviceName, servicePort))
+  } yield (host, port)
+
   def getHostAndPort(
       container: DockerComposeContainer
   )(serviceName: String)(servicePort: Int): UIO[(String, Int)] = for {

diff --git a/src/main/scala/zio/testcontainers/package.scala b/src/main/scala/zio/testcontainers/package.scala
@@ -1,11 +1,18 @@
 package zio
 
 import com.dimafeng.testcontainers.{DockerComposeContainer, SingleContainer}
-import org.testcontainers.containers.{GenericContainer => JavaGenericContainer}
+import org.testcontainers.containers.{ComposeContainer, GenericContainer => JavaGenericContainer}
 import org.testcontainers.lifecycle.Startable
 
 package object testcontainers {
 
+  implicit final class ComposeContainerOps(private val container: ComposeContainer) extends AnyVal {
+
+    def getHostAndPort(serviceName: String)(servicePort: Int): UIO[(String, Int)] =
+      ZIOTestcontainers.getHostAndPort(container)(serviceName)(servicePort)
+
+  }
+
   implicit final class DockerComposeContainerOps(private val container: DockerComposeContainer) extends AnyVal {
 
     def getHostAndPort(serviceName: String)(servicePort: Int): UIO[(String, Int)] =