fix(agent): fix script filtering for devcontainers #18635
Merged
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
mafredri
commented
Jun 27, 2025
8000
| slog.F("config_path_param", configPath), | ||
| ) | ||
| } | ||
|
|
||
| // Send logs via agent logging facilities. | ||
| logSourceID := api.devcontainerLogSourceIDs[dc.WorkspaceFolder] |
There was a problem hiding this comment.
Review: We were accessing this outside the mutex so I moved it just in case due to change in how we Init() the API which allows part of the API to be used before Init() is called with input that changes this map.
This was broken in #18630.
8402237 to
18bfab2
Compare
| agentcontainers.WithSubAgentClient(agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)), | ||
| ) | ||
|
|
||
| _, devcontainerScripts := agentcontainers.ExtractDevcontainerScripts(manifest.Devcontainers, manifest.Scripts) |
There was a problem hiding this comment.
Is there any reason to call this function twice?
There was a problem hiding this comment.
Mainly I wanted to reduce variable scope to avoid similar issues as introduced in the previous PR. And make it clear that scripts from earlier shouldn't be used here. It's a lightweight call but I can revert it if you prefer.
There was a problem hiding this comment.
I have no issue with the duplication just wanted to ensure I knew the reason why, all good!
DanielleMaywood
approved these changes
Jun 27, 2025
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.
This was broken in #18630.