Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

SPDX 2.3 support #1311

Merged
merged 16 commits into from
Nov 18, 2022
Merged

SPDX 2.3 support #1311

merged 16 commits into from
Nov 18, 2022

Conversation

kzantow
Copy link
Contributor

@kzantow kzantow commented Nov 2, 2022 •
edited
Loading

This PR makes a few notable changes:

  • Updates the spdx/tools-golang library to the current main (which is not released)
  • Updates the basic SPDX encoding/decoding to version 2.3 (there are some more enhancements to come later)
  • Consolidates the SPDX JSON and TagValue code paths to use the same conversion logic, which also:
    • Significantly improves both SPDX JSON and TagValue outputs

Fixes #1292

NOTE to reviewers: make sure to look at syft/formats/common/spdxhelpers/to_format_model.go, which is a consolidation of the tag-value and json converters, one of the more important things in this PR but it's collapsed by default in the GitHub UI.

@kzantow
feat: SPDX 2.3 support
13e79a1 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow
fix: update to unpublished fixed tools-golang version
598f9cc 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow
Merge remote-tracking branch 'upstream/main' into feat/spdx-2.3
55c87b4
@kzantow
chore: update tools-golang replace hash
9b80675 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow
chore: update docs and remove hasFiles
23bee01 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow
Copy link
Contributor Author

kzantow commented Nov 7, 2022 •
edited
Loading

NOTE: this is blocked on a fix in the tools-golang repo: spdx/tools-golang#170 -- Done!

@kzantow
chore: lint and update test fixtures
517224d 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow
chore: fix tests
a9a8e07 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
kzantow
kzantow commented Nov 8, 2022
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@kzantow
chore: update spdx/tools-golang reference
0ad6070 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow
chore: lint-fix
899e583 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow
Merge remote-tracking branch 'upstream/main' into feat/spdx-2.3
9fed4d0
@kzantow
chore: update spdx snapshots
e2f02fc 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow
chore: cleanup package name and panic
f57a229 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow kzantow marked this pull request as ready for review November 14, 2022 17:34
@kzantow kzantow requested a review from a team November 14, 2022 17:35
@kzantow
chore: reintroduce spdx relationship tests
07247dc 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow
chore: minor test cleanup and reorganization
c777b06 
Signed-off-by: Keith Zantow <kzantow@gmail.com>
wagoodman
wagoodman approved these changes Nov 17, 2022
View reviewed changes
Copy link
Contributor

@wagoodman wagoodman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😎

@kzantow kzantow merged commit 42cb0a4 into anchore:main Nov 18, 2022
@kzantow kzantow deleted the feat/spdx-2.3 branch November 18, 2022 13:54
spiffcs added a commit that referenced this pull request Nov 18, 2022
@spiffcs
Merge branch 'main' into 1111-clean-name-bug
d3537c8 
* main:
  feat: SPDX 2.3 support (#1311)

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
@kzantow
feat: SPDX 2.3 support (anchore#1311)
bd66ae2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

Support SPDX 2.3
2 participants
@kzantow @wagoodman