Commitf33af88

committed

update external agent handling in workspace agents and adjust Terraform resource references

1 parentf1f5823 commitf33af88Copy full SHA for f33af88

File tree

-32

lines changed

-32

lines changed

Lines changed: 0 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,29 +52,6 @@ func (api API) workspaceExternalAgentCredentials(rw http.ResponseWriter, r htt`
`52`	`52`	`return`
`53`	`53`	`}`
`54`	`54`
`55`		`-resources,err:=api.Database.GetWorkspaceResourcesByJobID(ctx,build.JobID)`
`56`		`-iferr!=nil {`
`57`		`-httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{`
`58`		`-Message:"Failed to get workspace resources.",`
`59`		`-Detail:err.Error(),`
`60`		`-})`
`61`		`-return`
`62`		`-}`
`63`		`-`
`64`		`-found:=false`
`65`		`-for_,resource:=rangeresources {`
`66`		`-ifresource.Type=="coder_external_agent"&&resource.Name==agentName {`
`67`		`-found=true`
`68`		`-break`
`69`		`-}`
`70`		`-}`
`71`		`-if!found {`
`72`		`-httpapi.Write(ctx,rw,http.StatusNotFound, codersdk.Response{`
`73`		`-Message:fmt.Sprintf("Agent '%s' does not have an external agent associated with it.",agentName),`
`74`		`-})`
`75`		`-return`
`76`		`-}`
`77`		`-`
`78`	`55`	`agents,err:=api.Database.GetWorkspaceAgentsByWorkspaceAndBuildNumber(ctx, database.GetWorkspaceAgentsByWorkspaceAndBuildNumberParams{`
`79`	`56`	`WorkspaceID:workspace.ID,`
`80`	`57`	`BuildNumber:build.BuildNumber,`

Lines changed: 5 additions & 5 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 3 additions & 3 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ resource "coder_agent" "dev1" {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`resource"coder_external_agent""dev1" {`
`20`		`-token=coder_agent.dev1.token`
	`20`	`+agent_id=coder_agent.dev1.token`
`21`	`21`	`}`

Comments

(0)