Skip to content

Commit adbc0f0

Browse files
committed
chore: remove ssh background config
From my testing, Toolbox forwards through SSH (i.e. through Coder) a remote port associated with the IDE running in server mode, to localhost in order for the server (i.e. the remote IDE) to communicate with JBClient. Unlike with Gateway, Toolbox manages to reuse the SSH connection, and it doesn't open a separate one for port forwarding. From Gateway we inherited two ssh hostnames per each workspace, one for background connections that did not involve running IDEs. Coder discards the bg. connection from the collected metrics in order to avoid double counting. Since Toolbox manages to re-use the connection we don't need to worry about double counting. For this particular change, I deployed the latest Coder version with prometheus metrics and experiments enabled (i.e. --prometheus-enable --prometheus-collect-agent-stats --experiments=workspace-usage) and made the following experiment: 1. Opened up Toolbox, logged into Coder. At this point: - agent_sessions_total and coderd_agentstats_session_count_jetbrains were missing from prometheus metrics - jetbrains session count from api/v2/deployment/stats showed 0 2. Opened up a Workspace at which point Toolbox established the SSH connection: - agent_sessions_total and coderd_agentstats_session_count_jetbrains increased to 1 - jetbrains session count from api/v2/deployment/stats increased to 1 as well 3. Hit the install button on RustRover, everything stayed unchanged 4. Open RustRover, nothing changes in the stats.
1 parent a9cff15 commit adbc0f0

25 files changed

+32
-216
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### Changed
6+
7+
- ssh configuration is simplified, background hostnames have been discarded.
8+
59
## 0.2.0 - 2025-04-24
610

711
### Added

src/main/kotlin/com/coder/toolbox/cli/CoderCLIManager.kt

