fix(cyclonedx): fix unmarshal for licenses #5828
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
DmitriyLewen
changed the title
knqyf263
reviewed
Dec 27, 2023
pkg/sbom/cyclonedx/unmarshal.go
Outdated
|
|
||
| // getPackageLicenses checks all supported license fields and returns a list of licenses. | ||
| // https://cyclonedx.org/docs/1.5/json/#components_items_licenses | ||
| func getPackageLicenses(l *cdx.Licenses) []string { |
There was a problem hiding this comment.
nit: A more detailed function name is preferred, as get does not contain much information in most cases.
Suggested change
| func getPackageLicenses(l *cdx.Licenses) []string { | |
| func parsePackageLicenses(l *cdx.Licenses) []string { |
Even for getters, GetXXX is not common in Go.
https://go.dev/doc/effective_go#Getters
There was a problem hiding this comment.
changed in a79bcd4
knqyf263
approved these changes
Dec 29, 2023
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
After #4941 we use
Licenses.License.Namefield for marshal licenses.But we still check
Licenses.Expressionwhen unmarshalling.Add unmarshalling support for all CycloneDX supported fields. - Licenses.License.ID, Licenses.License.Name and Licenses.Expression.
Also update the testdata (cyclonedx files created using Trivy).
Checklist