File tree 2 files changed +32
-3
lines changed
kotlin/com/coder/gateway/cli
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 {
423
423
listOf (workspace),
424
424
input = null ,
425
425
output = " wildcard" ,
426
- remove = " blank " ,
426
+ remove = " wildcard " ,
427
427
features = Features (
428
428
wildcardSSH = true ,
429
429
),
@@ -472,6 +472,19 @@ internal class CoderCLIManagerTest {
472
472
}
473
473
}
474
474
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
+
475
488
// Add workspaces.
476
489
ccm.configSsh(
477
490
it.workspaces.flatMap { ws ->
@@ -496,8 +509,7 @@ internal class CoderCLIManagerTest {
496
509
// Remove is the configuration we expect after removing.
497
510
assertEquals(
498
511
settings.sshConfigPath.toFile().readText(),
499
- Path .of(" src/test/fixtures/inputs" ).resolve(it.remove + " .conf" ).toFile()
500
- .readText().replace(newlineRe, System .lineSeparator()),
512
+ inputConf
501
513
)
502
514
}
503
515
}
You can’t perform that action at this time.
0 commit comments