Repository navigation
Conversation
Project discovery added devcontainers with a config path but never registered a file watch for that config. When the container was later listed, container discovery only added a watch for entries it created or entries without a config path, so the discovered config was never watched and editing devcontainer.json did not mark the devcontainer dirty. Register the watch when project discovery adds the devcontainer. The fsnotify watcher ignores repeated Add calls for the same file. Fixes #32066
This branch was previously deployed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Editing
devcontainer.jsondidn't mark a devcontainer outdated when filesystem project discovery found the project before the Docker container was listed.Project discovery stored the devcontainer with its
ConfigPathset but never registered a file watch. When the container was later listed, container discovery only adds a watch for entries it creates or entries without a config path, so the config was never watched. Project discovery now registers the watch when it adds the devcontainer. The fsnotify watcher ignores repeatedAddcalls for the same file.Fixes #32066
Implementation notes
TestDevcontainerDiscovery/WatchConfigDiscoveredBeforeContainer: discover the project with no container, then add a matching container and refresh. The test asserts the watch is registered, sends a write event, and asserts the devcontainer is dirty. It fails onmain(no watched path). Passes with-race -count=20.ConfigPathhit the sameConfigPath == ""condition and may also be unwatched.go test -race ./agent/agentcontainers/...,go vet,golangci-lint(both configs).