Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit970f4c5

Browse files
authored
chore: remove ssh background config (#97)
From my testing, Toolbox forwards through SSH (i.e. through Coder) aremote port associated with the IDErunning in server mode, to localhost in order for the server (i.e. theremote IDE) to communicate withJBClient. Unlike with Gateway, Toolbox manages to reuse the SSHconnection, and it doesn't open a separateone for port forwarding.From Gateway we inherited two ssh hostnames per each workspace, one forbackground connections that did notinvolve running IDEs. Coder discards the bg. connection from thecollected metrics in order toavoid double counting. Since Toolbox manages to re-use the connection wedon't need to worryabout double counting.For this particular change, I deployed the latest Coder version withprometheus metrics and experimentsenabled (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_jetbrainswere missing from prometheus metrics- jetbrains session count from api/v2/deployment/stats showed 02. Opened up a Workspace at which point Toolbox established the SSHconnection:- agent_sessions_total and coderd_agentstats_session_count_jetbrainsincreased to 1- jetbrains session count from api/v2/deployment/stats increased to 1 aswell3. Hit the install button on RustRover, everything stayed unchanged4. Open RustRover, nothing changes in the stats.
1 parenta9cff15 commit970f4c5

26 files changed

+33
-217
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
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

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=0.2.0
1+
version=0.2.1
22
group=com.coder.toolbox
33
name=coder-toolbox

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

Lines changed: 3 additions & 32 deletions
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-
fungetBackgroundHostname(url:URL,ws:Workspace,agent:WorkspaceAgent):String {
523-
return"${getHostname(url, ws, agent)}--bg"
524-
}
525-
526499
companionobject {
527500
privateval tokenRegex="--token [^ ]+".toRegex()
528501

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

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

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

Lines changed: 1 addition & 7 deletions
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‎

Lines changed: 1 addition & 7 deletions
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‎

Lines changed: 1 addition & 7 deletions
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‎

Lines changed: 1 addition & 7 deletions
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‎

Lines changed: 1 addition & 7 deletions
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‎

Lines changed: 1 addition & 7 deletions
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‎

Lines changed: 1 addition & 9 deletions
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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp