Add default cli values of --pkg-relationships

Package relationship has been introduced on aquasecurity/trivy#7237 and using CLI there are default relationship values (all). Using the library directly there is no default value and having 0 relationships and retrieving 0 finginds. Therefore on this commit we added the default value with all relationships
romulets · Aug 9, 2024 · ad18518 · ad18518
1 parent d598cdd
commit ad18518
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/internal/vulnerability/runner.go b/internal/vulnerability/runner.go
@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/aquasecurity/trivy/pkg/commands/artifact"
+	ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
 	"github.com/aquasecurity/trivy/pkg/flag"
 	trivy_types "github.com/aquasecurity/trivy/pkg/types"
 	"github.com/elastic/elastic-agent-libs/logp"
@@ -50,7 +51,8 @@ func NewVulnerabilityRunner(log *logp.Logger) (VulnerabilityRunner, error) {
 			Debug:   true,
 		},
 		PackageOptions: flag.PackageOptions{
-			PkgTypes: []string{trivy_types.PkgTypeOS, trivy_types.PkgTypeLibrary},
+			PkgTypes:         []string{trivy_types.PkgTypeOS, trivy_types.PkgTypeLibrary},
+			PkgRelationships: ftypes.Relationships,
 		},
 		ScanOptions: flag.ScanOptions{
 			Scanners: []trivy_types.Scanner{trivy_types.VulnerabilityScanner},

diff --git a/internal/vulnerability/scanner.go b/internal/vulnerability/scanner.go
@@ -26,6 +26,7 @@ import (
 	"time"
 
 	db_types "github.com/aquasecurity/trivy-db/pkg/types"
+	ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
 	"github.com/aquasecurity/trivy/pkg/flag"
 	trivy_types "github.com/aquasecurity/trivy/pkg/types"
 	"github.com/elastic/elastic-agent-libs/logp"
@@ -118,7 +119,8 @@ func (f VulnerabilityScanner) scan(ctx context.Context, snap ec2.EBSSnapshot) {
 			Debug:   true,
 		},
 		PackageOptions: flag.PackageOptions{
-			PkgTypes: []string{trivy_types.PkgTypeOS, trivy_types.PkgTypeLibrary},
+			PkgTypes:         []string{trivy_types.PkgTypeOS, trivy_types.PkgTypeLibrary},
+			PkgRelationships: ftypes.Relationships,
 		},
 		ScanOptions: flag.ScanOptions{
 			Target:   fmt.Sprint("ebs:", snap.SnapshotId),