fix: forward ospkg detector options through ospkg.NewScanner (#10811)

Co-authored-by: Teppei Fukuda <knqyf263@gmail.com>

Author: DmitriyLewen

pkg/scan/ospkg/scan.go

@@ -16,10 +16,14 @@ type Scanner interface {
 	Scan(ctx context.Context, target types.ScanTarget, options types.ScanOptions) (types.Result, bool, error)
 }
 
-type scanner struct{}
+type scanner struct {
+	opts []ospkgDetector.Option
+}
 
-func NewScanner() Scanner {
-	return &scanner{}
+// NewScanner creates a new OS package scanner.
+// The given options are forwarded to ospkgDetector.NewDetector during Scan.
+func NewScanner(opts ...ospkgDetector.Option) Scanner {
+	return &scanner{opts: opts}
 }
 
 func (s *scanner) Scan(ctx context.Context, target types.ScanTarget, opts types.ScanOptions) (types.Result, bool, error) {
@@ -55,7 +59,7 @@ func (s *scanner) Scan(ctx context.Context, target types.ScanTarget, opts types.
 		return result, false, nil
 	}
 
-	detector, err := ospkgDetector.NewDetector(target)
+	detector, err := ospkgDetector.NewDetector(target, s.opts...)
 	if err != nil {
 		return result, false, xerrors.Errorf("unable to initialize Detector for OS packages: %w", err)
 	}

pkg/scan/ospkg/scan_test.go

@@ -0,0 +1,58 @@
+package ospkg_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	ospkgDetector "github.com/aquasecurity/trivy/pkg/detector/ospkg"
+	ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
+	"github.com/aquasecurity/trivy/pkg/scan/ospkg"
+	"github.com/aquasecurity/trivy/pkg/types"
+)
+
+type mockDriver struct {
+	called bool
+	vulns  []types.DetectedVulnerability
+}
+
+func (m *mockDriver) Detect(_ context.Context, _ string, _ *ftypes.Repository, _ []ftypes.Package) ([]types.DetectedVulnerability, error) {
+	m.called = true
+	return m.vulns, nil
+}
+
+func (m *mockDriver) IsSupportedVersion(_ context.Context, _ ftypes.OSType, _ string) bool {
+	return true
+}
+
+// TestScanner_Scan_ForwardsOptions verifies that options passed to NewScanner
+// are forwarded to ospkgDetector.NewDetector during Scan.
+func TestScanner_Scan_ForwardsOptions(t *testing.T) {
+	target := types.ScanTarget{
+		OS: ftypes.OS{
+			Family: ftypes.CentOS,
+			Name:   "7",
+		},
+		Packages: []ftypes.Package{
+			{Name: "vim"},
+		},
+	}
+	opts := types.ScanOptions{
+		Scanners: types.Scanners{types.VulnerabilityScanner},
+	}
+
+	want := []types.DetectedVulnerability{
+		{VulnerabilityID: "CVE-2024-0001"},
+	}
+
+	mockDrv := &mockDriver{vulns: want}
+	s := ospkg.NewScanner(ospkgDetector.WithDriver(target.OS.Family, mockDrv))
+
+	result, _, err := s.Scan(t.Context(), target, opts)
+	require.NoError(t, err)
+
+	assert.True(t, mockDrv.called, "expected the driver registered via the option to be used")
+	assert.Equal(t, want, result.Vulnerabilities)
+}