Fix Directory.glob on directories with a sub path #6904
Merged
Conversation
This file contains 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
helderco
commented
Mar 19, 2024
| @@ -295,14 +293,14 @@ func (dir *Directory) Glob(ctx context.Context, src string, pattern string) ([]s | |||
| } | |||
| // empty directory, i.e. llb.Scratch() | |||
| if ref == nil { | |||
| if clean := path.Clean(src); clean == "." || clean == "/" { | |||
| if clean := path.Clean(dir.Dir); clean == "." || clean == "/" { | |||
There was a problem hiding this comment.
.Entries uses the src = path.Join(dir.Dir, src) here, but this branch comes from the solve from dir.LLB which doesn't factor src.
I tried triggering the error after this "if" in a test but couldn't because I'm not entirely sure when ref is nil without an error.
If ref == nil really only happens in dag.directory(), I feel like just doing this here:
if ref == nil {
return []string{}, nil
}\cc @jedevc
There was a problem hiding this comment.
SGTM - the only caller of Glob is in core/schema/directory.go, which only passes ., so every src directory is guaranteed to exist - so we shouldn't end up in a scenario where we hit the edge case.
jedevc
approved these changes
Mar 20, 2024
|
Can this be merged? |
Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
helderco
force-pushed
the
helder/oss-174-directoryglob-doesnt-work-when-parent-directory-isnt
branch
from
7be8608
to
3de2f18
Compare
|
Yep, just rebased. Waiting for checks. |
helderco
deleted the
helder/oss-174-directoryglob-doesnt-work-when-parent-directory-isnt
branch
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.
Fixes #6903