File tree Expand file tree Collapse file tree 2 files changed +32
-3
lines changed
kotlin/com/coder/gateway/cli Expand file tree Collapse file tree 2 files changed +32
-3
lines changed Original file line number Diff line number Diff line change 1+ # --- START CODER JETBRAINS test.coder.invalid
2+ Host coder-jetbrains-test.coder.invalid--*
3+ ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --ssh-host-prefix coder-jetbrains-test.coder.invalid-- %h
4+ ConnectTimeout 0
5+ StrictHostKeyChecking no
6+ UserKnownHostsFile /dev/null
7+ LogLevel ERROR
8+ SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
10+ Host coder-jetbrains-test.coder.invalid-bg--*
11+ ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --ssh-host-prefix coder-jetbrains-test.coder.invalid-bg-- %h
12+ ConnectTimeout 0
13+ StrictHostKeyChecking no
14+ UserKnownHostsFile /dev/null
15+ LogLevel ERROR
16+ SetEnv CODER_SSH_SESSION_TYPE=JetBrains
17+ # --- END CODER JETBRAINS test.coder.invalid
Original file line number Diff line number Diff line change @@ -423,7 +423,7 @@ internal class CoderCLIManagerTest {
423423 listOf (workspace),
424424 input = null ,
425425 output = " wildcard" ,
426- remove = " blank " ,
426+ remove = " wildcard " ,
427427 features = Features (
428428 wildcardSSH = true ,
429429 ),
@@ -472,6 +472,19 @@ internal class CoderCLIManagerTest {
472472 }
473473 }
474474
475+ val inputConf =
476+ Path .of(" src/test/fixtures/inputs/" ).resolve(it.remove + " .conf" ).toFile().readText()
477+ .replace(newlineRe, System .lineSeparator())
478+ .replace(" /tmp/coder-gateway/test.coder.invalid/config" , escape(coderConfigPath.toString()))
479+ .replace(" /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64" , escape(ccm.localBinaryPath.toString()))
480+ .let { conf ->
481+ if (it.sshLogDirectory != null ) {
482+ conf.replace(" /tmp/coder-gateway/test.coder.invalid/logs" , it.sshLogDirectory.toString())
483+ } else {
484+ conf
485+ }
486+ }
487+
475488 // Add workspaces.
476489 ccm.configSsh(
477490 it.workspaces.flatMap { ws ->
@@ -496,8 +509,7 @@ internal class CoderCLIManagerTest {
496509 // Remove is the configuration we expect after removing.
497510 assertEquals(
498511 settings.sshConfigPath.toFile().readText(),
499- Path .of(" src/test/fixtures/inputs" ).resolve(it.remove + " .conf" ).toFile()
500- .readText().replace(newlineRe, System .lineSeparator()),
512+ inputConf
501513 )
502514 }
503515 }
You can’t perform that action at this time.
0 commit comments