From eb28f82088a8b199981544c86ddac18973697837 Mon Sep 17 00:00:00 2001
From: nathannaveen <42319948+nathannaveen@users.noreply.github.com>
Date: Thu, 18 Jul 2024 16:24:31 -0500
Subject: [PATCH] Fix tests

Signed-off-by: nathannaveen <42319948+nathannaveen@users.noreply.github.com>
---
 cmd/guacone/cmd/vulnerability.go   |  6 +++
 pkg/guacanalytics/searchForSBOM.go | 62 ++++++++++++++++--------------
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/cmd/guacone/cmd/vulnerability.go b/cmd/guacone/cmd/vulnerability.go
index aa33c56a492..dc435cc8394 100644
--- a/cmd/guacone/cmd/vulnerability.go
+++ b/cmd/guacone/cmd/vulnerability.go
@@ -139,6 +139,9 @@ func printVulnInfo(ctx context.Context, gqlclient graphql.Client, t table.Writer
 
 		if len(depVulnPath) == 0 {
 			err, o := searchStringToOccurrence(ctx, gqlclient, opts, logger)
+			if err != nil {
+				logger.Fatalf("error searching for occurrence: %v", err)
+			}
 
 			// The primaryCall parameter in searchForSBOMViaArtifact is there for us to know that
 			// the searchString is expected to be a PURL, but isn't, so we have to check via artifacts instead of PURLs.
@@ -163,6 +166,9 @@ func printVulnInfo(ctx context.Context, gqlclient graphql.Client, t table.Writer
 
 		if len(depVulnPath) == 0 {
 			err, subjectPackage := searchStringToPkg(ctx, gqlclient, opts, logger)
+			if err != nil {
+				logger.Fatalf("error searching for packages: %v", err)
+			}
 
 			// The primaryCall parameter in searchForSBOMViaPkg is there for us to know that
 			// the searchString is expected to be an artifact, but isn't, so we have to check via PURLs instead of artifacts.
diff --git a/pkg/guacanalytics/searchForSBOM.go b/pkg/guacanalytics/searchForSBOM.go
index 0844340157e..70bbd4fb864 100644
--- a/pkg/guacanalytics/searchForSBOM.go
+++ b/pkg/guacanalytics/searchForSBOM.go
@@ -6,7 +6,6 @@ import (
 	"github.com/Khan/genqlient/graphql"
 	model "github.com/guacsec/guac/pkg/assembler/clients/generated"
 	"github.com/guacsec/guac/pkg/assembler/helpers"
-	"github.com/guacsec/guac/pkg/dependencies"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"strings"
 )
@@ -117,36 +116,41 @@ func SearchForSBOMViaPkg(ctx context.Context, gqlclient graphql.Client, searchSt
 				if isDep.DependencyPackage.Type == guacType {
 					continue
 				}
-				var matchingDepPkgVersionIDs []string
-				if len(isDep.DependencyPackage.Namespaces[0].Names[0].Versions) == 0 {
-					findMatchingDepPkgVersionIDs, err := dependencies.FindDepPkgVersionIDs(ctx, gqlclient, isDep.DependencyPackage.Type, isDep.DependencyPackage.Namespaces[0].Namespace,
-						isDep.DependencyPackage.Namespaces[0].Names[0].Name, isDep.VersionRange)
-					if err != nil {
-						return nil, nil, fmt.Errorf("error from FindMatchingDepPkgVersionIDs:%w", err)
+				depPkgID := isDep.DependencyPackage.Namespaces[0].Names[0].Versions[0].Id
+				dfsN, seen := nodeMap[depPkgID]
+				if !seen {
+					dfsN = dfsNode{
+						parent: now,
+						pkgID:  depPkgID,
+						depth:  nowNode.depth + 1,
 					}
-					matchingDepPkgVersionIDs = append(matchingDepPkgVersionIDs, findMatchingDepPkgVersionIDs...)
-				} else {
-					matchingDepPkgVersionIDs = append(matchingDepPkgVersionIDs, isDep.DependencyPackage.Namespaces[0].Names[0].Versions[0].Id)
+					nodeMap[depPkgID] = dfsN
 				}
-				for _, pkgID := range matchingDepPkgVersionIDs {
-					dfsN, seen := nodeMap[pkgID]
-					if !seen {
-						dfsN = dfsNode{
-							parent: now,
-							pkgID:  pkgID,
-							depth:  nowNode.depth + 1,
-						}
-						nodeMap[pkgID] = dfsN
-					}
-					if !dfsN.expanded {
-						queue = append(queue, pkgID)
-					}
-					pkgVersionNeighbors, err := getVulnAndVexNeighborsForPackage(ctx, gqlclient, pkgID, isDep)
-					if err != nil {
-						return nil, nil, fmt.Errorf("getVulnAndVexNeighborsForPackage failed with error: %w", err)
+				if !dfsN.expanded {
+					queue = append(queue, depPkgID)
+				}
+				pkgVersionNeighbors, err := getVulnAndVexNeighborsForPackage(ctx, gqlclient, depPkgID, isDep)
+				if err != nil {
+					return nil, nil, fmt.Errorf("getVulnAndVexNeighbors failed with error: %w", err)
+				}
+				collectedPkgVersionResults = append(collectedPkgVersionResults, pkgVersionNeighbors)
+				checkedPkgIDs[depPkgID] = true
+
+			}
+
+			for _, isDep := range hasSBOM.IncludedDependencies {
+				if isDep.DependencyPackage.Type == guacType {
+					continue
+				}
+
+				depPkgID := isDep.DependencyPackage.Namespaces[0].Names[0].Versions[0].Id
+				if _, seen := nodeMap[depPkgID]; !seen {
+					dfsN := dfsNode{
+						parent: now,
+						pkgID:  depPkgID,
+						depth:  nowNode.depth + 1,
 					}
-					collectedPkgVersionResults = append(collectedPkgVersionResults, pkgVersionNeighbors)
-					checkedPkgIDs[pkgID] = true
+					nodeMap[depPkgID] = dfsN
 				}
 			}
 		}
@@ -220,7 +224,7 @@ func SearchForSBOMViaArtifact(ctx context.Context, gqlclient graphql.Client, sea
 		if nowNode.depth == 0 && primaryCall {
 			split := strings.Split(now, ":")
 			if len(split) != 2 {
-				return nil, nil, fmt.Errorf("error splitting search string %s, search string should have two sections algorithm and digest: %w", now, split)
+				return nil, nil, fmt.Errorf("error splitting search string %s, search string should have two sections algorithm and digest: %v", now, split)
 			}
 			algorithm := strings.ToLower(split[0])
 			digest := strings.ToLower(split[1])