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

Add files import from SPDX #6

Merged
merged 1 commit into from
Sep 2, 2022
+11 −0
Merged

Add files import from SPDX #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions sbom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type Package struct {
DownloadURL string
HomepageURL string
License []string
Files []string

CPEs []string
}
Expand Down Expand Up @@ -113,6 +114,15 @@ func addSPDX(img *Image, doc *spdx.Document2_2) {
}

for _, p := range doc.Packages {
var files []string
for _, f := range p.Files {
if f == nil {
// HACK: the SPDX parser is broken with multiple files in hasFiles
continue
}
files = append(files, f.FileName)
}

pkg := Package{
Name: p.PackageName,
Version: p.PackageVersion,
Expand All @@ -121,6 +131,7 @@ func addSPDX(img *Image, doc *spdx.Document2_2) {
HomepageURL: p.PackageHomePage,
DownloadURL: p.PackageDownloadLocation,
License: strings.Split(p.PackageLicenseConcluded, " AND "),
Files: files,
}

typ := pkgTypeUnknown
Expand Down