Skip to content

Commit 57a263a

Browse files
aparajonsvc-squareup-copybara
authored andcommitted
Harden hostname logic in VitessTestDb
GitOrigin-RevId: 808aef0139c7d8fb1d00188f6e2111668ecdee2c
1 parent 88c25ca commit 57a263a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Diff for: misk-vitess/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ dependencies {
2626
testFixturesImplementation(project(":misk-docker"))
2727
testFixturesImplementation(project(":wisp:wisp-moshi"))
2828
testFixturesImplementation(project(":wisp:wisp-resource-loader"))
29+
testFixturesImplementation(project(":wisp:wisp-containers-testing"))
2930

3031
testImplementation(libs.mysqlConnector)
3132
testImplementation(libs.junitApi)

Diff for: misk-vitess/src/testFixtures/kotlin/misk/vitess/testing/internal/VitessClusterConfig.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package misk.vitess.testing.internal
22

3+
import wisp.containers.ContainerUtil
4+
35
class VitessClusterConfig(port: Int) {
46
val vtgatePort: Int = port
57
val mysqlPort: Int = port - 1
68
val grpcPort: Int = port - 2
79
val basePort: Int = port - 3
8-
val hostname: String = System.getenv("VITESS_HOST") ?: "localhost"
10+
val hostname: String = System.getenv("VITESS_HOST") ?: ContainerUtil.dockerTargetOrLocalHost()
911
val vtgateUser: String = "root"
1012
val vtgateUserPassword: String = ""
1113
val dbaUser: String = "vt_dba_tcp_full"

0 commit comments

Comments
 (0)