-
Notifications
You must be signed in to change notification settings - Fork 2
feat(config): resolve variable substitution in extends paths #254
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
localWorkspaceFolderis computed incorrectly for non-.devcontainer/config paths.filepath.Dir(filepath.Dir(configFilePath))only yields the correct workspace root whenconfigFilePathlives inside a.devcontainer/subdirectory (the canonical.devcontainer/devcontainer.jsonlayout). For the other two standard layouts it is wrong:Dir(Dir(path))/ws/.devcontainer/devcontainer.json/ws✓/ws/ws/.devcontainer.json(root-level)/ws✗/ws/ws/.devcontainer/myproj/devcontainer.json/ws/.devcontainer✗/wsAnd when
substituteExtendsRefsis called recursively fromextends.gowith a parent file that lives outside a.devcontainer/directory (e.g., a shared base at/shared/base.json), the computed workspace is again wrong.The proper fix is to thread the workspace folder through the call chain as a parameter. A lower-effort intermediate heuristic that handles the two most common layouts:
🛠️ Suggested heuristic fix
func substituteExtendsRefs(refs ExtendsRef, configFilePath string) ExtendsRef { - localWorkspaceFolder := filepath.Dir(filepath.Dir(configFilePath)) + // localWorkspaceFolder: parent of the .devcontainer/ dir when the config + // is inside one, otherwise the directory that contains the config file. + configDir := filepath.Dir(configFilePath) + localWorkspaceFolder := configDir + if filepath.Base(configDir) == ".devcontainer" { + localWorkspaceFolder = filepath.Dir(configDir) + }The long-term fix is to accept
workspaceFolder stringas a parameter onParseDevContainerJSONFile,parseDevContainerJSONFileWithVisited, andsubstituteExtendsRefs, matching the devcontainer spec where this value is provided by the host.📝 Committable suggestion
🤖 Prompt for AI Agents