Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

3030 license declared spdx correction #3461

Merged
merged 4 commits into from
Nov 19, 2024
Merged

3030 license declared spdx correction #3461

merged 4 commits into from
Nov 19, 2024

Conversation

spiffcs
Copy link
Contributor

@spiffcs spiffcs commented Nov 18, 2024

Description

The syft format helpers for spdx currently treat License-Ref-* as a valid spdx expression. This causes our selection on l.Value to be partially incorrect when trying to add licenses to the hasExtractedLicensingInfos in the spdx document.

This change updates the spdx helpers so that singular License-Ref candidates are added to this section.

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • I have added unit tests that cover changed behavior
  • I have tested my code in common scenarios and confirmed there are no regressions
  • I have added comments to my code, particularly in hard-to-understand sections

@spiffcs
feat: update hasExtractedLicense field to include license-ref candidates
ec8c6eb 
Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>
@spiffcs
test: add tests to cover new spdx license ref behavior
6658152 
Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>
@spiffcs spiffcs marked this pull request as ready for review November 18, 2024 14:30
@spiffcs spiffcs requested a review from wagoodman November 18, 2024 17:00
@spiffcs
chore: update based on PR comments
bd87e7e 
Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>
@spiffcs
chore: remove export
b38089a 
Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>
@spiffcs spiffcs enabled auto-merge (squash) November 19, 2024 14:52
@spiffcs spiffcs merged commit e7b65c2 into main Nov 19, 2024
12 checks passed
@spiffcs spiffcs deleted the 3030-license-declared-spdx-correction branch November 19, 2024 15:01
@BrewTestBot BrewTestBot mentioned this pull request Nov 21, 2024
Merged
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@wagoodman wagoodman wagoodman approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

LicenseDeclared not as per SPDX License List
2 participants
@spiffcs @wagoodman