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

feat: update syft license concept to complex struct #1743

Merged
merged 108 commits into from
May 15, 2023
Merged

feat: update syft license concept to complex struct #1743

Changes from 1 commit
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
c41fbec
feat: add new syft/license package
spiffcs Mar 21, 2023
dcc8aae
refactor: refactor package structure to preven import loop
spiffcs Mar 21, 2023
1e9c39a
refactor: update license sections with TODO/Updates for branch
spiffcs Mar 21, 2023
7fa15d8
feat: update license package with basic spdx parse
spiffcs Mar 22, 2023
b480eb5
feat: update license construction for apk/alpm
spiffcs Mar 22, 2023
1e5b1ee
test: update format model and test util
spiffcs Apr 4, 2023
37183bb
fix: library code can return nil and no error
spiffcs Apr 6, 2023
bb95aa3
test: update schema and test code to compile
spiffcs Apr 6, 2023
d13cb08
test: fix panic in alpm test
spiffcs Apr 11, 2023
4b2bc13
fix: update license construction alpm
spiffcs Apr 11, 2023
b25b288
fix: alpm license refactor
spiffcs Apr 12, 2023
e499180
fix: update apkdb cataloger
spiffcs Apr 12, 2023
ff23f28
fix: deb cataloger license update
spiffcs Apr 12, 2023
f914dfa
fix: update java cataloger with new license behavior
spiffcs Apr 12, 2023
681e01e
fix: update javascript cataloger with license changes
spiffcs Apr 12, 2023
6fe8e93
feat: add php license detection
spiffcs Apr 12, 2023
e7626f6
feat: update portage licenses with new structure
spiffcs Apr 12, 2023
644d4c8
feat: python updates for license restructure
spiffcs Apr 12, 2023
6a3f6f5
chore: update license package to use new Validate lists
spiffcs Apr 13, 2023
cd9a81a
Merge branch 'main' into 1577-license-revamp
spiffcs Apr 17, 2023
678fa67
chore: merge conflicts update to take new changes
spiffcs Apr 17, 2023
3d6755c
chore: update schema with new breaking changes
spiffcs Apr 17, 2023
0d4cc6f
chore: remove double schema bump
spiffcs Apr 17, 2023
d2c7792
Merge branch 'main' into 1577-license-revamp
spiffcs Apr 19, 2023
7763daa
wip: wip
spiffcs Apr 19, 2023
5624420
wip: wip
spiffcs Apr 20, 2023
ce27877
chore: update fixtures with latest output: NOT FINAL
spiffcs Apr 24, 2023
3b01aa0
test: update unit tests with latest merged code
spiffcs Apr 24, 2023
195ee03
chore: go mod tidy
spiffcs Apr 24, 2023
cb9f23b
Update syft/pkg/cataloger/alpm/package.go
spiffcs Apr 24, 2023
247b505
chore: remove old wip comments/debug
spiffcs Apr 24, 2023
1d8eac8
chore: update cyclonedx decodeLicenses
spiffcs Apr 25, 2023
7caaf1c
chore: update cyclonedx decode to handle nil values
spiffcs Apr 25, 2023
dfc68cd
feat: add spdx license encoding from syft model
spiffcs Apr 25, 2023
db9f446
chore: update test to account for paren join
spiffcs Apr 25, 2023
90a5369
chore: add license types to format model tests
spiffcs Apr 25, 2023
1dacbdd
chore: update to_syft_model to parse new SPDX license format
spiffcs Apr 25, 2023
3a6bb77
chore: refactor joinLicenses
spiffcs Apr 25, 2023
6cfd42a
chore: update license encoder to use new license struct
spiffcs Apr 25, 2023
2164a43
chore: add back check for nil array in format_model
spiffcs Apr 25, 2023
206546e
chore: remove old location code from rebase
spiffcs Apr 25, 2023
4a328bc
chore: move evidence over into file.License
spiffcs Apr 25, 2023
a9349bb
chore: remove old java todo - update pointer declaration
spiffcs Apr 25, 2023
d8ccdcc
fix: adjust catalogers to conform with work for license structure upd…
wagoodman Apr 26, 2023
4dab716
chore: update fixtures with new merged code
spiffcs Apr 26, 2023
7bc3844
chore: remove location from required fields
spiffcs Apr 26, 2023
12561f9
feat: update custom UnmarshalJSON for licenses
spiffcs Apr 26, 2023
33bda0a
chore: go mod updates
spiffcs Apr 26, 2023
edb7f1c
chore: sa fixes
spiffcs Apr 26, 2023
67def34
Merge branch 'main' into 1577-license-revamp
spiffcs Apr 26, 2023
927bdc1
chore: wip
spiffcs Apr 26, 2023
f03dbed
chore: fixtures regenerated
spiffcs Apr 26, 2023
43fd3e5
chore: update schema definition to use different unmarshal
spiffcs Apr 26, 2023
30431a7
test: add detected licenses back into SBOM cataloger
spiffcs Apr 26, 2023
10e3fdd
chore: remove panic potential from test
spiffcs Apr 26, 2023
13ecc40
Merge branch 'main' into 1577-license-revamp
spiffcs Apr 26, 2023
33227b9
feat: schema licenses update
spiffcs Apr 26, 2023
cfff14e
license locations have the same id across layers
wagoodman Apr 26, 2023
27c8b62
feat: protect against deprecated license
spiffcs Apr 26, 2023
ac1097c
Merge branch 'main' into 1577-license-revamp
spiffcs Apr 27, 2023
742bbaa
feat: regenerate new merged schema
spiffcs Apr 27, 2023
3fd38eb
chore: update unit tests with new fixtures and license values
spiffcs Apr 27, 2023
031b40f
chore: cyclonedx license format valid
spiffcs Apr 27, 2023
3c592fe
chore: update unit tests for valid cyclonedx
spiffcs Apr 27, 2023
9f61e3b
chore: update decode to simplify cycle
spiffcs Apr 27, 2023
2c59388
chore: cyclonedx mutually exclusive fields updated
spiffcs Apr 27, 2023
7b5f0c0
chore: update tests with new case coverage for cyclonedx encoding
spiffcs Apr 27, 2023
a5f8b41
chore: first set of PR review comments
spiffcs Apr 27, 2023
3435524
chore: PR feedback surrounding license constructor usage
spiffcs Apr 27, 2023
75d9550
chore: update implicit fields to named
spiffcs Apr 27, 2023
999d1a0
chore: small pr feedback updates
spiffcs Apr 27, 2023
f77d538
chore: update schema
spiffcs Apr 27, 2023
6b2a23c
chore: update side affect from failing test
spiffcs Apr 27, 2023
73da8da
chore: add back old tests
spiffcs Apr 27, 2023
39cca15
chore: remove old TODO
spiffcs Apr 27, 2023
341c1d1
chore: update tests with license struct
spiffcs Apr 28, 2023
c9ac65a
chore: add parse tests for license.go
spiffcs Apr 28, 2023
34da464
[wip] add license sort interface + license set impl
wagoodman Apr 28, 2023
3b581c7
chore: add sorting tests for licenses
spiffcs Apr 28, 2023
2cfd64e
[wip] add license set tests
wagoodman Apr 28, 2023
f1350ff
chore: SA changes
spiffcs Apr 28, 2023
28a41b7
Merge branch 'main' into 1577-license-revamp
spiffcs May 4, 2023
699cbc7
1577 license set (#1798)
spiffcs May 10, 2023
213d9a9
Merge branch 'main' into 1577-license-revamp
spiffcs May 10, 2023
1e10714
Merge branch 'main' into 1577-license-revamp
spiffcs May 11, 2023
f045bf7
test: add failing tests for r cataloger licenses; update schema
spiffcs May 11, 2023
85f2f4d
test: update r parse version with specific rules
spiffcs May 11, 2023
60da8ba
test: add package merge test for collection
spiffcs May 11, 2023
0dbd3a6
chore: update license model to guarantee collection for location
spiffcs May 11, 2023
219056b
test: update golden images with new location collection
spiffcs May 12, 2023
26712bd
feat: protect map from empty license value
spiffcs May 12, 2023
71b5c48
chore: update log to include original value
spiffcs May 12, 2023
fb82494
chore: update test name remove 1
spiffcs May 12, 2023
5a5dceb
chore: remove old todo
spiffcs May 12, 2023
cbcb8b9
chore: update test to use declared struct
spiffcs May 12, 2023
96804f6
chore: update comments with linked issue
spiffcs May 12, 2023
029b9b1
chore: update new licenses from values
spiffcs May 12, 2023
2b9115d
chore: remove stale TODO
spiffcs May 12, 2023
63345c3
chore: lint-fix
spiffcs May 12, 2023
0a9b1b0
chore: update comment for URL/License merge
spiffcs May 12, 2023
3dab7e3
test: update hash test to prove URL ignored
spiffcs May 12, 2023
a0190d2
feat: simplify cyclone dx helper logic
spiffcs May 12, 2023
3f2d167
test: add new tests for cyclonedx encode behavior
spiffcs May 12, 2023
eac4871
Merge branch 'main' into 1577-license-revamp
spiffcs May 15, 2023
6bab23b
test: update tests with new SBOM cataloger changes
spiffcs May 15, 2023
667cbe2
fix: cleanup the logic for seen non url
spiffcs May 15, 2023
235b8d2
test: update coverage for encode/decode cdx
spiffcs May 15, 2023
d1d26d3
fix: update license logic in cyclonedxhelpers to account for dupes
spiffcs May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: sa fixes 
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
  • Loading branch information
@spiffcs
spiffcs committed Apr 26, 2023
commit edb7f1c4e0bb3328fec8cf36bc8477b17be6b115
3 changes: 1 addition & 2 deletions syft/formats/common/spdxhelpers/to_syft_model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import (
"strconv"
"strings"

"github.com/anchore/syft/syft/license"

"github.com/spdx/tools-golang/spdx"

"github.com/anchore/packageurl-go"
Expand All @@ -16,6 +14,7 @@ import (
"github.com/anchore/syft/syft/cpe"
"github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/formats/common/util"
"github.com/anchore/syft/syft/license"
"github.com/anchore/syft/syft/linux"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/sbom"
Expand Down