Commitb439c3e

authored

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

1 parent7fa5afa commitb439c3eCopy full SHA for b439c3e

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,13 @@ func (r RootCmd) ssh() clibase.Cmd {`
`82`	`82`	`ifxerrors.Is(err,context.Canceled) {`
`83`	`83`	`returncliui.Canceled`
`84`	`84`	`}`
`85`		`-ifxerrors.Is(err,cliui.AgentStartError) {`
`86`		`-returnxerrors.New("Agent startup script exited with non-zero status, use --no-wait to login anyway.")`
	`85`	`+if!xerrors.Is(err,cliui.AgentStartError) {`
	`86`	`+returnxerrors.Errorf("await agent: %w",err)`
`87`	`87`	`}`
`88`		`-returnxerrors.Errorf("await agent: %w",err)`
	`88`	`+`
	`89`	`+// We don't want to fail on a startup script error because it's`
	`90`	`+// natural that the user will want to fix the script and try again.`
	`91`	`+// We don't print the error because cliui.Agent does that for us.`
`89`	`92`	`}`
`90`	`93`
`91`	`94`	`conn,err:=client.DialWorkspaceAgent(ctx,workspaceAgent.ID,&codersdk.DialWorkspaceAgentOptions{})`

Comments

(0)