Skip to content

Commit ad18518

Browse files
committed
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
1 parent d598cdd commit ad18518

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

internal/vulnerability/runner.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"time"
2424

2525
"github.com/aquasecurity/trivy/pkg/commands/artifact"
26+
ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
2627
"github.com/aquasecurity/trivy/pkg/flag"
2728
trivy_types "github.com/aquasecurity/trivy/pkg/types"
2829
"github.com/elastic/elastic-agent-libs/logp"
@@ -50,7 +51,8 @@ func NewVulnerabilityRunner(log *logp.Logger) (VulnerabilityRunner, error) {
5051
Debug: true,
5152
},
5253
PackageOptions: flag.PackageOptions{
53-
PkgTypes: []string{trivy_types.PkgTypeOS, trivy_types.PkgTypeLibrary},
54+
PkgTypes: []string{trivy_types.PkgTypeOS, trivy_types.PkgTypeLibrary},
55+
PkgRelationships: ftypes.Relationships,
5456
},
5557
ScanOptions: flag.ScanOptions{
5658
Scanners: []trivy_types.Scanner{trivy_types.VulnerabilityScanner},

internal/vulnerability/scanner.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"time"
2727

2828
db_types "github.com/aquasecurity/trivy-db/pkg/types"
29+
ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
2930
"github.com/aquasecurity/trivy/pkg/flag"
3031
trivy_types "github.com/aquasecurity/trivy/pkg/types"
3132
"github.com/elastic/elastic-agent-libs/logp"
@@ -118,7 +119,8 @@ func (f VulnerabilityScanner) scan(ctx context.Context, snap ec2.EBSSnapshot) {
118119
Debug: true,
119120
},
120121
PackageOptions: flag.PackageOptions{
121-
PkgTypes: []string{trivy_types.PkgTypeOS, trivy_types.PkgTypeLibrary},
122+
PkgTypes: []string{trivy_types.PkgTypeOS, trivy_types.PkgTypeLibrary},
123+
PkgRelationships: ftypes.Relationships,
122124
},
123125
ScanOptions: flag.ScanOptions{
124126
Target: fmt.Sprint("ebs:", snap.SnapshotId),

0 commit comments

Comments
 (0)