Refactor fileresolver to not require base path #4298
Merged
+174
−157
Conversation
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
Signed-off-by: Kudryavcev Nikolay <[email protected]>
Signed-off-by: Kudryavcev Nikolay <[email protected]>
Signed-off-by: Kudryavcev Nikolay <[email protected]>
wagoodman
reviewed
Oct 20, 2025
wagoodman
reviewed
Oct 20, 2025
wagoodman
reviewed
Oct 20, 2025
wagoodman
reviewed
Oct 20, 2025
kzantow
previously requested changes
Oct 20, 2025
syft/internal/fileresolver/file.go
Outdated
| // path is the filepath of the file we're creating content access for | ||
| func NewFromFile(parent, path string, pathFilters ...PathIndexVisitor) (*File, error) { | ||
| chroot, err := NewChrootContextFromCWD(parent, parent) | ||
| func NewFromFile(path string, pathFilters ...PathIndexVisitor) (*FileResolver, error) { |
There was a problem hiding this comment.
It looks like this is removing the parent here, I'm pretty sure there are some use cases where this is necessary to be a directory different than the parent of the provided path
There was a problem hiding this comment.
Looking at the tests and fileSource.FileResolver(), I didn't see a need for this. But on a broader note, is it even correct to index a directory that's different from the file's absolute path?
Signed-off-by: Kudryavcev Nikolay <[email protected]>
|
Thanks for review and the detailed explanations. I'll be more careful to avoid making breaking changes like this in the future |
wagoodman
approved these changes
Oct 29, 2025
technically the base path is not expressible in the SBOM output when the file source is used
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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
fileresolver.NewFromFileitself-resolve absolute pathsMoveGetDirectoryExclusionFunctionsto a common packagefileAnalysisPathcalculation to preserve the cleanupFnType of change
Checklist: