Skip to content

Bug 1989398: Avoid processing the .indexignore file when walking the root fs #153

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

Closed
timflannagan wants to merge 1 commit into from
Closed

Bug 1989398: Avoid processing the .indexignore file when walking the root fs #153

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
10 changes: 8 additions & 2 deletions staging/operator-registry/internal/declcfg/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ import (
"github.com/operator-framework/operator-registry/internal/property"
)

const (
indexIgnoreFilename = ".indexignore"
)

type WalkFunc func(path string, cfg *DeclarativeConfig, err error) error

// WalkFS walks root using a gitignore-style filename matcher to skip files
Expand All @@ -27,7 +31,7 @@ func WalkFS(root fs.FS, walkFn WalkFunc) error {
if root == nil {
return fmt.Errorf("no declarative config filesystem provided")
}
matcher, err := ignore.NewMatcher(root, ".indexignore")
matcher, err := ignore.NewMatcher(root, indexIgnoreFilename)
if err != nil {
return err
}
Expand All @@ -36,7 +40,9 @@ func WalkFS(root fs.FS, walkFn WalkFunc) error {
if err != nil {
return walkFn(path, nil, err)
}
if info.IsDir() || matcher.Match(path, false) {
// avoid validating a directory, an .indexignore file, or any file that matches
// an ignore pattern outlined in a .indexignore file.
if info.IsDir() || info.Name() == indexIgnoreFilename || matcher.Match(path, false) {
Copy link
Copy Markdown
Contributor

@njhale njhale Aug 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there no tests for this?

return nil
}
file, err := root.Open(path)
Expand Down
10 changes: 8 additions & 2 deletions vendor/github.com/operator-framework/operator-registry/internal/declcfg/load.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.