refactor: remove Config struct

cmd/loggercheck/main.go

@@ -7,5 +7,9 @@ import (
 )
 
 func main() {
-	singlechecker.Main(loggercheck.NewAnalyzer())
+	a, err := loggercheck.NewAnalyzer()
+	if err != nil {
+		panic(err)
+	}
+	singlechecker.Main(a)
 }

loggercheck.go

@@ -15,13 +15,14 @@ import (
 
 const Doc = `Checks key valur pairs for common logger libraries (logr,klog,zap).`
 
-func NewAnalyzer(opts ...Option) *analysis.Analyzer {
+func NewAnalyzer(opts ...Option) (*analysis.Analyzer, error) {
 	l := &loggercheck{}
 	for _, o := range opts {
-		o(l)
+		if err := o(l); err != nil {
+			return nil, err
+		}
 	}
 
-	l.cfg.init(l)
 	a := &analysis.Analyzer{
 		Name:     "loggercheck",
 		Doc:      Doc,
@@ -33,14 +34,12 @@ func NewAnalyzer(opts ...Option) *analysis.Analyzer {
 	a.Flags.Init("loggercheck", flag.ExitOnError)
 	a.Flags.Var(&l.ruleFile, "rulefile", "path to a file contains a list of rules.")
 	a.Flags.Var(&l.disable, "disable", fmt.Sprintf("comma-separated list of disabled logger checker (%s).", checkerKeys))
-	return a
+	return a, nil
 }
 
 type loggercheck struct {
 	disable  loggerCheckersFlag // flag -disable
 	ruleFile ruleFileFlag       // flag -rulefile
-
-	cfg *Config // used for external integration, for example golangci-lint
 }
 
 func (l *loggercheck) isCheckerDisabled(name string) bool {

loggercheck_test.go

@@ -40,7 +40,7 @@ func TestLinter(t *testing.T) {
 	for _, tc := range testCases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			a := loggercheck.NewAnalyzer()
+			a, _ := loggercheck.NewAnalyzer()
 			err := a.Flags.Parse(tc.flags)
 			require.NoError(t, err)
 			analysistest.Run(t, testdata, a, tc.patterns)
@@ -71,27 +71,24 @@ func TestOptions(t *testing.T) {
 		{
 			name: "disable-all-then-enable-mylogger",
 			options: []loggercheck.Option{
-				loggercheck.WithConfig(&loggercheck.Config{
-					Disable: []string{"klog", "logr", "zap"},
-					Rules:   rules,
-				}),
+				loggercheck.WithDisable([]string{"klog", "logr", "zap"}),
+				loggercheck.WithRules(rules),
 			},
 		},
 		{
 			name: "ignore-logr",
 			options: []loggercheck.Option{
-				loggercheck.WithConfig(&loggercheck.Config{
-					Disable: []string{"logr"},
-					Rules:   rules,
-				}),
+				loggercheck.WithDisable([]string{"logr"}),
+				loggercheck.WithRules(rules),
 			},
 		},
 	}
 
 	for _, tc := range testCases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			a := loggercheck.NewAnalyzer(tc.options...)
+			a, err := loggercheck.NewAnalyzer(tc.options...)
+			require.NoError(t, err)
 			analysistest.Run(t, testdata, a, "a/customonly")
 		})
 	}

options.go

@@ -1,9 +1,27 @@
 package loggercheck
 
-type Option func(*loggercheck)
+import (
+	"github.com/timonwong/loggercheck/rules"
+	"github.com/timonwong/loggercheck/sets"
+)
 
-func WithConfig(cfg *Config) Option {
-	return func(l *loggercheck) {
-		l.cfg = cfg
+type Option func(*loggercheck) error
+
+func WithDisable(disable []string) Option {
+	return func(l *loggercheck) error {
+		l.disable.StringSet = sets.NewStringSet(disable...)
+		return nil
+	}
+}
+
+func WithRules(customRules []string) Option {
+	return func(l *loggercheck) error {
+		l.ruleFile.filename = "<internal>"
+		ruleset, err := rules.ParseRules(customRules)
+		if err != nil {
+			return err
+		}
+		l.ruleFile.rulsetList = ruleset
+		return nil
 	}
 }

plugin/plugin.go

@@ -13,7 +13,11 @@ var AnalyzerPlugin analyzerPlugin
 type analyzerPlugin struct{}
 
 func (analyzerPlugin) GetAnalyzers() []*analysis.Analyzer {
+	a, err := loggercheck.NewAnalyzer()
+	if err != nil {
+		panic(err)
+	}
 	return []*analysis.Analyzer{
-		loggercheck.NewAnalyzer(),
+		a,
 	}
 }