fix(sbom): fix panic when scanning SBOM file without root component into SBOM format #7051
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
knqyf263
reviewed
Jun 28, 2024
pkg/sbom/io/encode.go
Outdated
| @@ -86,7 +86,10 @@ func (e *Encoder) rootComponent(r types.Report) (*core.Component, error) { | |||
| case artifact.TypeCycloneDX, artifact.TypeSPDX: | |||
| // When we scan SBOM file | |||
| if r.BOM != nil { | |||
| return r.BOM.Root(), nil | |||
| // If SBOM file doesn't contain root component - use filesystem | |||
| if bomRoot := r.BOM.Root(); bomRoot != nil { | |||
There was a problem hiding this comment.
Suggested change
| if bomRoot := r.BOM.Root(); bomRoot != nil { | |
| if r.BOM != nil && rBOM.Root() != nil { | |
| return r.BOM.Root(), nil |
There was a problem hiding this comment.
updated in c4c413a
| Name: "org.apache.logging.log4j:log4j-core", | ||
| Version: "2.23.1", | ||
| Identifier: ftypes.PkgIdentifier{ | ||
| UID: "6C0AE96901617503", |
There was a problem hiding this comment.
Is it needed? UID is not used in encode.go for now.
There was a problem hiding this comment.
oh.. right. Thanks!
It looks like I accidentally copied Report for testcase from PR where we add UID 😄
Removed in 9afe959
knqyf263
approved these changes
Jun 28, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
…e/fix-panic-when-there-is-no-root
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
See #7050
Related issues
metadata.componentinto SBOM format #7050Checklist