NotificationsYou must be signed in to change notification settings
Fork918
Star10.1k

Commit647181e

committed

fix(cli)!: select sub agent if available and error on multiple agents

In the past we randomly selected workspace agent if there were multiple.Unless both are running on the same machine with the same configuration,this would be very confusing behavior for a user.With the introduction of sub agents (devcontainer agents), it wasdecided prioritize them if present. Similarly as before, selecting adevcontainer randomly would be confusing. We now error out if the agentname is not specified and there are multiple agents.Fixescoder/internal#696

1 parent5e3a225 commit647181eCopy full SHA for 647181e

File tree

1 file changed

+25

-17

lines changed

cli
- ssh.go

1 file changed

+25

-17

lines changed

`‎cli/ssh.go`

Lines changed: 25 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -925,36 +925,44 @@ func getWorkspaceAndAgent(ctx context.Context, inv serpent.Invocation, client `
`925`	`925`	`funcgetWorkspaceAgent(workspace codersdk.Workspace,agentNamestring) (workspaceAgent codersdk.WorkspaceAgent,errerror) {`
`926`	`926`	`resources:=workspace.LatestBuild.Resources`
`927`	`927`
`928`		`-agents:=make([]codersdk.WorkspaceAgent,0)`
	`928`	`+var (`
	`929`	`+availableNames []string`
	`930`	`+agents []codersdk.WorkspaceAgent`
	`931`	`+subAgents []codersdk.WorkspaceAgent`
	`932`	`+)`
`929`	`933`	`for_,resource:=rangeresources {`
`930`		`-agents=append(agents,resource.Agents...)`
	`934`	`+for_,agent:=rangeresource.Agents {`
	`935`	`+availableNames=append(availableNames,agent.Name)`
	`936`	`+ifagent.ParentID.UUID==uuid.Nil {`
	`937`	`+agents=append(agents,agent)`
	`938`	`+}else {`
	`939`	`+subAgents=append(subAgents,agent)`
	`940`	`+}`
	`941`	`+}`
`931`	`942`	`}`
`932`	`943`	`iflen(agents)==0 {`
`933`	`944`	`return codersdk.WorkspaceAgent{},xerrors.Errorf("workspace %q has no agents",workspace.Name)`
`934`	`945`	`}`
	`946`	`+slices.Sort(availableNames)`
`935`	`947`	`ifagentName!="" {`
	`948`	`+agents=append(agents,subAgents...)`
`936`	`949`	`for_,otherAgent:=rangeagents {`
`937`	`950`	`ifotherAgent.Name!=agentName {`
`938`	`951`	`continue`
`939`	`952`	`}`
`940`		`-workspaceAgent=otherAgent`
`941`		`-break`
`942`		`-}`
`943`		`-ifworkspaceAgent.ID==uuid.Nil {`
`944`		`-return codersdk.WorkspaceAgent{},xerrors.Errorf("agent not found by name %q",agentName)`
	`953`	`+returnotherAgent,nil`
`945`	`954`	`}`
	`955`	`+return codersdk.WorkspaceAgent{},xerrors.Errorf("agent not found by name %q, available agents: %v",agentName,availableNames)`
`946`	`956`	`}`
`947`		`-ifworkspaceAgent.ID==uuid.Nil {`
`948`		`-iflen(agents)>1 {`
`949`		`-workspaceAgent,err=cryptorand.Element(agents)`
`950`		`-iferr!=nil {`
`951`		`-return codersdk.WorkspaceAgent{},err`
`952`		`-}`
`953`		`-}else {`
`954`		`-workspaceAgent=agents[0]`
`955`		`-}`
	`957`	`+iflen(subAgents)==1 {`
	`958`	`+returnsubAgents[0],nil`
	`959`	`+}elseiflen(subAgents)>1 {`
	`960`	`+return codersdk.WorkspaceAgent{},xerrors.Errorf("multiple sub-agents found, please specify the agent name, available agents: %v",availableNames)`
	`961`	`+}`
	`962`	`+iflen(agents)==1 {`
	`963`	`+returnagents[0],nil`
`956`	`964`	`}`
`957`		`-returnworkspaceAgent,nil`
	`965`	`+returncodersdk.WorkspaceAgent{},xerrors.Errorf("multiple agents found, please specify the agent name, available agents: %v",availableNames)`
`958`	`966`	`}`
`959`	`967`
`960`	`968`	`// Attempt to poll workspace autostop. We write a per-workspace lockfile to`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit647181e

File tree

1 file changed

1 file changed

`‎cli/ssh.go`

0 commit comments