Skip to content

Commit 3e8d004

Browse files
bcpeinhardtbcpeinhardt
committed
tests
1 parent 547e5ef commit 3e8d004

29 files changed

+212
-118
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,9 +494,9 @@ class CoderCLIManager(
494494
agent: WorkspaceAgent,
495495
): String =
496496
if (currentUser.username == workspace.ownerName) {
497-
"coder-jetbrains--${workspace.name}--${agent.name}--${url.safeHost()}"
497+
"coder-jetbrains--${workspace.name}.${agent.name}--${url.safeHost()}"
498498
} else {
499-
"coder-jetbrains--${workspace.ownerName}--${workspace.name}--${agent.name}--${url.safeHost()}"
499+
"coder-jetbrains--${workspace.ownerName}--${workspace.name}.${agent.name}--${url.safeHost()}"
500500
}
501501

502502

‎src/main/kotlin/com/coder/gateway/sdk/CoderRestClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ open class CoderRestClient(
171171
* Retrieves all the agent names for all workspaces, including those that
172172
* are off. Meant to be used when configuring SSH.
173173
*/
174-
fun agentNames(workspaces: List<Workspace>): Set<Pair<Workspace, WorkspaceAgent>> {
174+
fun withAgents(workspaces: List<Workspace>): Set<Pair<Workspace, WorkspaceAgent>> {
175175
// It is possible for there to be resources with duplicate names so we
176176
// need to use a set.
177177
return workspaces.flatMap { ws ->

‎src/main/kotlin/com/coder/gateway/util/LinkHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ open class LinkHandler(
106106
}
107107

108108
indicator?.invoke("Configuring Coder CLI...")
109-
cli.configSsh(workspacesAndAgents = client.agentNames(workspaces), currentUser = client.me)
109+
cli.configSsh(workspacesAndAgents = client.withAgents(workspaces), currentUser = client.me)
110110

111111
val name = "${workspace.name}.${agent.name}"
112112
val openDialog =

‎src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspaceProjectIDEStepView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class CoderWorkspaceProjectIDEStepView(
199199
logger.info("Configuring Coder CLI...")
200200
cbIDE.renderer = IDECellRenderer("Configuring Coder CLI...")
201201
withContext(Dispatchers.IO) {
202-
data.cliManager.configSsh(data.client.agentNames(data.workspaces), data.client.me)
202+
data.cliManager.configSsh(data.client.withAgents(data.workspaces), data.client.me)
203203
}
204204

205205
val ides =
@@ -337,7 +337,7 @@ class CoderWorkspaceProjectIDEStepView(
337337
workspace: Workspace,
338338
agent: WorkspaceAgent,
339339
): List<IdeWithStatus> {
340-
val name = "${workspace.ownerName}/${workspace.name}.${agent.name}"
340+
val name = CoderCLIManager.getWorkspaceParts(workspace, agent)
341341
logger.info("Retrieving available IDEs for $name...")
342342
val workspaceOS =
343343
if (agent.operatingSystem != null && agent.architecture != null) {

‎src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ class CoderWorkspacesStepView :
752752
override fun data(): CoderWorkspacesStepSelection {
753753
val selected = tableOfWorkspaces.selectedObject
754754
return withoutNull(client, cliManager, selected?.agent, selected?.workspace) { client, cli, agent, workspace ->
755-
val name = "${workspace.ownerName}/${workspace.name}.${agent.name}"
755+
val name = CoderCLIManager.getWorkspaceParts(workspace, agent)
756756
logger.info("Returning data for $name")
757757
CoderWorkspacesStepSelection(
758758
agent = agent,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44

55
# --- START CODER JETBRAINS test.coder.invalid
6-
Host coder-jetbrains--foo-bar--test.coder.invalid
7-
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains foo-bar
6+
Host coder-jetbrains--foo.agent1--test.coder.invalid
7+
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains tester/foo.agent1
88
ConnectTimeout 0
99
StrictHostKeyChecking no
1010
UserKnownHostsFile /dev/null
1111
LogLevel ERROR
1212
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
13-
Host coder-jetbrains--foo-bar--test.coder.invalid--bg
14-
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=disable foo-bar
13+
Host coder-jetbrains--foo.agent1--test.coder.invalid--bg
14+
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=disable tester/foo.agent1
1515
ConnectTimeout 0
1616
StrictHostKeyChecking no
1717
UserKnownHostsFile /dev/null

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# --- START CODER JETBRAINS test.coder.invalid
2-
Host coder-jetbrains--foo-bar--test.coder.invalid
3-
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains foo-bar
2+
Host coder-jetbrains--foo.agent1--test.coder.invalid
3+
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains tester/foo.agent1
44
ConnectTimeout 0
55
StrictHostKeyChecking no
66
UserKnownHostsFile /dev/null
77
LogLevel ERROR
88
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
9-
Host coder-jetbrains--foo-bar--test.coder.invalid--bg
10-
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=disable foo-bar
9+
Host coder-jetbrains--foo.agent1--test.coder.invalid--bg
10+
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=disable tester/foo.agent1
1111
ConnectTimeout 0
1212
StrictHostKeyChecking no
1313
UserKnownHostsFile /dev/null

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ Host test2
44
Port 443
55

66
# --- START CODER JETBRAINS test.coder.invalid
7-
Host coder-jetbrains--foo-bar--test.coder.invalid
8-
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains foo-bar
7+
Host coder-jetbrains--foo.agent1--test.coder.invalid
8+
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains tester/foo.agent1
99
ConnectTimeout 0
1010
StrictHostKeyChecking no
1111
UserKnownHostsFile /dev/null
1212
LogLevel ERROR
1313
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
14-
Host coder-jetbrains--foo-bar--test.coder.invalid--bg
15-
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=disable foo-bar
14+
Host coder-jetbrains--foo.agent1--test.coder.invalid--bg
15+
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=disable tester/foo.agent1
1616
ConnectTimeout 0
1717
StrictHostKeyChecking no
1818
UserKnownHostsFile /dev/null

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ Host test
33
Host test2
44
Port 443
55
# --- START CODER JETBRAINS test.coder.invalid
6-
Host coder-jetbrains--foo-bar--test.coder.invalid
7-
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains foo-bar
6+
Host coder-jetbrains--foo.agent1--test.coder.invalid
7+
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains tester/foo.agent1
88
ConnectTimeout 0
99
StrictHostKeyChecking no
1010
UserKnownHostsFile /dev/null
1111
LogLevel ERROR
1212
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
13-
Host coder-jetbrains--foo-bar--test.coder.invalid--bg
14-
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=disable foo-bar
13+
Host coder-jetbrains--foo.agent1--test.coder.invalid--bg
14+
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=disable tester/foo.agent1
1515
ConnectTimeout 0
1616
StrictHostKeyChecking no
1717
UserKnownHostsFile /dev/null

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ some jetbrains config
1010
# --- END CODER JETBRAINS test.coder.unrelated
1111

1212
# --- START CODER JETBRAINS test.coder.invalid
13-
Host coder-jetbrains--foo-bar--test.coder.invalid
14-
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains foo-bar
13+
Host coder-jetbrains--foo.agent1--test.coder.invalid
14+
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=jetbrains tester/foo.agent1
1515
ConnectTimeout 0
1616
StrictHostKeyChecking no
1717
UserKnownHostsFile /dev/null
1818
LogLevel ERROR
1919
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
20-
Host coder-jetbrains--foo-bar--test.coder.invalid--bg
21-
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=disable foo-bar
20+
Host coder-jetbrains--foo.agent1--test.coder.invalid--bg
21+
ProxyCommand /tmp/coder-gateway/test.coder.invalid/coder-linux-amd64 --global-config /tmp/coder-gateway/test.coder.invalid/config --url https://test.coder.invalid ssh --stdio --usage-app=disable tester/foo.agent1
2222
ConnectTimeout 0
2323
StrictHostKeyChecking no
2424
UserKnownHostsFile /dev/null

0 commit comments

Comments
 (0)