Skip to content

fix(fs): avoid shadowing errors in file.glob #9286

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 31, 2025
Merged

fix(fs): avoid shadowing errors in file.glob #9286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pkg/mapfs/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,13 +254,16 @@ func (f *file) glob(pattern string) ([]string, error) {

var err error
f.files.Range(func(name string, sub *file) bool {
if ok, err := filepath.Match(parts[0], name); err != nil {
var ok bool
ok, err = filepath.Match(parts[0], name)
if err != nil {
return false
} else if ok {
if len(parts) == 1 {
entries = append(entries, name)
} else {
subEntries, err := sub.glob(strings.Join(parts[1:], separator))
var subEntries []string
subEntries, err = sub.glob(strings.Join(parts[1:], separator))
if err != nil {
return false
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/mapfs/fs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,11 @@ func TestFS_Glob(t *testing.T) {
pattern: "nosuch",
wantErr: assert.NoError,
},
{
name: "invalid pattern",
pattern: "[abc",
wantErr: assert.Error,
},
}

for _, tt := range tests {
Expand Down
Loading