fix(sbom): move licenses to name field in Cyclonedx format
#4941
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
name fieldname field in Cyclonedx format
knqyf263
approved these changes
Aug 6, 2023
knqyf263
pushed a commit
to knqyf263/trivy
that referenced
this pull request
Aug 8, 2023
…urity#4941) * use license.Name instead of Expression * update tests
github-merge-queue bot
pushed a commit
that referenced
this pull request
Aug 8, 2023
* test: validate CycloneDX with the JSON schema * fix(sbom): move licenses to `name` field in Cyclonedx format (#4941) * use license.Name instead of Expression * update tests * test: add uuid package * test: compare UUID --------- Co-authored-by: DmitriyLewen <91113035+DmitriyLewen@users.noreply.github.com>
AnaisUrlichs
pushed a commit
to AnaisUrlichs/trivy
that referenced
this pull request
Aug 10, 2023
…urity#4941) * use license.Name instead of Expression * update tests
AnaisUrlichs
pushed a commit
to AnaisUrlichs/trivy
that referenced
this pull request
Aug 10, 2023
* test: validate CycloneDX with the JSON schema * fix(sbom): move licenses to `name` field in Cyclonedx format (aquasecurity#4941) * use license.Name instead of Expression * update tests * test: add uuid package * test: compare UUID --------- Co-authored-by: DmitriyLewen <91113035+DmitriyLewen@users.noreply.github.com>
6 tasks
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
Expression field is string including all licenses separated by
ANDorOR(https://cyclonedx.org/docs/1.4/json/#tab-pane_components_items_licenses_items_oneOf_i1).We can't determine correct separator in all cases.
But we can use
license.namefield(https://cyclonedx.org/docs/1.4/json/#components_items_licenses_items_license_name).As new feature, we can use
id, but we need to compare found licenses with license enums and remove licenses not from this list.Related issues
Checklist