fix(agent): disable dev container integration inside sub agents #18781
+28
−23
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…gent It appears we accidentally broke this logic in a previous PR. This should now correctly disable the agent api as we'd expect.
DanielleMaywood
commented
Jul 7, 2025
| @@ -2441,7 +2441,8 @@ func TestAgent_DevcontainersDisabledForSubAgent(t *testing.T) { | |||
|
|
|||
| // Setup the agent with devcontainers enabled initially. | |||
| //nolint:dogsled | |||
| conn, _, _, _, _ := setupAgent(t, manifest, 0, func(*agenttest.Client, *agent.Options) { | |||
| conn, _, _, _, _ := setupAgent(t, manifest, 0, func(_ *agenttest.Client, o *agent.Options) { | |||
| o.Devcontainers = true | |||
There was a problem hiding this comment.
It appears the test allowed the regression to occur as it had Dev Containers disabled by default. This means it didn't properly test the flow we'd expect.
DanielleMaywood
commented
Jul 7, 2025
Comment on lines
+339
to
+348
| containerAPIOpts := []agentcontainers.Option{ | ||
| agentcontainers.WithExecer(a.execer), | ||
| agentcontainers.WithCommandEnv(a.sshServer.CommandEnv), | ||
| agentcontainers.WithScriptLogger(func(logSourceID uuid.UUID) agentcontainers.ScriptLogger { | ||
| return a.logSender.GetScriptLogger(logSourceID) | ||
| }), | ||
| } | ||
| containerAPIOpts = append(containerAPIOpts, a.containerAPIOptions...) | ||
|
|
||
| a.containerAPI = agentcontainers.NewAPI(a.logger.Named("containers"), containerAPIOpts...) |
There was a problem hiding this comment.
We're going to create the API by default. This is fine as we only Init and then Start at a later stage. This allows us to assume containerAPI will always be a non-nil value.
There was a problem hiding this comment.
Pull Request Overview
This PR restores correct behavior for the dev container API by disabling it when running inside a sub-agent and adjusting the user-facing error messages accordingly.
- Update the
/api/v0/containershandler to checkdevcontainersflag first, then explicitly forbid calls from sub-agents. - Adjust test to enable
Devcontainersin options and assert on the new error text. - Remove conditional guard around
containerAPIinstantiation/closure to align API setup with the new flag-based routing.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| agent/api.go | Revised routing logic for /api/v0/containers based on flags and manifest parent. |
| agent/agent_test.go | Enabled Devcontainers option in setup and updated expected error messages. |
| agent/agent.go | Removed if a.devcontainers guard so containerAPI is always created and closed. |
Comments suppressed due to low confidence (1)
agent/agent.go:348
- Since
containerAPIis now instantiated unconditionally, consider wrapping its creation in thedevcontainersflag guard to avoid unnecessary resource allocation when the feature is disabled.
a.containerAPI = agentcontainers.NewAPI(a.logger.Named("containers"), containerAPIOpts...)
DanielleMaywood
commented
Jul 7, 2025
Comment on lines
+2457
to
+2458
| require.Contains(t, err.Error(), "Dev Container feature not supported.") | ||
| require.Contains(t, err.Error(), "Dev Container integration inside other Dev Containers is explicitly not supported.") |
There was a problem hiding this comment.
Reminder to run CODER_TEST_USE_DOCKER=1 go test ./coderd ./agent ./agent/agentcontainers if you want to verify the "integration" tests.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It appears we accidentally broke this logic in a previous PR. This should now correctly disable the agent api as we'd expect.