Commit 950c3b1

authored

Merge pull request #442 from coder/f0ssel/usage-app

chore: pass usage app name to coder ssh

2 parents dceb578 + 329ee12 commit 950c3b1Copy full SHA for 950c3b1

File tree

+16

-2

lines changed

+16

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ pluginUntilBuild=241.*`
`15`	`15`	`# verifier should be used after bumping versions to ensure compatibility in the`
`16`	`16`	`# range.`
`17`	`17`	`platformType=GW`
`18`		`-platformVersion=233.14808-EAP-CANDIDATE-SNAPSHOT`
	`18`	`+platformVersion=233.15325-EAP-CANDIDATE-SNAPSHOT`
`19`	`19`	`instrumentationCompiler=241.10840-EAP-CANDIDATE-SNAPSHOT`
`20`	`20`	`platformDownloadSources=true`
`21`	`21`	`verifyVersions=2023.3,2024.1`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ fun ensureCLI(`
`111`	`111`	`*/`
`112`	`112`	`data class Features(`
`113`	`113`	`val disableAutostart: Boolean = false,`
	`114`	`+ val reportWorkspaceUsage: Boolean = false,`
`114`	`115`	`)`
`115`	`116`
`116`	`117`	`/**`
`@@ -264,6 +265,7 @@ class CoderCLIManager(`
`264`	`265`	`"ssh",`
`265`	`266`	`"--stdio",`
`266`	`267`	`if (settings.disableAutostart && feats.disableAutostart) "--disable-autostart" else null,`
	`268`	`+ if (feats.reportWorkspaceUsage) "--usage-app=jetbrains" else null,`
`267`	`269`	`)`
`268`	`270`	`val extraConfig =`
`269`	`271`	`if (settings.sshConfigOptions.isNotBlank()) {`
`@@ -446,6 +448,7 @@ class CoderCLIManager(`
`446`	`448`	`Features(`
`447`	`449`	`// Autostart with SSH was added in 2.5.0.`
`448`	`450`	`disableAutostart = version >= SemVer(2, 5, 0),`
	`451`	`+ reportWorkspaceUsage = version >= SemVer(2, 13, 0),`
`449`	`452`	`)`
`450`	`453`	`}`
`451`	`454`	`}`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,9 @@`
	`1`	`+# --- START CODER JETBRAINS test.coder.invalid`
	`2`	`+Host coder-jetbrains--foo--test.coder.invalid`
	`3`	`+ ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config ssh --stdio --usage-app=jetbrains foo`
	`4`	`+ ConnectTimeout 0`
	`5`	`+ StrictHostKeyChecking no`
	`6`	`+ UserKnownHostsFile /dev/null`
	`7`	`+ LogLevel ERROR`
	`8`	`+ SetEnv CODER_SSH_SESSION_TYPE=JetBrains`
	`9`	`+# --- END CODER JETBRAINS test.coder.invalid`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -345,6 +345,7 @@ internal class CoderCLIManagerTest {`
`345`	`345`	`},`
`346`	`346`	`SSHTest(listOf("foo"), null, "disable-autostart", "blank", "", true, Features(true)),`
`347`	`347`	`SSHTest(listOf("foo"), null, "no-disable-autostart", "blank", "", true, Features(false)),`
	`348`	`+ SSHTest(listOf("foo"), null, "report-usage", "blank", "", true, Features(false, true)),`
`348`	`349`	`SSHTest(`
`349`	`350`	`listOf("extra"),`
`350`	`351`	`null,`
`@@ -721,7 +722,8 @@ internal class CoderCLIManagerTest {`
`721`	`722`	`val tests =`
`722`	`723`	`listOf(`
`723`	`724`	`Pair("2.5.0", Features(true)),`
`724`		`- Pair("4.9.0", Features(true)),`
	`725`	`+ Pair("2.13.0", Features(true, true)),`
	`726`	`+ Pair("4.9.0", Features(true, true)),`
`725`	`727`	`Pair("2.4.9", Features(false)),`
`726`	`728`	`Pair("1.0.1", Features(false)),`
`727`	`729`	`)`

Comments

(0)