+3-32
Original file line numberDiff line numberDiff line change
@@ -301,19 +301,8 @@ class CoderCLIManager(
301301
""".trimIndent()
302302
.plus("\n" + options.prependIndent(" "))
303303
.plus(extraConfig)
304-
.plus("\n\n")
305-
.plus(
306-
"""
307-
Host ${getBackgroundHostnamePrefix(deploymentURL)}--*
308-
ProxyCommand ${backgroundProxyArgs.joinToString(" ")} --ssh-host-prefix ${
309-
getBackgroundHostnamePrefix(
310-
deploymentURL
311-
)
312-
}-- %h
313-
""".trimIndent()
314-
.plus("\n" + options.prependIndent(" "))
315-
.plus(extraConfig),
316-
).replace("\n", System.lineSeparator()) +
304+
.plus("\n")
305+
.replace("\n", System.lineSeparator()) +
317306
System.lineSeparator() + endBlock
318307
} else {
319308
wsWithAgents.joinToString(
@@ -328,19 +317,7 @@ class CoderCLIManager(
328317
.plus("\n" + options.prependIndent(" "))
329318
.plus(extraConfig)
330319
.plus("\n")
331-
.plus(
332-
"""
333-
Host ${getBackgroundHostname(deploymentURL, it.workspace(), it.agent())}
334-
ProxyCommand ${backgroundProxyArgs.joinToString(" ")} ${
335-
getWsByOwner(
336-
it.workspace(),
337-
it.agent()
338-
)
339-
}
340-
""".trimIndent()
341-
.plus("\n" + options.prependIndent(" "))
342-
.plus(extraConfig),
343-
).replace("\n", System.lineSeparator())
320+
.replace("\n", System.lineSeparator())
344321
},
345322
)
346323
}
@@ -519,17 +496,11 @@ class CoderCLIManager(
519496
}
520497
}
521498

522-
fun getBackgroundHostname(url: URL, ws: Workspace, agent: WorkspaceAgent): String {
523-
return "${getHostname(url, ws, agent)}--bg"
524-
}
525-
526499
companion object {
527500
private val tokenRegex = "--token [^ ]+".toRegex()
528501

529502
private fun getHostnamePrefix(url: URL): String = "coder-jetbrains-toolbox-${url.safeHost()}"
530503

531-
private fun getBackgroundHostnamePrefix(url: URL): String = "coder-jetbrains-toolbox-${url.safeHost()}-bg"
532-
533504
private fun getWsByOwner(ws: Workspace, agent: WorkspaceAgent): String =
534505
"${ws.ownerName}/${ws.name}.${agent.name}"
535506

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
1010
UserKnownHostsFile /dev/null
1111
LogLevel ERROR
1212
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
13-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
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=disable owner/foo.agent1
15-
ConnectTimeout 0
16-
StrictHostKeyChecking no
17-
UserKnownHostsFile /dev/null
18-
LogLevel ERROR
19-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
13+
2014
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
1111
UserKnownHostsFile /dev/null
1212
LogLevel ERROR
1313
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
14-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
15-
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=disable owner/foo.agent1
16-
ConnectTimeout 0
17-
StrictHostKeyChecking no
18-
UserKnownHostsFile /dev/null
19-
LogLevel ERROR
20-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
14+
2115
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
1010
UserKnownHostsFile /dev/null
1111
LogLevel ERROR
1212
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
13-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
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=disable owner/foo.agent1
15-
ConnectTimeout 0
16-
StrictHostKeyChecking no
17-
UserKnownHostsFile /dev/null
18-
LogLevel ERROR
19-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
13+
2014
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
1717
UserKnownHostsFile /dev/null
1818
LogLevel ERROR
1919
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
20-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
21-
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=disable owner/foo.agent1
22-
ConnectTimeout 0
23-
StrictHostKeyChecking no
24-
UserKnownHostsFile /dev/null
25-
LogLevel ERROR
26-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
20+
2721
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

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

+1-9
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
99
ServerAliveInterval 5
1010
ServerAliveCountMax 3
11-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
12-
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=disable owner/foo.agent1
13-
ConnectTimeout 0
14-
StrictHostKeyChecking no
15-
UserKnownHostsFile /dev/null
16-
LogLevel ERROR
17-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
18-
ServerAliveInterval 5
19-
ServerAliveCountMax 3
11+
2012
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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 'my-header-command --url="$CODER_URL" --test="foo bar" --literal='\''$CODER_URL'\''' ssh --stdio --usage-app=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

src/test/resources/fixtures/outputs/log-dir.conf

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

src/test/resources/fixtures/outputs/multiple-agents.conf

+2-14
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,13 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
Host coder-jetbrains-toolbox--owner--foo.agent2--test.coder.invalid
1711
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.agent2
1812
ConnectTimeout 0
1913
StrictHostKeyChecking no
2014
UserKnownHostsFile /dev/null
2115
LogLevel ERROR
2216
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
23-
Host coder-jetbrains-toolbox--owner--foo.agent2--test.coder.invalid--bg
24-
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=disable owner/foo.agent2
25-
ConnectTimeout 0
26-
StrictHostKeyChecking no
27-
UserKnownHostsFile /dev/null
28-
LogLevel ERROR
29-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
17+
3018
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

src/test/resources/fixtures/outputs/multiple-users.conf

+2-14
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,13 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
1711
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
1812
ConnectTimeout 0
1913
StrictHostKeyChecking no
2014
UserKnownHostsFile /dev/null
2115
LogLevel ERROR
2216
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
23-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
24-
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=disable owner/foo.agent1
25-
ConnectTimeout 0
26-
StrictHostKeyChecking no
27-
UserKnownHostsFile /dev/null
28-
LogLevel ERROR
29-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
17+
3018
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

src/test/resources/fixtures/outputs/multiple-workspaces.conf

+2-14
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,13 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
Host coder-jetbrains-toolbox--owner--bar.agent1--test.coder.invalid
1711
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/bar.agent1
1812
ConnectTimeout 0
1913
StrictHostKeyChecking no
2014
UserKnownHostsFile /dev/null
2115
LogLevel ERROR
2216
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
23-
Host coder-jetbrains-toolbox--owner--bar.agent1--test.coder.invalid--bg
24-
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=disable owner/bar.agent1
25-
ConnectTimeout 0
26-
StrictHostKeyChecking no
27-
UserKnownHostsFile /dev/null
28-
LogLevel ERROR
29-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
17+
3018
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

src/test/resources/fixtures/outputs/no-report-usage.conf

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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 owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

src/test/resources/fixtures/outputs/replace-end-no-newline.conf

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
99
UserKnownHostsFile /dev/null
1010
LogLevel ERROR
1111
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
12-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
13-
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=disable owner/foo.agent1
14-
ConnectTimeout 0
15-
StrictHostKeyChecking no
16-
UserKnownHostsFile /dev/null
17-
LogLevel ERROR
18-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
12+
1913
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

src/test/resources/fixtures/outputs/replace-end.conf

+1-7
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
1010
UserKnownHostsFile /dev/null
1111
LogLevel ERROR
1212
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
13-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
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=disable owner/foo.agent1
15-
ConnectTimeout 0
16-
StrictHostKeyChecking no
17-
UserKnownHostsFile /dev/null
18-
LogLevel ERROR
19-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
13+
2014
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

src/test/resources/fixtures/outputs/replace-middle-ignore-unrelated.conf

+1-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,7 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
1111
UserKnownHostsFile /dev/null
1212
LogLevel ERROR
1313
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
14-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
15-
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=disable owner/foo.agent1
16-
ConnectTimeout 0
17-
StrictHostKeyChecking no
18-
UserKnownHostsFile /dev/null
19-
LogLevel ERROR
20-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
14+
2115
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid
2216
Host test2
2317
Port 443

src/test/resources/fixtures/outputs/replace-middle.conf

+1-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,7 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
88
UserKnownHostsFile /dev/null
99
LogLevel ERROR
1010
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
11-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
12-
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=disable owner/foo.agent1
13-
ConnectTimeout 0
14-
StrictHostKeyChecking no
15-
UserKnownHostsFile /dev/null
16-
LogLevel ERROR
17-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
11+
1812
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid
1913
Host test2
2014
Port 443

src/test/resources/fixtures/outputs/replace-only.conf

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid

src/test/resources/fixtures/outputs/replace-start.conf

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@ Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains-toolbox--owner--foo.agent1--test.coder.invalid--bg
10-
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=disable owner/foo.agent1
11-
ConnectTimeout 0
12-
StrictHostKeyChecking no
13-
UserKnownHostsFile /dev/null
14-
LogLevel ERROR
15-
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9+
1610
# --- END CODER JETBRAINS TOOLBOX test.coder.invalid
1711
Host test
1812
Port 80

0 commit comments

Comments
 (0)