[misk] Refactor misk.containers to eliminate wisp delegation pattern

stuartwdouglas · svc-squareup-copybara · commit 36e20816eb95 · 2025-07-09T22:58:50.000Z
## Summary

`misk.containers` currently delegates to wisp. This PR copies the Wisp
code into Misk and deprecates the Wisp implementation.

GitOrigin-RevId: 2ae0f61cd15292169669548ecbbe10e14a60010c
diff --git a/misk-aws/build.gradle.kts b/misk-aws/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
   implementation(libs.slf4jApi)
   implementation(libs.tracingDatadog)
   implementation(project(":misk-api"))
-  implementation(project(":wisp:wisp-containers-testing"))
+  implementation(project(":misk-testing"))
   implementation(project(":wisp:wisp-deployment"))
   implementation(project(":wisp:wisp-logging"))
   implementation(project(":wisp:wisp-tracing"))
@@ -46,7 +46,7 @@ dependencies {
   testImplementation(libs.kotlinTest)
   testImplementation(libs.mockitoCore)
   testImplementation(libs.mockitoKotlin)
-  testImplementation(project(":wisp:wisp-containers-testing"))
+  testImplementation(project(":misk-testing"))
   testImplementation(project(":wisp:wisp-feature-testing"))
   testImplementation(project(":misk-testing"))
   testImplementation(project(":wisp:wisp-logging-testing"))
diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/QueueResolver.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/QueueResolver.kt
@@ -15,7 +15,7 @@ import java.util.concurrent.ConcurrentHashMap
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
 import misk.moshi.adapter
-import wisp.containers.ContainerUtil
+import misk.containers.ContainerUtil
 
 @Singleton
 internal class QueueResolver @Inject internal constructor(
diff --git a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/DockerSqs.kt b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/DockerSqs.kt
@@ -12,9 +12,9 @@ import com.github.dockerjava.api.model.HostConfig
 import com.github.dockerjava.api.model.Ports
 import misk.jobqueue.sqs.DockerSqs.clientPort
 import misk.testing.ExternalDependency
-import wisp.containers.Composer
-import wisp.containers.Container
-import wisp.containers.ContainerUtil
+import misk.containers.Composer
+import misk.containers.Container
+import misk.containers.ContainerUtil
 import wisp.logging.getLogger
 
 /**
diff --git a/misk-aws2-sqs/build.gradle.kts b/misk-aws2-sqs/build.gradle.kts
@@ -46,7 +46,6 @@ dependencies {
   testImplementation(libs.mockitoKotlin)
   testImplementation(project(":misk-clustering"))
   testImplementation(project(":misk-testing"))
-  testImplementation(project(":wisp:wisp-containers-testing"))
   testImplementation(project(":wisp:wisp-feature-testing"))
   testImplementation(project(":wisp:wisp-time-testing"))
   testImplementation(project(":wisp:wisp-logging-testing"))
diff --git a/misk-aws2-sqs/src/test/kotlin/misk/aws2/sqs/jobqueue/DockerSqs.kt b/misk-aws2-sqs/src/test/kotlin/misk/aws2/sqs/jobqueue/DockerSqs.kt
@@ -11,9 +11,9 @@ import software.amazon.awssdk.services.sqs.SqsAsyncClient
 import software.amazon.awssdk.services.sqs.model.DeleteQueueRequest
 import software.amazon.awssdk.services.sqs.model.GetQueueUrlRequest
 import software.amazon.awssdk.services.sqs.model.QueueDoesNotExistException
-import wisp.containers.Composer
-import wisp.containers.Container
-import wisp.containers.ContainerUtil
+import misk.containers.Composer
+import misk.containers.Container
+import misk.containers.ContainerUtil
 import wisp.logging.getLogger
 import java.net.URI
 import java.util.concurrent.CompletableFuture
diff --git a/misk-gcp/build.gradle.kts b/misk-gcp/build.gradle.kts
@@ -80,7 +80,6 @@ dependencies {
   testFixturesImplementation(libs.kotlinTest)
   testFixturesImplementation(libs.kotlinxCoroutinesCore)
   testFixturesImplementation(libs.moshiCore)
-  testFixturesImplementation(project(":wisp:wisp-containers-testing"))
   testFixturesImplementation(project(":wisp:wisp-moshi"))
   testFixturesImplementation(project(":misk-service"))
   testFixturesImplementation(project(":misk-testing"))
@@ -93,7 +92,7 @@ dependencies {
   testImplementation(libs.junitApi)
   testImplementation(libs.kotlinTest)
   testImplementation(libs.openTracingDatadog)
-  testImplementation(project(":wisp:wisp-containers-testing"))
+  testImplementation(project(":misk-testing"))
   testImplementation(project(":wisp:wisp-tracing"))
   testImplementation(project(":misk-gcp"))
   testImplementation(project(":misk-testing"))
@@ -111,7 +110,7 @@ dependencies {
   testImplementation(libs.kotlinTest)
   testImplementation(libs.kotlinxCoroutinesCore)
   testImplementation(libs.moshiCore)
-  testImplementation(project(":wisp:wisp-containers-testing"))
+  testImplementation(project(":misk-testing"))
   testImplementation(project(":wisp:wisp-moshi"))
   testImplementation(project(":misk-service"))
   testImplementation(project(":misk-testing"))
diff --git a/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulatorLifecycleTest.kt b/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulatorLifecycleTest.kt
@@ -15,7 +15,7 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertDoesNotThrow
-import wisp.containers.ContainerUtil
+import misk.containers.ContainerUtil
 import java.time.Duration
 import jakarta.inject.Inject
 import misk.environment.DeploymentModule
diff --git a/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulatorTest.kt b/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulatorTest.kt
@@ -12,7 +12,7 @@ import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import wisp.containers.ContainerUtil
+import misk.containers.ContainerUtil
 import jakarta.inject.Inject
 import org.junit.jupiter.api.RepeatedTest
 
diff --git a/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerModuleTest.kt b/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerModuleTest.kt
@@ -11,7 +11,7 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Order
 import org.junit.jupiter.api.Test
-import wisp.containers.ContainerUtil
+import misk.containers.ContainerUtil
 import wisp.deployment.TESTING
 import jakarta.inject.Inject
 
diff --git a/misk-jdbc/build.gradle.kts b/misk-jdbc/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
   implementation(project(":misk-backoff"))
   implementation(project(":misk-docker"))
   implementation(project(":misk-service"))
-  implementation(project(":wisp:wisp-containers-testing"))
+  implementation(project(":misk-testing"))
   implementation(project(":wisp:wisp-logging"))
   implementation(project(":wisp:wisp-moshi"))
   implementation(libs.jsqlparser)
@@ -49,7 +49,7 @@ dependencies {
   testFixturesImplementation(libs.hikariCp)
   testFixturesImplementation(libs.loggingApi)
   testFixturesImplementation(libs.okio)
-  testFixturesImplementation(project(":wisp:wisp-containers-testing"))
+  testFixturesImplementation(project(":misk-testing"))
   testFixturesImplementation(project(":wisp:wisp-deployment"))
   testFixturesImplementation(project(":wisp:wisp-logging"))
   testFixturesImplementation(project(":misk"))
@@ -65,7 +65,7 @@ dependencies {
   testImplementation(libs.mockitoCore)
   testImplementation(libs.openTracingDatadog)
   testImplementation(libs.openTracingMock)
-  testImplementation(project(":wisp:wisp-containers-testing"))
+  testImplementation(project(":misk-testing"))
   testImplementation(project(":misk-jdbc"))
   testImplementation(project(":misk-testing"))
   testImplementation(testFixtures(project(":misk-jdbc")))
@@ -74,7 +74,7 @@ dependencies {
   testImplementation(libs.hikariCp)
   testImplementation(libs.loggingApi)
   testImplementation(libs.okio)
-  testImplementation(project(":wisp:wisp-containers-testing"))
+  testImplementation(project(":misk-testing"))
   testImplementation(project(":wisp:wisp-deployment"))
   testImplementation(project(":wisp:wisp-logging"))
   testImplementation(project(":misk"))
diff --git a/misk-jdbc/src/main/kotlin/misk/jdbc/DataSourceConfig.kt b/misk-jdbc/src/main/kotlin/misk/jdbc/DataSourceConfig.kt
@@ -2,7 +2,7 @@ package misk.jdbc
 
 import misk.config.Redact
 import wisp.config.Config
-import wisp.containers.ContainerUtil
+import misk.containers.ContainerUtil
 import wisp.deployment.Deployment
 import java.time.Duration
 
diff --git a/misk-jdbc/src/test/kotlin/misk/jdbc/DataSourceConfigTest.kt b/misk-jdbc/src/test/kotlin/misk/jdbc/DataSourceConfigTest.kt
@@ -2,7 +2,7 @@ package misk.jdbc
 
 import misk.vitess.testing.DefaultSettings
 import org.junit.jupiter.api.Test
-import wisp.containers.ContainerUtil
+import misk.containers.ContainerUtil
 import wisp.deployment.TESTING
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
diff --git a/misk-redis-lettuce/build.gradle.kts b/misk-redis-lettuce/build.gradle.kts
@@ -41,7 +41,6 @@ dependencies {
   testImplementation(testFixtures(project(":misk-redis-lettuce")))
 
   testFixturesImplementation(project(":misk-testing"))
-  testFixturesImplementation(project(":wisp:wisp-containers-testing"))
   testFixturesImplementation(project(":wisp:wisp-logging"))
 
 }
diff --git a/misk-redis-lettuce/src/testFixtures/kotlin/misk/redis/lettuce/cluster/testing/DockerRedisCluster.kt b/misk-redis-lettuce/src/testFixtures/kotlin/misk/redis/lettuce/cluster/testing/DockerRedisCluster.kt
@@ -11,8 +11,8 @@ import misk.redis.lettuce.cluster.redisClusterClient
 import misk.redis.lettuce.cluster.withConnectionBlocking
 import misk.redis.lettuce.redisUri
 import misk.testing.ExternalDependency
-import wisp.containers.Composer
-import wisp.containers.Container
+import misk.containers.Composer
+import misk.containers.Container
 import wisp.logging.getLogger
 import java.util.concurrent.TimeoutException
 import kotlin.time.Duration.Companion.milliseconds
diff --git a/misk-redis-lettuce/src/testFixtures/kotlin/misk/redis/lettuce/testing/standalone/DockerRedis.kt b/misk-redis-lettuce/src/testFixtures/kotlin/misk/redis/lettuce/testing/standalone/DockerRedis.kt
@@ -11,8 +11,8 @@ import misk.redis.lettuce.redisUri
 import misk.redis.lettuce.standalone.redisClient
 import misk.redis.lettuce.standalone.withConnectionBlocking
 import misk.testing.ExternalDependency
-import wisp.containers.Composer
-import wisp.containers.Container
+import misk.containers.Composer
+import misk.containers.Container
 import wisp.logging.getLogger
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
diff --git a/misk-redis/build.gradle.kts b/misk-redis/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
   testFixturesImplementation(libs.guice)
   testFixturesImplementation(libs.loggingApi)
   testFixturesImplementation(libs.okio)
-  testFixturesImplementation(project(":wisp:wisp-containers-testing"))
+  testFixturesImplementation(project(":misk-testing"))
   testFixturesImplementation(project(":wisp:wisp-logging"))
 
   testImplementation(libs.assertj)
@@ -52,7 +52,7 @@ dependencies {
   testImplementation(libs.guice)
   testImplementation(libs.loggingApi)
   testImplementation(libs.okio)
-  testImplementation(project(":wisp:wisp-containers-testing"))
+  testImplementation(project(":misk-testing"))
   testImplementation(project(":wisp:wisp-logging"))
 
   testFixturesImplementation(libs.apacheCommonsPool)
diff --git a/misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedis.kt b/misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedis.kt
@@ -9,9 +9,9 @@ import misk.redis.RedisNodeConfig
 import misk.redis.RedisReplicationGroupConfig
 import misk.testing.ExternalDependency
 import redis.clients.jedis.JedisPooled
-import wisp.containers.Composer
-import wisp.containers.Container
-import wisp.containers.ContainerUtil
+import misk.containers.Composer
+import misk.containers.Container
+import misk.containers.ContainerUtil
 import wisp.logging.getLogger
 import java.lang.Thread.sleep
 import java.time.Duration
diff --git a/misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedisCluster.kt b/misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedisCluster.kt
@@ -13,9 +13,9 @@ import redis.clients.jedis.Jedis
 import redis.clients.jedis.JedisCluster
 import redis.clients.jedis.exceptions.JedisClusterException
 import redis.clients.jedis.util.JedisClusterCRC16
-import wisp.containers.Composer
-import wisp.containers.Container
-import wisp.containers.ContainerUtil
+import misk.containers.Composer
+import misk.containers.Container
+import misk.containers.ContainerUtil
 import wisp.logging.getLogger
 import java.lang.Thread.sleep
 import java.time.Duration
diff --git a/misk-testing/api/misk-testing.api b/misk-testing/api/misk-testing.api
@@ -73,11 +73,17 @@ public final class misk/concurrent/FakeTicker : com/google/common/base/Ticker, m
 }
 
 public final class misk/containers/Composer {
+	public static final field Companion Lmisk/containers/Composer$Companion;
 	public fun <init> (Ljava/lang/String;[Lmisk/containers/Container;)V
+	public final fun getRunning ()Ljava/util/concurrent/atomic/AtomicBoolean;
 	public final fun start ()V
 	public final fun stop ()V
 }
 
+public final class misk/containers/Composer$Companion {
+	public final fun getDockerClient ()Lcom/github/dockerjava/api/DockerClient;
+}
+
 public final class misk/containers/Container {
 	public fun <init> (Lkotlin/jvm/functions/Function1;)V
 	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)V
@@ -92,6 +98,13 @@ public final class misk/containers/Container {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class misk/containers/ContainerUtil {
+	public static final field INSTANCE Lmisk/containers/ContainerUtil;
+	public final fun dockerTargetOrLocalHost ()Ljava/lang/String;
+	public final fun dockerTargetOrLocalIp ()Ljava/lang/String;
+	public final fun isRunningInDocker ()Z
+}
+
 public final class misk/logging/LogCollectorModule : misk/inject/KAbstractModule {
 	public fun <init> ()V
 }
diff --git a/misk-testing/build.gradle.kts b/misk-testing/build.gradle.kts
@@ -26,21 +26,25 @@ dependencies {
   api(project(":misk-core"))
   api(project(":misk-inject"))
   api(project(":misk-testing-api"))
+  implementation(libs.dockerCore)
+  implementation(libs.dockerTransportHttpClient)
+  implementation(libs.dockerTransportCore)
   implementation(libs.guavaTestLib)
   implementation(libs.guiceTestLib)
   implementation(libs.logbackClassic)
   implementation(libs.mockitoCore)
   implementation(libs.mockk)
   implementation(libs.okio)
   implementation(libs.openTracing)
+  implementation(libs.openTracingUtil)
   implementation(libs.slf4jApi)
-  implementation(project(":wisp:wisp-containers-testing"))
   implementation(project(":wisp:wisp-deployment"))
   implementation(project(":wisp:wisp-logging"))
   implementation(project(":wisp:wisp-logging-testing"))
   implementation(project(":misk-action-scopes"))
   implementation(project(":misk-config"))
   implementation(project(":misk-service"))
+  implementation(project(":misk-docker"))
   implementation(testFixtures(project(":misk-metrics")))
 
   testImplementation(libs.kotlinTest)
diff --git a/misk-testing/src/main/kotlin/misk/containers/Containers.kt b/misk-testing/src/main/kotlin/misk/containers/Containers.kt
diff --git a/misk-vitess/build.gradle.kts b/misk-vitess/build.gradle.kts
diff --git a/misk-vitess/src/testFixtures/kotlin/misk/vitess/testing/VitessTestDbSettings.kt b/misk-vitess/src/testFixtures/kotlin/misk/vitess/testing/VitessTestDbSettings.kt
diff --git a/wisp/wisp-containers-testing/README.md b/wisp/wisp-containers-testing/README.md
diff --git a/wisp/wisp-containers-testing/src/main/kotlin/wisp/containers/Containers.kt b/wisp/wisp-containers-testing/src/main/kotlin/wisp/containers/Containers.kt
