opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: permit SSH by default when startup script fails (#6798)

Browse Source
This commit is contained in:
Ammar Bandukwala
2023-03-27 14:59:58 +00:00
committed by GitHub
parent 7fa5afa268
commit b439c3e167
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/ssh.go
+6 -3
View File
@@ -82,10 +82,13 @@ func (r *RootCmd) ssh() *clibase.Cmd {
if xerrors.Is(err, context.Canceled) {
return cliui.Canceled
}
if xerrors.Is(err, cliui.AgentStartError) {
return xerrors.New("Agent startup script exited with non-zero status, use --no-wait to login anyway.")
if !xerrors.Is(err, cliui.AgentStartError) {
return xerrors.Errorf("await agent: %w", err)
}
return xerrors.Errorf("await agent: %w", err)
// We don't want to fail on a startup script error because it's
// natural that the user will want to fix the script and try again.
// We don't print the error because cliui.Agent does that for us.
}
conn, err := client.DialWorkspaceAgent(ctx, workspaceAgent.ID, &codersdk.DialWorkspaceAgentOptions{})