Skip to content

impl: ssh config improvements #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Mar 27, 2025
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1788632
impl: custom ssh config header block for toolbox plugin
fioan89 Mar 21, 2025
2a86abe
impl: report workspace usage under toolbox
fioan89 Mar 21, 2025
270fa89
impl: change hostname in ssh config to reflect toolbox plugin
fioan89 Mar 21, 2025
d3968ae
fix: update tests with to reflect the changes to the ssh parameters
fioan89 Mar 21, 2025
6a3491d
fix: ssh header block as `JETBRAINS TOOLBOX`
fioan89 Mar 24, 2025
3a8738c
refactor: expose typed settings and secrets store
fioan89 Mar 24, 2025
1da3f4b
impl: don't start the workspace automatically if disable-autostart is…
fioan89 Mar 24, 2025
a104721
fix: force window to show when error dialogs pops-up
fioan89 Mar 24, 2025
d885c60
fix: resiliency when REST call to start the workspace fail
fioan89 Mar 24, 2025
0bdd3ff
fix: resiliency when workspace agent is not ready
fioan89 Mar 24, 2025
2929b0e
refactor: reuse block of code
fioan89 Mar 24, 2025
1708944
impl: rework the settings models
fioan89 Mar 26, 2025
a47e4b2
impl: support for ssh wildcard config
fioan89 Mar 26, 2025
b183af0
fix: missing i18n strings
fioan89 Mar 26, 2025
de8f9f0
impl: change plugin's display name
fioan89 Mar 26, 2025
71cabd1
chore: revert --usage-app
fioan89 Mar 26, 2025
67ec906
fix: test exercising the features available
fioan89 Mar 26, 2025
76bb8b8
fix: test assert raw string paths on different platforms
fioan89 Mar 26, 2025
a53684d
fix: add support for Toolbox 2.6.0.39689
fioan89 Mar 27, 2025
fd860d1
impl: enable wildcard config by default
fioan89 Mar 27, 2025
81eacfb
fix: provide the correct ssh host when wildcard ssh config is enabled
fioan89 Mar 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/kotlin/com/coder/toolbox/cli/CoderCLIManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ class CoderCLIManager(
feats: Features,
): String? {
val host = deploymentURL.safeHost()
val startBlock = "# --- START CODER JETBRAINS $host"
val endBlock = "# --- END CODER JETBRAINS $host"
val startBlock = "# --- START CODER TOOLBOX $host"
val endBlock = "# --- END CODER TOOLBOX $host"
val isRemoving = workspaceNames.isEmpty()
val baseArgs =
listOfNotNull(
Expand All @@ -273,7 +273,7 @@ class CoderCLIManager(
val proxyArgs = baseArgs + listOfNotNull(
if (settings.sshLogDirectory.isNotBlank()) "--log-dir" else null,
if (settings.sshLogDirectory.isNotBlank()) escape(settings.sshLogDirectory) else null,
if (feats.reportWorkspaceUsage) "--usage-app=jetbrains" else null,
if (feats.reportWorkspaceUsage) "--usage-app=toolbox" else null,
)
val backgroundProxyArgs =
baseArgs + listOfNotNull(if (feats.reportWorkspaceUsage) "--usage-app=disable" else null)
Expand Down Expand Up @@ -484,7 +484,7 @@ class CoderCLIManager(
fun getHostName(
url: URL,
workspaceName: String,
): String = "coder-jetbrains--$workspaceName--${url.safeHost()}"
): String = "coder-toolbox--$workspaceName--${url.safeHost()}"

@JvmStatic
fun getBackgroundHostName(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Host test
Port 80
Host test2
Port 443 # --- START CODER JETBRAINS test.coder.invalid
some jetbrains config # --- END CODER JETBRAINS test.coder.invalid
Port 443 # --- START CODER TOOLBOX test.coder.invalid
some jetbrains config # --- END CODER TOOLBOX test.coder.invalid
4 changes: 2 additions & 2 deletions src/test/resources/fixtures/inputs/existing-end.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Host test
Port 80
Host test2
Port 443
# --- START CODER JETBRAINS test.coder.invalid
# --- START CODER TOOLBOX test.coder.invalid
some jetbrains config
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Host test
# ------------START-CODER-----------
some coder config
# ------------END-CODER------------
# --- START CODER JETBRAINS test.coder.invalid
# --- START CODER TOOLBOX test.coder.invalid
some jetbrains config
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
Host test2
Port 443
# --- START CODER JETBRAINS test.coder.unrelated
# --- START CODER TOOLBOX test.coder.unrelated
some jetbrains config
# --- END CODER JETBRAINS test.coder.unrelated
# --- END CODER TOOLBOX test.coder.unrelated
4 changes: 2 additions & 2 deletions src/test/resources/fixtures/inputs/existing-middle.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Host test
Port 80
# --- START CODER JETBRAINS test.coder.invalid
# --- START CODER TOOLBOX test.coder.invalid
some jetbrains config
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
Host test2
Port 443
4 changes: 2 additions & 2 deletions src/test/resources/fixtures/inputs/existing-only.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# --- START CODER JETBRAINS test.coder.invalid
# --- START CODER TOOLBOX test.coder.invalid
some jetbrains config
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
4 changes: 2 additions & 2 deletions src/test/resources/fixtures/inputs/existing-start.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# --- START CODER JETBRAINS test.coder.invalid
# --- START CODER TOOLBOX test.coder.invalid
some jetbrains config
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
Host test
Port 80
Host test2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# --- START CODER JETBRAINS test.coder.something-else
# --- START CODER TOOLBOX test.coder.something-else
some jetbrains config
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
2 changes: 1 addition & 1 deletion src/test/resources/fixtures/inputs/malformed-no-end.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# --- START CODER JETBRAINS test.coder.invalid
# --- START CODER TOOLBOX test.coder.invalid
some jetbrains config
2 changes: 1 addition & 1 deletion src/test/resources/fixtures/inputs/malformed-no-start.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
some jetbrains config
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
some jetbrains config
# --- START CODER JETBRAINS test.coder.invalid
# --- START CODER TOOLBOX test.coder.invalid
4 changes: 2 additions & 2 deletions src/test/resources/fixtures/inputs/no-related-blocks.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ some coder config
# ------------END-CODER------------
Host test2
Port 443
# --- START CODER JETBRAINS test.coder.unrelated
# --- START CODER TOOLBOX test.coder.unrelated
some jetbrains config
# --- END CODER JETBRAINS test.coder.unrelated
# --- END CODER TOOLBOX test.coder.unrelated
10 changes: 5 additions & 5 deletions src/test/resources/fixtures/outputs/append-blank-newlines.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@



# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains--foo-bar--test.coder.invalid
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 foo-bar
# --- START CODER TOOLBOX test.coder.invalid
Host coder-toolbox--foo-bar--test.coder.invalid
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=toolbox foo-bar
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
Host coder-jetbrains--foo-bar--test.coder.invalid--bg
Host coder-toolbox--foo-bar--test.coder.invalid--bg
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 foo-bar
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
10 changes: 5 additions & 5 deletions src/test/resources/fixtures/outputs/append-blank.conf
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains--foo-bar--test.coder.invalid
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 foo-bar
# --- START CODER TOOLBOX test.coder.invalid
Host coder-toolbox--foo-bar--test.coder.invalid
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=toolbox foo-bar
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
Host coder-jetbrains--foo-bar--test.coder.invalid--bg
Host coder-toolbox--foo-bar--test.coder.invalid--bg
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 foo-bar
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
10 changes: 5 additions & 5 deletions src/test/resources/fixtures/outputs/append-no-blocks.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ Host test
Host test2
Port 443

# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains--foo-bar--test.coder.invalid
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 foo-bar
# --- START CODER TOOLBOX test.coder.invalid
Host coder-toolbox--foo-bar--test.coder.invalid
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=toolbox foo-bar
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
Host coder-jetbrains--foo-bar--test.coder.invalid--bg
Host coder-toolbox--foo-bar--test.coder.invalid--bg
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 foo-bar
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
10 changes: 5 additions & 5 deletions src/test/resources/fixtures/outputs/append-no-newline.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ Host test
Port 80
Host test2
Port 443
# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains--foo-bar--test.coder.invalid
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 foo-bar
# --- START CODER TOOLBOX test.coder.invalid
Host coder-toolbox--foo-bar--test.coder.invalid
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=toolbox foo-bar
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
Host coder-jetbrains--foo-bar--test.coder.invalid--bg
Host coder-toolbox--foo-bar--test.coder.invalid--bg
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 foo-bar
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ some coder config
# ------------END-CODER------------
Host test2
Port 443
# --- START CODER JETBRAINS test.coder.unrelated
# --- START CODER TOOLBOX test.coder.unrelated
some jetbrains config
# --- END CODER JETBRAINS test.coder.unrelated
# --- END CODER TOOLBOX test.coder.unrelated

# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains--foo-bar--test.coder.invalid
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 foo-bar
# --- START CODER TOOLBOX test.coder.invalid
Host coder-toolbox--foo-bar--test.coder.invalid
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=toolbox foo-bar
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
Host coder-jetbrains--foo-bar--test.coder.invalid--bg
Host coder-toolbox--foo-bar--test.coder.invalid--bg
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 foo-bar
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
10 changes: 5 additions & 5 deletions src/test/resources/fixtures/outputs/disable-autostart.conf
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains--foo--test.coder.invalid
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 foo
# --- START CODER TOOLBOX test.coder.invalid
Host coder-toolbox--foo--test.coder.invalid
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=toolbox foo
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
Host coder-jetbrains--foo--test.coder.invalid--bg
Host coder-toolbox--foo--test.coder.invalid--bg
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 foo
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
10 changes: 5 additions & 5 deletions src/test/resources/fixtures/outputs/extra-config.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains--extra--test.coder.invalid
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 extra
# --- START CODER TOOLBOX test.coder.invalid
Host coder-toolbox--extra--test.coder.invalid
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=toolbox extra
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
ServerAliveInterval 5
ServerAliveCountMax 3
Host coder-jetbrains--extra--test.coder.invalid--bg
Host coder-toolbox--extra--test.coder.invalid--bg
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 extra
ConnectTimeout 0
StrictHostKeyChecking no
Expand All @@ -17,4 +17,4 @@ Host coder-jetbrains--extra--test.coder.invalid--bg
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
ServerAliveInterval 5
ServerAliveCountMax 3
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
10 changes: 5 additions & 5 deletions src/test/resources/fixtures/outputs/header-command-windows.conf
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains--header--test.coder.invalid
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 header
# --- START CODER TOOLBOX test.coder.invalid
Host coder-toolbox--header--test.coder.invalid
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=toolbox header
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
Host coder-jetbrains--header--test.coder.invalid--bg
Host coder-toolbox--header--test.coder.invalid--bg
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 header
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
10 changes: 5 additions & 5 deletions src/test/resources/fixtures/outputs/header-command.conf
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains--header--test.coder.invalid
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=jetbrains header
# --- START CODER TOOLBOX test.coder.invalid
Host coder-toolbox--header--test.coder.invalid
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=toolbox header
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
Host coder-jetbrains--header--test.coder.invalid--bg
Host coder-toolbox--header--test.coder.invalid--bg
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 header
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
10 changes: 5 additions & 5 deletions src/test/resources/fixtures/outputs/log-dir.conf
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains--foo--test.coder.invalid
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 --log-dir /tmp/coder-toolbox/test.coder.invalid/logs --usage-app=jetbrains foo
# --- START CODER TOOLBOX test.coder.invalid
Host coder-toolbox--foo--test.coder.invalid
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 --log-dir /tmp/coder-toolbox/test.coder.invalid/logs --usage-app=toolbox foo
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
Host coder-jetbrains--foo--test.coder.invalid--bg
Host coder-toolbox--foo--test.coder.invalid--bg
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 foo
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
# --- END CODER JETBRAINS test.coder.invalid
# --- END CODER TOOLBOX test.coder.invalid
Loading
Loading