test(table): use relationships

Signed-off-by: knqyf263 <[email protected]>
aquasecurity · Apr 26, 2024 · a0667ed · a0667ed
1 parent 5e620b0
commit a0667ed
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 36 deletions.
diff --git a/pkg/fanal/types/artifact.go b/pkg/fanal/types/artifact.go
@@ -95,7 +95,7 @@ type Package struct {
 	Modularitylabel string     `json:",omitempty"` // only for Red Hat based distributions
 	BuildInfo       *BuildInfo `json:",omitempty"` // only for Red Hat
 
-	Indirect     bool         `json:",omitempty"` // Deprecated: Use relationship
+	Indirect     bool         `json:",omitempty"` // Deprecated: Use relationship. Kept for backward compatibility.
 	Relationship Relationship `json:",omitempty"`
 
 	// Dependencies of this package

diff --git a/pkg/report/table/vulnerability_test.go b/pkg/report/table/vulnerability_test.go
@@ -171,38 +171,40 @@ Total: 1 (MEDIUM: 0, HIGH: 1)
 				Type:   "npm",
 				Packages: []ftypes.Package{
 					{
-						ID:       "[email protected]",
-						Name:     "node-fetch",
-						Version:  "1.7.3",
-						Indirect: true,
+						ID:           "[email protected]",
+						Name:         "node-fetch",
+						Version:      "1.7.3",
+						Relationship: ftypes.RelationshipIndirect,
 					},
 					{
-						ID:       "[email protected]",
-						Name:     "isomorphic-fetch",
-						Version:  "2.2.1",
-						Indirect: true,
+						ID:           "[email protected]",
+						Name:         "isomorphic-fetch",
+						Version:      "2.2.1",
+						Relationship: ftypes.RelationshipIndirect,
 						DependsOn: []string{
 							"[email protected]",
 						},
 					},
 					{
-						ID:       "[email protected]",
-						Name:     "fbjs",
-						Version:  "0.8.18",
-						Indirect: true,
+						ID:           "[email protected]",
+						Name:         "fbjs",
+						Version:      "0.8.18",
+						Relationship: ftypes.RelationshipIndirect,
 						DependsOn: []string{
 							"[email protected]",
 						},
 					},
 					{
-						ID:      "[email protected]",
-						Name:    "sanitize-html",
-						Version: "1.20.0",
+						ID:           "[email protected]",
+						Name:         "sanitize-html",
+						Version:      "1.20.0",
+						Relationship: ftypes.RelationshipDirect,
 					},
 					{
-						ID:      "[email protected]",
-						Name:    "styled-components",
-						Version: "3.1.3",
+						ID:           "[email protected]",
+						Name:         "styled-components",
+						Version:      "3.1.3",
+						Relationship: ftypes.RelationshipDirect,
 						DependsOn: []string{
 							"[email protected]",
 						},
@@ -260,41 +262,41 @@ package-lock.json
 `,
 		},
 		{
-			name: "happy path with vulnerability origin graph without direct dependency info",
+			name: "happy path with vulnerability origin graph with unknown relationships",
 			result: types.Result{
 				Target: "package-lock.json",
 				Class:  types.ClassLangPkg,
 				Type:   "npm",
 				Packages: []ftypes.Package{
 					{
-						ID:       "[email protected]",
-						Name:     "node-fetch",
-						Version:  "1.7.3",
-						Indirect: true,
+						ID:           "[email protected]",
+						Name:         "node-fetch",
+						Version:      "1.7.3",
+						Relationship: ftypes.RelationshipUnknown,
 					},
 					{
-						ID:       "[email protected]",
-						Name:     "isomorphic-fetch",
-						Version:  "2.2.1",
-						Indirect: true,
+						ID:           "[email protected]",
+						Name:         "isomorphic-fetch",
+						Version:      "2.2.1",
+						Relationship: ftypes.RelationshipUnknown,
 						DependsOn: []string{
 							"[email protected]",
 						},
 					},
 					{
-						ID:       "[email protected]",
-						Name:     "fbjs",
-						Version:  "0.8.18",
-						Indirect: true,
+						ID:           "[email protected]",
+						Name:         "fbjs",
+						Version:      "0.8.18",
+						Relationship: ftypes.RelationshipUnknown,
 						DependsOn: []string{
 							"[email protected]",
 						},
 					},
 					{
-						ID:       "[email protected]",
-						Name:     "styled-components",
-						Version:  "3.1.3",
-						Indirect: true,
+						ID:           "[email protected]",
+						Name:         "styled-components",
+						Version:      "3.1.3",
+						Relationship: ftypes.RelationshipUnknown,
 						DependsOn: []string{
 							"[email protected]",
 						},