remove parser interfaces

Signed-off-by: nikpivkin <[email protected]>

pkg/iac/scanners/azure/arm/parser/parser.go

@@ -9,7 +9,6 @@ import (
 	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
 	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure/arm/parser/armjson"
 	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure/resolver"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/options"
 	"github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/aquasecurity/trivy/pkg/log"
 )
@@ -19,15 +18,11 @@ type Parser struct {
 	logger   *log.Logger
 }
 
-func New(targetFS fs.FS, opts ...options.ParserOption) *Parser {
-	p := &Parser{
+func New(targetFS fs.FS) *Parser {
+	return &Parser{
 		targetFS: targetFS,
 		logger:   log.WithPrefix("arm parser"),
 	}
-	for _, opt := range opts {
-		opt(p)
-	}
-	return p
 }
 
 func (p *Parser) ParseFS(ctx context.Context, dir string) ([]azure.Deployment, error) {

pkg/iac/scanners/azure/arm/scanner.go

@@ -27,7 +27,6 @@ var _ options.ConfigurableScanner = (*Scanner)(nil)
 type Scanner struct {
 	mu                    sync.Mutex
 	scannerOptions        []options.ScannerOption
-	parserOptions         []options.ParserOption
 	logger                *log.Logger
 	frameworks            []framework.Framework
 	regoOnly              bool
@@ -112,7 +111,7 @@ func (s *Scanner) initRegoScanner(srcFS fs.FS) error {
 }
 
 func (s *Scanner) ScanFS(ctx context.Context, fsys fs.FS, dir string) (scan.Results, error) {
-	p := parser.New(fsys, s.parserOptions...)
+	p := parser.New(fsys)
 	deployments, err := p.ParseFS(ctx, dir)
 	if err != nil {
 		return nil, err

pkg/iac/scanners/cloudformation/parser/parser.go

@@ -14,12 +14,9 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/aquasecurity/trivy/pkg/iac/ignore"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/options"
 	"github.com/aquasecurity/trivy/pkg/log"
 )
 
-var _ options.ConfigurableParser = (*Parser)(nil)
-
 type Parser struct {
 	logger              *log.Logger
 	parameterFiles      []string
@@ -28,31 +25,27 @@ type Parser struct {
 	configsFS           fs.FS
 }
 
-func WithParameters(params map[string]any) options.ParserOption {
-	return func(cp options.ConfigurableParser) {
-		if p, ok := cp.(*Parser); ok {
-			p.parameters = params
-		}
+type Option func(*Parser)
+
+func WithParameters(params map[string]any) Option {
+	return func(p *Parser) {
+		p.parameters = params
 	}
 }
 
-func WithParameterFiles(files ...string) options.ParserOption {
-	return func(cp options.ConfigurableParser) {
-		if p, ok := cp.(*Parser); ok {
-			p.parameterFiles = files
-		}
+func WithParameterFiles(files ...string) Option {
+	return func(p *Parser) {
+		p.parameterFiles = files
 	}
 }
 
-func WithConfigsFS(fsys fs.FS) options.ParserOption {
-	return func(cp options.ConfigurableParser) {
-		if p, ok := cp.(*Parser); ok {
-			p.configsFS = fsys
-		}
+func WithConfigsFS(fsys fs.FS) Option {
+	return func(p *Parser) {
+		p.configsFS = fsys
 	}
 }
 
-func New(opts ...options.ParserOption) *Parser {
+func New(opts ...Option) *Parser {
 	p := &Parser{
 		logger: log.WithPrefix("cloudformation parser"),
 	}

pkg/iac/scanners/cloudformation/scanner.go

@@ -23,23 +23,23 @@ import (
 func WithParameters(params map[string]any) options.ScannerOption {
 	return func(cs options.ConfigurableScanner) {
 		if s, ok := cs.(*Scanner); ok {
-			s.addParserOptions(parser.WithParameters(params))
+			s.addParserOption(parser.WithParameters(params))
 		}
 	}
 }
 
 func WithParameterFiles(files ...string) options.ScannerOption {
 	return func(cs options.ConfigurableScanner) {
 		if s, ok := cs.(*Scanner); ok {
-			s.addParserOptions(parser.WithParameterFiles(files...))
+			s.addParserOption(parser.WithParameterFiles(files...))
 		}
 	}
 }
 
 func WithConfigsFS(fsys fs.FS) options.ScannerOption {
 	return func(cs options.ConfigurableScanner) {
 		if s, ok := cs.(*Scanner); ok {
-			s.addParserOptions(parser.WithConfigsFS(fsys))
+			s.addParserOption(parser.WithConfigsFS(fsys))
 		}
 	}
 }
@@ -58,14 +58,14 @@ type Scanner struct {
 	loadEmbeddedPolicies  bool
 	loadEmbeddedLibraries bool
 	options               []options.ScannerOption
-	parserOptions         []options.ParserOption
+	parserOptions         []parser.Option
 	frameworks            []framework.Framework
 	spec                  string
 }
 
 func (s *Scanner) SetIncludeDeprecatedChecks(bool) {}
 
-func (s *Scanner) addParserOptions(opt options.ParserOption) {
+func (s *Scanner) addParserOption(opt parser.Option) {
 	s.parserOptions = append(s.parserOptions, opt)
 }
 

pkg/iac/scanners/dockerfile/parser/parser.go

@@ -12,25 +12,18 @@ import (
 	"github.com/moby/buildkit/frontend/dockerfile/parser"
 
 	"github.com/aquasecurity/trivy/pkg/iac/providers/dockerfile"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/options"
 	"github.com/aquasecurity/trivy/pkg/log"
 )
 
-var _ options.ConfigurableParser = (*Parser)(nil)
-
 type Parser struct {
 	logger *log.Logger
 }
 
 // New creates a new Dockerfile parser
-func New(opts ...options.ParserOption) *Parser {
-	p := &Parser{
+func New() *Parser {
+	return &Parser{
 		logger: log.WithPrefix("dockerfile parser"),
 	}
-	for _, option := range opts {
-		option(p)
-	}
-	return p
 }
 
 func (p *Parser) ParseFS(ctx context.Context, target fs.FS, path string) (map[string]*dockerfile.Dockerfile, error) {

pkg/iac/scanners/helm/options.go

@@ -5,55 +5,50 @@ import (
 	"github.com/aquasecurity/trivy/pkg/iac/scanners/options"
 )
 
-type ConfigurableHelmScanner interface {
-	options.ConfigurableScanner
-	AddParserOptions(options ...options.ParserOption)
-}
-
 func ScannerWithValuesFile(paths ...string) options.ScannerOption {
 	return func(s options.ConfigurableScanner) {
-		if helmScanner, ok := s.(ConfigurableHelmScanner); ok {
-			helmScanner.AddParserOptions(parser.OptionWithValuesFile(paths...))
+		if helmScanner, ok := s.(*Scanner); ok {
+			helmScanner.addParserOptions(parser.OptionWithValuesFile(paths...))
 		}
 	}
 }
 
 func ScannerWithValues(values ...string) options.ScannerOption {
 	return func(s options.ConfigurableScanner) {
-		if helmScanner, ok := s.(ConfigurableHelmScanner); ok {
-			helmScanner.AddParserOptions(parser.OptionWithValues(values...))
+		if helmScanner, ok := s.(*Scanner); ok {
+			helmScanner.addParserOptions(parser.OptionWithValues(values...))
 		}
 	}
 }
 
 func ScannerWithFileValues(values ...string) options.ScannerOption {
 	return func(s options.ConfigurableScanner) {
-		if helmScanner, ok := s.(ConfigurableHelmScanner); ok {
-			helmScanner.AddParserOptions(parser.OptionWithFileValues(values...))
+		if helmScanner, ok := s.(*Scanner); ok {
+			helmScanner.addParserOptions(parser.OptionWithFileValues(values...))
 		}
 	}
 }
 
 func ScannerWithStringValues(values ...string) options.ScannerOption {
 	return func(s options.ConfigurableScanner) {
-		if helmScanner, ok := s.(ConfigurableHelmScanner); ok {
-			helmScanner.AddParserOptions(parser.OptionWithStringValues(values...))
+		if helmScanner, ok := s.(*Scanner); ok {
+			helmScanner.addParserOptions(parser.OptionWithStringValues(values...))
 		}
 	}
 }
 
 func ScannerWithAPIVersions(values ...string) options.ScannerOption {
 	return func(s options.ConfigurableScanner) {
-		if helmScanner, ok := s.(ConfigurableHelmScanner); ok {
-			helmScanner.AddParserOptions(parser.OptionWithAPIVersions(values...))
+		if helmScanner, ok := s.(*Scanner); ok {
+			helmScanner.addParserOptions(parser.OptionWithAPIVersions(values...))
 		}
 	}
 }
 
 func ScannerWithKubeVersion(values string) options.ScannerOption {
 	return func(s options.ConfigurableScanner) {
-		if helmScanner, ok := s.(ConfigurableHelmScanner); ok {
-			helmScanner.AddParserOptions(parser.OptionWithKubeVersion(values))
+		if helmScanner, ok := s.(*Scanner); ok {
+			helmScanner.addParserOptions(parser.OptionWithKubeVersion(values))
 		}
 	}
 }

pkg/iac/scanners/helm/parser/option.go

@@ -1,9 +1,6 @@
 package parser
 
-import "github.com/aquasecurity/trivy/pkg/iac/scanners/options"
-
 type ConfigurableHelmParser interface {
-	options.ConfigurableParser
 	SetValuesFile(...string)
 	SetValues(...string)
 	SetFileValues(...string)
@@ -12,50 +9,40 @@ type ConfigurableHelmParser interface {
 	SetKubeVersion(string)
 }
 
-func OptionWithValuesFile(paths ...string) options.ParserOption {
-	return func(p options.ConfigurableParser) {
-		if helmParser, ok := p.(ConfigurableHelmParser); ok {
-			helmParser.SetValuesFile(paths...)
-		}
+type Option func(p *Parser)
+
+func OptionWithValuesFile(paths ...string) Option {
+	return func(p *Parser) {
+		p.valuesFiles = paths
 	}
 }
 
-func OptionWithValues(values ...string) options.ParserOption {
-	return func(p options.ConfigurableParser) {
-		if helmParser, ok := p.(ConfigurableHelmParser); ok {
-			helmParser.SetValues(values...)
-		}
+func OptionWithValues(values ...string) Option {
+	return func(p *Parser) {
+		p.values = values
 	}
 }
 
-func OptionWithFileValues(values ...string) options.ParserOption {
-	return func(p options.ConfigurableParser) {
-		if helmParser, ok := p.(ConfigurableHelmParser); ok {
-			helmParser.SetValues(values...)
-		}
+func OptionWithFileValues(values ...string) Option {
+	return func(p *Parser) {
+		p.fileValues = values
 	}
 }
 
-func OptionWithStringValues(values ...string) options.ParserOption {
-	return func(p options.ConfigurableParser) {
-		if helmParser, ok := p.(ConfigurableHelmParser); ok {
-			helmParser.SetValues(values...)
-		}
+func OptionWithStringValues(values ...string) Option {
+	return func(p *Parser) {
+		p.stringValues = values
 	}
 }
 
-func OptionWithAPIVersions(values ...string) options.ParserOption {
-	return func(p options.ConfigurableParser) {
-		if helmParser, ok := p.(ConfigurableHelmParser); ok {
-			helmParser.SetAPIVersions(values...)
-		}
+func OptionWithAPIVersions(values ...string) Option {
+	return func(p *Parser) {
+		p.apiVersions = values
 	}
 }
 
-func OptionWithKubeVersion(value string) options.ParserOption {
-	return func(p options.ConfigurableParser) {
-		if helmParser, ok := p.(ConfigurableHelmParser); ok {
-			helmParser.SetKubeVersion(value)
-		}
+func OptionWithKubeVersion(value string) Option {
+	return func(p *Parser) {
+		p.kubeVersion = value
 	}
 }

pkg/iac/scanners/helm/parser/parser.go

@@ -21,7 +21,6 @@ import (
 	"helm.sh/helm/v3/pkg/releaseutil"
 
 	"github.com/aquasecurity/trivy/pkg/iac/detection"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/options"
 	"github.com/aquasecurity/trivy/pkg/log"
 )
 
@@ -47,31 +46,7 @@ type ChartFile struct {
 	ManifestContent  string
 }
 
-func (p *Parser) SetValuesFile(s ...string) {
-	p.valuesFiles = s
-}
-
-func (p *Parser) SetValues(values ...string) {
-	p.values = values
-}
-
-func (p *Parser) SetFileValues(values ...string) {
-	p.fileValues = values
-}
-
-func (p *Parser) SetStringValues(values ...string) {
-	p.stringValues = values
-}
-
-func (p *Parser) SetAPIVersions(values ...string) {
-	p.apiVersions = values
-}
-
-func (p *Parser) SetKubeVersion(value string) {
-	p.kubeVersion = value
-}
-
-func New(path string, opts ...options.ParserOption) (*Parser, error) {
+func New(path string, opts ...Option) (*Parser, error) {
 
 	client := action.NewInstall(&action.Configuration{})
 	client.DryRun = true     // don't do anything

pkg/iac/scanners/helm/scanner.go

@@ -31,7 +31,7 @@ type Scanner struct {
 	dataDirs              []string
 	logger                *log.Logger
 	options               []options.ScannerOption
-	parserOptions         []options.ParserOption
+	parserOptions         []parser.Option
 	policyReaders         []io.Reader
 	loadEmbeddedLibraries bool
 	loadEmbeddedPolicies  bool
@@ -68,7 +68,7 @@ func New(opts ...options.ScannerOption) *Scanner {
 	return s
 }
 
-func (s *Scanner) AddParserOptions(opts ...options.ParserOption) {
+func (s *Scanner) addParserOptions(opts ...parser.Option) {
 	s.parserOptions = append(s.parserOptions, opts...)
 }