Skip to content

feat(coderd): add support for external agents to API's and provisioner #19286

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 14 commits into from
Aug 19, 2025
Merged

feat(coderd): add support for external agents to API's and provisioner #19286

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
60dc330
feat: add support for external agents to API's and provisioner
kacpersaw Aug 11, 2025
10fc9fe
generate api model
kacpersaw Aug 11, 2025
5f344a1
move /external-agent/{agent}/credentials endpoint to enterprise
kacpersaw Aug 11, 2025
28243e3
add Content-Digest header to init script response
kacpersaw Aug 11, 2025
d560e5c
implement license checks for external agents in workspace builds and …
kacpersaw Aug 12, 2025
732bc1d
Update license_test.go
kacpersaw Aug 12, 2025
5ca172e
Apply review suggestions
kacpersaw Aug 13, 2025
10e6853
Add HasExternalAgent to TemplateVersion response
kacpersaw Aug 13, 2025
760de9a
Update tests
kacpersaw Aug 13, 2025
3e2288b
add HasLicense field to Options and update UsageChecker
kacpersaw Aug 13, 2025
ee58237
remove HasLicense field from Options and implement HasLicense method …
kacpersaw Aug 13, 2025
b91397d
return 404 if external_agent is not associated with agent
kacpersaw Aug 13, 2025
fb7bc71
update external agent handling in workspace agents and adjust Terrafo…
kacpersaw Aug 13, 2025
0baf2b3
Remove test
kacpersaw Aug 13, 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
update external agent handling in workspace agents and adjust Terrafo… 
…rm resource references
  • Loading branch information
@kacpersaw
kacpersaw committed Aug 19, 2025
commit fb7bc71ce5d80cfa02f9831de5391e7f653c2535
23 changes: 0 additions & 23 deletions enterprise/coderd/workspaceagents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,29 +52,6 @@ func (api *API) workspaceExternalAgentCredentials(rw http.ResponseWriter, r *htt
return
}

resources, err := api.Database.GetWorkspaceResourcesByJobID(ctx, build.JobID)
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Failed to get workspace resources.",
Detail: err.Error(),
})
return
}

found := false
for _, resource := range resources {
if resource.Type == "coder_external_agent" && resource.Name == agentName {
found = true
break
}
}
if !found {
httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
Message: fmt.Sprintf("Agent '%s' does not have an external agent associated with it.", agentName),
})
return
}

agents, err := api.Database.GetWorkspaceAgentsByWorkspaceAndBuildNumber(ctx, database.GetWorkspaceAgentsByWorkspaceAndBuildNumberParams{
WorkspaceID: workspace.ID,
BuildNumber: build.BuildNumber,
Expand Down
10 changes: 5 additions & 5 deletions provisioner/terraform/testdata/resources/external-agents/external-agents.tfplan.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions provisioner/terraform/testdata/resources/external-agents/external-agents.tfstate.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion provisioner/terraform/testdata/resources/external-agents/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ resource "coder_agent" "dev1" {
}

resource "coder_external_agent" "dev1" {
token = coder_agent.dev1.token
agent_id = coder_agent.dev1.token
}