Skip to content

Commit 46a58bd

Browse files
fioan89fioan89
committed
fix: update UTs to include the network metrics configuration
Also, the default directory is renamed to ssh-network-metrics for a better description.
1 parent 129a0f5 commit 46a58bd

25 files changed

+37
-28
lines changed

‎src/main/kotlin/com/coder/toolbox/store/CoderSettingsStore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class CoderSettingsStore(
6767
get() = store[SSH_CONFIG_OPTIONS].takeUnless { it.isNullOrEmpty() } ?: env.get(CODER_SSH_CONFIG_OPTIONS)
6868
override val networkInfoDir: String
6969
get() = store[NETWORK_INFO_DIR].takeUnless { it.isNullOrEmpty() } ?: getDefaultGlobalDataDir()
70-
.resolve("network-info")
70+
.resolve("ssh-network-metrics")
7171
.normalize()
7272
.toString()
7373

‎src/test/kotlin/com/coder/toolbox/cli/CoderCLIManagerTest.kt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import com.coder.toolbox.store.DISABLE_AUTOSTART
1818
import com.coder.toolbox.store.ENABLE_BINARY_DIR_FALLBACK
1919
import com.coder.toolbox.store.ENABLE_DOWNLOADS
2020
import com.coder.toolbox.store.HEADER_COMMAND
21+
import com.coder.toolbox.store.NETWORK_INFO_DIR
2122
import com.coder.toolbox.store.SSH_CONFIG_OPTIONS
2223
import com.coder.toolbox.store.SSH_CONFIG_PATH
2324
import com.coder.toolbox.store.SSH_LOG_DIR
@@ -510,7 +511,10 @@ internal class CoderCLIManagerTest {
510511
HEADER_COMMAND to it.headerCommand,
511512
SSH_CONFIG_PATH to tmpdir.resolve(it.input + "_to_" + it.output + ".conf").toString(),
512513
SSH_CONFIG_OPTIONS to it.extraConfig,
513-
SSH_LOG_DIR to (it.sshLogDirectory?.toString() ?: "")
514+
SSH_LOG_DIR to (it.sshLogDirectory?.toString() ?: ""),
515+
NETWORK_INFO_DIR to tmpdir.parent.resolve("coder-toolbox")
516+
.resolve("ssh-network-metrics")
517+
.normalize().toString()
514518
),
515519
env = it.env,
516520
context.logger,
@@ -531,6 +535,7 @@ internal class CoderCLIManagerTest {
531535

532536
// Output is the configuration we expect to have after configuring.
533537
val coderConfigPath = ccm.localBinaryPath.parent.resolve("config")
538+
val networkMetricsPath = tmpdir.parent.resolve("coder-toolbox").resolve("ssh-network-metrics")
534539
val expectedConf =
535540
Path.of("src/test/resources/fixtures/outputs/").resolve(it.output + ".conf").toFile().readText()
536541
.replace(newlineRe, System.lineSeparator())
@@ -539,6 +544,10 @@ internal class CoderCLIManagerTest {
539544
"/tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64",
540545
escape(ccm.localBinaryPath.toString())
541546
)
547+
.replace(
548+
"/tmp/coder-toolbox/ssh-network-metrics",
549+
escape(networkMetricsPath.toString())
550+
)
542551
.let { conf ->
543552
if (it.sshLogDirectory != null) {
544553
conf.replace("/tmp/coder-toolbox/test.coder.invalid/logs", it.sshLogDirectory.toString())

‎src/test/resources/fixtures/outputs/append-blank-newlines.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# --- START CODER JETBRAINS TOOLBOX test.coder.invalid
66
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
7-
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains owner/foo.agent1
7+
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --network-info-dir /tmp/coder-toolbox/ssh-network-metrics --usage-app=jetbrains owner/foo.agent1
88
ConnectTimeout 0
99
StrictHostKeyChecking no
1010
UserKnownHostsFile /dev/null

‎src/test/resources/fixtures/outputs/append-blank.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# --- START CODER JETBRAINS TOOLBOX test.coder.invalid
22
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
3-
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains owner/foo.agent1
3+
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --network-info-dir /tmp/coder-toolbox/ssh-network-metrics --usage-app=jetbrains owner/foo.agent1
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

‎src/test/resources/fixtures/outputs/append-no-blocks.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Host test2
55

66
# --- START CODER JETBRAINS TOOLBOX test.coder.invalid
77
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
8-
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains owner/foo.agent1
8+
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --network-info-dir /tmp/coder-toolbox/ssh-network-metrics --usage-app=jetbrains owner/foo.agent1
99
ConnectTimeout 0
1010
StrictHostKeyChecking no
1111
UserKnownHostsFile /dev/null

‎src/test/resources/fixtures/outputs/append-no-newline.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Host test2
44
Port 443
55
# --- START CODER JETBRAINS TOOLBOX test.coder.invalid
66
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
7-
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains owner/foo.agent1
7+
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --network-info-dir /tmp/coder-toolbox/ssh-network-metrics --usage-app=jetbrains owner/foo.agent1
88
ConnectTimeout 0
99
StrictHostKeyChecking no
1010
UserKnownHostsFile /dev/null

‎src/test/resources/fixtures/outputs/append-no-related-blocks.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ some jetbrains config
1111

1212
# --- START CODER JETBRAINS TOOLBOX test.coder.invalid
1313
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
14-
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains owner/foo.agent1
14+
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --network-info-dir /tmp/coder-toolbox/ssh-network-metrics --usage-app=jetbrains owner/foo.agent1
1515
ConnectTimeout 0
1616
StrictHostKeyChecking no
1717
UserKnownHostsFile /dev/null

‎src/test/resources/fixtures/outputs/disable-autostart.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# --- START CODER JETBRAINS TOOLBOX test.coder.invalid
22
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
3-
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --disable-autostart --usage-app=jetbrains owner/foo.agent1
3+
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --disable-autostart --network-info-dir /tmp/coder-toolbox/ssh-network-metrics --usage-app=jetbrains owner/foo.agent1
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

‎src/test/resources/fixtures/outputs/extra-config.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# --- START CODER JETBRAINS TOOLBOX test.coder.invalid
22
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
3-
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains owner/foo.agent1
3+
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --network-info-dir /tmp/coder-toolbox/ssh-network-metrics --usage-app=jetbrains owner/foo.agent1
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

‎src/test/resources/fixtures/outputs/header-command-windows.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# --- START CODER JETBRAINS TOOLBOX test.coder.invalid
22
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
3-
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid --header-command "\"C:\Program Files\My Header Command\HeaderCommand.exe\" --url=\"%%CODER_URL%%\" --test=\"foo bar\"" ssh --stdio --usage-app=jetbrains owner/foo.agent1
3+
ProxyCommand /tmp/coder-toolbox/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-toolbox/test.coder.invalid/config --url https://test.coder.invalid --header-command "\"C:\Program Files\My Header Command\HeaderCommand.exe\" --url=\"%%CODER_URL%%\" --test=\"foo bar\"" ssh --stdio --network-info-dir /tmp/coder-toolbox/ssh-network-metrics --usage-app=jetbrains owner/foo.agent1
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

0 commit comments

Comments
 (0)