Skip to content

refactor(agent): update agentcontainers api initialization #17600

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 16 commits into from
Apr 29, 2025
+118 −67
Merged

refactor(agent): update agentcontainers api initialization #17600

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2fd85f7
refactor(agent): update agentcontainers api initialization
mafredri Apr 29, 2025
901a258
add warn
mafredri Apr 29, 2025
44cc9a6
lint
mafredri Apr 29, 2025
ebed3de
refactor, remove control flag
mafredri Apr 29, 2025
02d0228
remove noop dccli
mafredri Apr 29, 2025
2a9a842
fix agent options
mafredri Apr 29, 2025
fd69221
update agentcontainers API file watch init
mafredri Apr 29, 2025
17fa155
rename start to ready
mafredri Apr 29, 2025
3ebf2d3
update disabled message and use http 403 instead of 404
mafredri Apr 29, 2025
9d57279
fix(site): handle containers disabled
mafredri Apr 29, 2025
ea9f564
fix copy
mafredri Apr 29, 2025
3f9bd1d
fix test
mafredri Apr 29, 2025
32b7d18
echo codersdk error from agent
mafredri Apr 29, 2025
6580f35
fix test^2
mafredri Apr 29, 2025
4a5842b
rename ready to signalready
mafredri Apr 29, 2025
1f413db
use safer atomic pointer for containerapi
mafredri Apr 29, 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
echo codersdk error from agent
  • Loading branch information
@mafredri
mafredri committed Apr 29, 2025
commit 32b7d1828c5466d1d3e02b0ee67816b157e0072e
5 changes: 5 additions & 0 deletions coderd/workspaceagents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,11 @@ func (api *API) workspaceAgentListContainers(rw http.ResponseWriter, r *http.Req
})
return
}
// If the agent returns a codersdk.Error, we can return that directly.
if cerr, ok := codersdk.AsError(err); ok {
httpapi.Write(ctx, rw, cerr.StatusCode(), cerr.Response)
return
}
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error fetching containers.",
Detail: err.Error(),
Expand Down
Loading