Skip to content

prevent unintended early return from skipping writing wildcard configs #539

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.

Sign up for GitHub

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 4 commits into from
Feb 20, 2025
Merged

prevent unintended early return from skipping writing wildcard configs #539

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72512e3
prevent unintended early return from skipping writing wildcard configs
bcpeinhardt Feb 19, 2025
308b9ff
make blockContent empty on no workspaces
bcpeinhardt Feb 19, 2025
db700eb
test
bcpeinhardt Feb 19, 2025
0d691ea
changelog
bcpeinhardt Feb 20, 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
Prev Previous commit
Next Next commit
test
  • Loading branch information
@bcpeinhardt
bcpeinhardt committed Feb 19, 2025
commit db700ebb5ed4b7e234ff1139bfa833b7713534b0
17 changes: 17 additions & 0 deletions src/test/fixtures/inputs/wildcard.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# --- START CODER JETBRAINS test.coder.invalid
Host coder-jetbrains-test.coder.invalid--*
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 --ssh-host-prefix coder-jetbrains-test.coder.invalid-- %h
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains

Host coder-jetbrains-test.coder.invalid-bg--*
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 --ssh-host-prefix coder-jetbrains-test.coder.invalid-bg-- %h
ConnectTimeout 0
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
SetEnv CODER_SSH_SESSION_TYPE=JetBrains
# --- END CODER JETBRAINS test.coder.invalid
18 changes: 15 additions & 3 deletions src/test/kotlin/com/coder/gateway/cli/CoderCLIManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ internal class CoderCLIManagerTest {
listOf(workspace),
input = null,
output = "wildcard",
remove = "blank",
remove = "wildcard",
features = Features(
wildcardSSH = true,
),
Expand Down Expand Up @@ -472,6 +472,19 @@ internal class CoderCLIManagerTest {
}
}

val inputConf =
Path.of("src/test/fixtures/inputs/").resolve(it.remove + ".conf").toFile().readText()
.replace(newlineRe, System.lineSeparator())
.replace("/tmp/coder-gateway/test.coder.invalid/config", escape(coderConfigPath.toString()))
.replace("/tmp/coder-gateway/test.coder.invalid/coder-linux-amd64", escape(ccm.localBinaryPath.toString()))
.let { conf ->
if (it.sshLogDirectory != null) {
conf.replace("/tmp/coder-gateway/test.coder.invalid/logs", it.sshLogDirectory.toString())
} else {
conf
}
}

// Add workspaces.
ccm.configSsh(
it.workspaces.flatMap { ws ->
Expand All @@ -496,8 +509,7 @@ internal class CoderCLIManagerTest {
// Remove is the configuration we expect after removing.
assertEquals(
settings.sshConfigPath.toFile().readText(),
Path.of("src/test/fixtures/inputs").resolve(it.remove + ".conf").toFile()
.readText().replace(newlineRe, System.lineSeparator()),
inputConf
)
}
}
Expand Down
Loading