Skip to content

Commit 71cabd1

Browse files
fioan89fioan89
committed
chore: revert --usage-app
- back to jetbrains because there is no tracking support for toolbox, yet.
1 parent de8f9f0 commit 71cabd1

19 files changed

+20
-20
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ class CoderCLIManager(
273273
val proxyArgs = baseArgs + listOfNotNull(
274274
if (!settings.sshLogDirectory.isNullOrBlank()) "--log-dir" else null,
275275
if (!settings.sshLogDirectory.isNullOrBlank()) escape(settings.sshLogDirectory) else null,
276-
if (feats.reportWorkspaceUsage) "--usage-app=toolbox" else null,
276+
if (feats.reportWorkspaceUsage) "--usage-app=jetbrains" else null,
277277
)
278278
val backgroundProxyArgs =
279279
baseArgs + listOfNotNull(if (feats.reportWorkspaceUsage) "--usage-app=disable" else null)

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

+1-1
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--foo-bar--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=toolbox foo-bar
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 foo-bar
88
ConnectTimeout 0
99
StrictHostKeyChecking no
1010
UserKnownHostsFile /dev/null

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

+1-1
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--foo-bar--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=toolbox foo-bar
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 foo-bar
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

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

+1-1
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--foo-bar--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=toolbox foo-bar
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 foo-bar
99
ConnectTimeout 0
1010
StrictHostKeyChecking no
1111
UserKnownHostsFile /dev/null

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

+1-1
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--foo-bar--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=toolbox foo-bar
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 foo-bar
88
ConnectTimeout 0
99
StrictHostKeyChecking no
1010
UserKnownHostsFile /dev/null

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

+1-1
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--foo-bar--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=toolbox foo-bar
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 foo-bar
1515
ConnectTimeout 0
1616
StrictHostKeyChecking no
1717
UserKnownHostsFile /dev/null

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

+1-1
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--foo--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=toolbox foo
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 foo
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

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

+1-1
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--extra--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=toolbox extra
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 extra
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

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

+1-1
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--header--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=toolbox header
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 header
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

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

+1-1
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--header--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 'my-header-command --url="$CODER_URL" --test="foo bar" --literal='\''$CODER_URL'\''' ssh --stdio --usage-app=toolbox header
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 'my-header-command --url="$CODER_URL" --test="foo bar" --literal='\''$CODER_URL'\''' ssh --stdio --usage-app=jetbrains header
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

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

+1-1
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--foo--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 --log-dir /tmp/coder-toolbox/test.coder.invalid/logs --usage-app=toolbox foo
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 --log-dir /tmp/coder-toolbox/test.coder.invalid/logs --usage-app=jetbrains foo
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

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

+2-2
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--foo--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=toolbox foo
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 foo
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null
@@ -14,7 +14,7 @@ Host coder-jetbrains-toolbox--foo--test.coder.invalid--bg
1414
LogLevel ERROR
1515
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
1616
Host coder-jetbrains-toolbox--bar--test.coder.invalid
17-
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 bar
17+
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 bar
1818
ConnectTimeout 0
1919
StrictHostKeyChecking no
2020
UserKnownHostsFile /dev/null

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

+1-1
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--foo--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=toolbox foo
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 foo
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Host test
33
Host test2
44
Port 443 # --- START CODER JETBRAINS TOOLBOX test.coder.invalid
55
Host coder-jetbrains-toolbox--foo-bar--test.coder.invalid
6-
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
6+
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
77
ConnectTimeout 0
88
StrictHostKeyChecking no
99
UserKnownHostsFile /dev/null

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

+1-1
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--foo-bar--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=toolbox foo-bar
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 foo-bar
88
ConnectTimeout 0
99
StrictHostKeyChecking no
1010
UserKnownHostsFile /dev/null

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ some coder config
55
# ------------END-CODER------------
66
# --- START CODER JETBRAINS TOOLBOX test.coder.invalid
77
Host coder-jetbrains-toolbox--foo-bar--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=toolbox foo-bar
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 foo-bar
99
ConnectTimeout 0
1010
StrictHostKeyChecking no
1111
UserKnownHostsFile /dev/null

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Host test
22
Port 80
33
# --- START CODER JETBRAINS TOOLBOX test.coder.invalid
44
Host coder-jetbrains-toolbox--foo-bar--test.coder.invalid
5-
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
5+
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
66
ConnectTimeout 0
77
StrictHostKeyChecking no
88
UserKnownHostsFile /dev/null

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

+1-1
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--foo-bar--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=toolbox foo-bar
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 foo-bar
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

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

+1-1
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--foo-bar--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=toolbox foo-bar
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 foo-bar
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null

0 commit comments

Comments
 (0)