gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-06 04:41:18 -08:00
Code Issues Packages Projects Releases Wiki Activity

feat(spdx): add support for SPDX 2.3 (#4058)

Browse Source 
Co-authored-by: knqyf263 <knqyf263@gmail.com>
This commit is contained in:
Idan Frimark
2023-04-23 23:36:04 +03:00
committed by GitHub
parent 107752df65
commit 48e021ea6b
12 changed files with 526 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
integration/integration_test.go
View File

@@ -15,13 +15,14 @@ import (
"time"
cdx "github.com/CycloneDX/cyclonedx-go"
"github.com/spdx/tools-golang/jsonloader"
spdxjson "github.com/spdx/tools-golang/json"
"github.com/spdx/tools-golang/spdx"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/aquasecurity/trivy-db/pkg/db"
"github.com/aquasecurity/trivy-db/pkg/metadata"
"github.com/aquasecurity/trivy/pkg/commands"
"github.com/aquasecurity/trivy/pkg/dbtest"
"github.com/aquasecurity/trivy/pkg/types"
@@ -162,12 +163,12 @@ func readCycloneDX(t *testing.T, filePath string) *cdx.BOM {
return bom
}
func readSpdxJson(t *testing.T, filePath string) *spdx.Document2_2 {
func readSpdxJson(t *testing.T, filePath string) *spdx.Document {
f, err := os.Open(filePath)
require.NoError(t, err)
defer f.Close()
bom, err := jsonloader.Load2_2(f)
bom, err := spdxjson.Read(f)
require.NoError(t, err)
sort.Slice(bom.Relationships, func(i, j int) bool {
@@ -179,7 +180,7 @@ func readSpdxJson(t *testing.T, filePath string) *spdx.Document2_2 {
// We don't compare values which change each time an SBOM is generated
bom.CreationInfo.Created = ""
bom.CreationInfo.DocumentNamespace = ""
bom.DocumentNamespace = ""
return bom
}