fix: exclude bom info on namespace scope

Signed-off-by: chenk <hen.keinan@gmail.com>
aquasecurity · Nov 22, 2023 · 1c0593c · 1c0593c
1 parent c7e2f80
commit 1c0593c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/examples/trivy.go b/examples/trivy.go
@@ -124,7 +124,7 @@ func main() {
 		fmt.Println(a.RawResource)
 	}
 
-	bi, err := trivyk8s.ListBomInfo(ctx)
+	bi, err := trivyk8s.ListClusterBomInfo(ctx)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/pkg/trivyk8s/trivyk8s.go b/pkg/trivyk8s/trivyk8s.go
@@ -41,8 +41,8 @@ type ArtifactsK8S interface {
 	GetArtifact(context.Context, string, string) (*artifacts.Artifact, error)
 	// ListArtifactAndNodeInfo return kubernete scanable artifact and node info
 	ListArtifactAndNodeInfo(context.Context, string, map[string]string, ...corev1.Toleration) ([]*artifacts.Artifact, error)
-	// ListBomInfo returns kubernetes Bom (node,core components) information.
-	ListBomInfo(context.Context) ([]*artifacts.Artifact, error)
+	// ListClusterBomInfo returns kubernetes Bom (node,core components) information.
+	ListClusterBomInfo(context.Context) ([]*artifacts.Artifact, error)
 }
 
 type client struct {
@@ -156,11 +156,13 @@ func (c *client) ListArtifacts(ctx context.Context) ([]*artifacts.Artifact, erro
 			artifactList = append(artifactList, artifact)
 		}
 	}
-	bomArtifacts, err := c.ListBomInfo(ctx)
-	if err != nil {
-		return nil, err
+	if !namespaced {
+		bomArtifacts, err := c.ListClusterBomInfo(ctx)
+		if err != nil {
+			return nil, err
+		}
+		artifactList = append(artifactList, bomArtifacts...)
 	}
-	artifactList = append(artifactList, bomArtifacts...)
 	return artifactList, nil
 }
 
@@ -215,8 +217,8 @@ func (c *client) ListArtifactAndNodeInfo(ctx context.Context, namespace string,
 	return artifactList, err
 }
 
-// ListBomInfo returns kubernetes Bom (node,core components and etc) information.
-func (c *client) ListBomInfo(ctx context.Context) ([]*artifacts.Artifact, error) {
+// ListClusterBomInfo returns kubernetes Bom (node,core components and etc) information.
+func (c *client) ListClusterBomInfo(ctx context.Context) ([]*artifacts.Artifact, error) {
 
 	b, err := c.cluster.CreateClusterBom(ctx)
 	if err != nil {