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

aquasecurity · Nov 13, 2022 · 6da148c · 6da148c
1 parent df9cf88
commit 6da148c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/pkg/sbom/spdx/marshal.go b/pkg/sbom/spdx/marshal.go
@@ -46,7 +46,7 @@ const (
 	PropertyLayerDigest = "LayerDigest"
 
 	RelationShipContains  = "CONTAINS"
-	RelationShipDescribe  = "DESCRIBE"
+	RelationShipDescribe  = "DESCRIBES"
 	RelationShipDependsOn = "DEPENDS_ON"
 
 	ElementOperatingSystem = "OperatingSystem"

diff --git a/pkg/sbom/spdx/marshal_test.go b/pkg/sbom/spdx/marshal_test.go
@@ -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",
 					},
 				},
 			},

diff --git a/pkg/sbom/spdx/testdata/happy/bom.json b/pkg/sbom/spdx/testdata/happy/bom.json
@@ -167,7 +167,7 @@
 	"relationships": [
 		{
 			"relatedSpdxElement": "SPDXRef-ContainerImage-b5d81cde5f95c8fc",
-			"relationshipType": "DESCRIBE",
+			"relationshipType": "DESCRIBES",
 			"spdxElementId": "SPDXRef-DOCUMENT"
 		},
 		{