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

fix(spdx): rename describes field in spdx (#3102)

Browse Source
This commit is contained in:
DmitriyLewen
2022-11-13 16:59:37 +06:00
committed by GitHub
parent df9cf88163
commit 6da148cca8
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/sbom/spdx/marshal.go
View File

@@ -46,7 +46,7 @@ const (
PropertyLayerDigest = "LayerDigest"
RelationShipContains = "CONTAINS"
RelationShipDescribe = "DESCRIBE"
RelationShipDescribe = "DESCRIBES"
RelationShipDependsOn = "DEPENDS_ON"
ElementOperatingSystem = "OperatingSystem"

10
pkg/sbom/spdx/marshal_test.go
View File

@@ -192,7 +192,7 @@ func TestMarshaler_Marshal(t *testing.T) {
{
RefA: spdx.DocElementID{ElementRefID: "DOCUMENT"},
RefB: spdx.DocElementID{ElementRefID: "ContainerImage-9396d894cd0cb6cb"},
Relationship: "DESCRIBE",
Relationship: "DESCRIBES",
},
{
RefA: spdx.DocElementID{ElementRefID: "ContainerImage-9396d894cd0cb6cb"},
@@ -400,7 +400,7 @@ func TestMarshaler_Marshal(t *testing.T) {
{
RefA: spdx.DocElementID{ElementRefID: "DOCUMENT"},
RefB: spdx.DocElementID{ElementRefID: "ContainerImage-413bfede37ad01fc"},
Relationship: "DESCRIBE",
Relationship: "DESCRIBES",
},
{
RefA: spdx.DocElementID{ElementRefID: "ContainerImage-413bfede37ad01fc"},
@@ -498,7 +498,7 @@ func TestMarshaler_Marshal(t *testing.T) {
{
RefA: spdx.DocElementID{ElementRefID: "DOCUMENT"},
RefB: spdx.DocElementID{ElementRefID: "Filesystem-5af0f1f08c20909a"},
Relationship: "DESCRIBE",
Relationship: "DESCRIBES",
},
{
RefA: spdx.DocElementID{ElementRefID: "Filesystem-5af0f1f08c20909a"},
@@ -590,7 +590,7 @@ func TestMarshaler_Marshal(t *testing.T) {
{
RefA: spdx.DocElementID{ElementRefID: "DOCUMENT"},
RefB: spdx.DocElementID{ElementRefID: "Repository-7cb7a269a391a798"},
Relationship: "DESCRIBE",
Relationship: "DESCRIBES",
},
{
RefA: spdx.DocElementID{ElementRefID: "Repository-7cb7a269a391a798"},
@@ -637,7 +637,7 @@ func TestMarshaler_Marshal(t *testing.T) {
{
RefA: spdx.DocElementID{ElementRefID: "DOCUMENT"},
RefB: spdx.DocElementID{ElementRefID: "Filesystem-70f34983067dba86"},
Relationship: "DESCRIBE",
Relationship: "DESCRIBES",
},
},
},

2
pkg/sbom/spdx/testdata/happy/bom.json vendored
View File

@@ -167,7 +167,7 @@
"relationships": [
{
"relatedSpdxElement": "SPDXRef-ContainerImage-b5d81cde5f95c8fc",
"relationshipType": "DESCRIBE",
"relationshipType": "DESCRIBES",
"spdxElementId": "SPDXRef-DOCUMENT"
},
{