refactor(misconf): simplify k8s scanner #7717
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
Signed-off-by: nikpivkin <[email protected]>
Signed-off-by: nikpivkin <[email protected]>
Signed-off-by: nikpivkin <[email protected]>
Signed-off-by: nikpivkin <[email protected]>
simar7
reviewed
Oct 17, 2024
Comment on lines
-30
to
-67
| func (p *Parser) ParseFS(ctx context.Context, target fs.FS, path string) (map[string][]any, error) { | ||
| files := make(map[string][]any) | ||
| if err := fs.WalkDir(target, filepath.ToSlash(path), func(path string, entry fs.DirEntry, err error) error { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return ctx.Err() | ||
| default: | ||
| } | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if entry.IsDir() { | ||
| return nil | ||
| } | ||
|
|
||
| parsed, err := p.ParseFile(ctx, target, path) | ||
| if err != nil { | ||
| p.logger.Error("Parse error", log.FilePath(path), log.Err(err)) | ||
| return nil | ||
| } | ||
|
|
||
| files[path] = parsed | ||
| return nil | ||
| }); err != nil { | ||
| return nil, err | ||
| } | ||
| return files, nil | ||
| } | ||
|
|
||
| // ParseFile parses Kubernetes manifest from the provided filesystem path. | ||
| func (p *Parser) ParseFile(_ context.Context, fsys fs.FS, path string) ([]any, error) { | ||
| f, err := fsys.Open(filepath.ToSlash(path)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer func() { _ = f.Close() }() | ||
| return p.Parse(f, path) | ||
| } |
There was a problem hiding this comment.
Were they not used? I'm a little skeptical because they are exported funcs which may have been used elsewhere (outside of the project).
There was a problem hiding this comment.
This parser is specific to Trivy, I don't think it can be used anywhere else.
There was a problem hiding this comment.
OK - I guess only one way to find out 😺
simar7
approved these changes
Oct 17, 2024
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.
Description
In this PR:
Checklist