refactor: restrict config scope

Author: ldez

pkg/lint/runner.go

@@ -107,7 +107,7 @@ func NewRunner(log logutils.Log, cfg *config.Config, args []string, goenv *gouti
 			processors.NewFixer(cfg, log, fileCache, metaFormatter),
 
 			// Must be after the Fixer.
-			processors.NewUniqByLine(cfg),
+			processors.NewUniqByLine(cfg.Issues.UniqByLine),
 			processors.NewMaxPerFileFromLinter(cfg),
 			processors.NewMaxSameIssues(cfg.Issues.MaxSameIssues, log.Child(logutils.DebugKeyMaxSameIssues), cfg),
 			processors.NewMaxFromLinter(cfg.Issues.MaxIssuesPerLinter, log.Child(logutils.DebugKeyMaxFromLinter), cfg),
@@ -117,7 +117,7 @@ func NewRunner(log logutils.Log, cfg *config.Config, args []string, goenv *gouti
 			processors.NewPathShortener(),
 			processors.NewSeverity(log.Child(logutils.DebugKeySeverityRules), files, &cfg.Severity),
 			processors.NewPathPrettifier(log, cfg.Output.PathPrefix),
-			processors.NewSortResults(cfg),
+			processors.NewSortResults(&cfg.Output),
 		},
 		lintCtx: lintCtx,
 		Log:     log,

pkg/result/processors/sort_results.go

@@ -36,7 +36,7 @@ type SortResults struct {
 	cfg *config.Output
 }
 
-func NewSortResults(cfg *config.Config) *SortResults {
+func NewSortResults(cfg *config.Output) *SortResults {
 	return &SortResults{
 		cmps: map[string][]issueComparator{
 			// For sorting we are comparing (in next order):
@@ -47,7 +47,7 @@ func NewSortResults(cfg *config.Config) *SortResults {
 			// For sorting we are comparing: severity
 			orderNameSeverity: {bySeverity},
 		},
-		cfg: &cfg.Output,
+		cfg: cfg,
 	}
 }
 

pkg/result/processors/sort_results_test.go

@@ -213,7 +213,7 @@ func TestSortResults_Process_noSorting(t *testing.T) {
 	tests := make([]result.Issue, len(issues))
 	copy(tests, issues)
 
-	sr := NewSortResults(&config.Config{})
+	sr := NewSortResults(&config.Output{})
 
 	results, err := sr.Process(tests)
 	require.NoError(t, err)
@@ -224,9 +224,9 @@ func TestSortResults_Process_Sorting(t *testing.T) {
 	tests := make([]result.Issue, len(issues))
 	copy(tests, issues)
 
-	cfg := config.Config{}
-	cfg.Output.SortResults = true
-	sr := NewSortResults(&cfg)
+	cfg := &config.Output{SortResults: true}
+
+	sr := NewSortResults(cfg)
 
 	results, err := sr.Process(tests)
 	require.NoError(t, err)

pkg/result/processors/uniq_by_line.go

@@ -1,7 +1,6 @@
 package processors
 
 import (
-	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/result"
 )
 
@@ -12,13 +11,13 @@ var _ Processor = (*UniqByLine)(nil)
 // UniqByLine filters reports to keep only one report by line of code.
 type UniqByLine struct {
 	fileLineCounter fileLineCounter
-	cfg             *config.Config
+	enable          bool
 }
 
-func NewUniqByLine(cfg *config.Config) *UniqByLine {
+func NewUniqByLine(enable bool) *UniqByLine {
 	return &UniqByLine{
 		fileLineCounter: fileLineCounter{},
-		cfg:             cfg,
+		enable:          enable,
 	}
 }
 
@@ -27,7 +26,7 @@ func (*UniqByLine) Name() string {
 }
 
 func (p *UniqByLine) Process(issues []result.Issue) ([]result.Issue, error) {
-	if !p.cfg.Issues.UniqByLine {
+	if !p.enable {
 		return issues, nil
 	}
 

pkg/result/processors/uniq_by_line_test.go

@@ -4,11 +4,10 @@ import (
 	"go/token"
 	"testing"
 
-	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/result"
 )
 
-func newFLIssue(file string, line int) result.Issue {
+func newULIssue(file string, line int) result.Issue {
 	return result.Issue{
 		Pos: token.Position{
 			Filename: file,
@@ -18,26 +17,20 @@ func newFLIssue(file string, line int) result.Issue {
 }
 
 func TestUniqByLine(t *testing.T) {
-	cfg := config.Config{}
-	cfg.Issues.UniqByLine = true
-
-	p := NewUniqByLine(&cfg)
-	i1 := newFLIssue("f1", 1)
+	p := NewUniqByLine(true)
+	i1 := newULIssue("f1", 1)
 
 	processAssertSame(t, p, i1)
 	processAssertEmpty(t, p, i1) // check skipping
 	processAssertEmpty(t, p, i1) // check accumulated error
 
-	processAssertSame(t, p, newFLIssue("f1", 2)) // another line
-	processAssertSame(t, p, newFLIssue("f2", 1)) // another file
+	processAssertSame(t, p, newULIssue("f1", 2)) // another line
+	processAssertSame(t, p, newULIssue("f2", 1)) // another file
 }
 
 func TestUniqByLineDisabled(t *testing.T) {
-	cfg := config.Config{}
-	cfg.Issues.UniqByLine = false
-
-	p := NewUniqByLine(&cfg)
-	i1 := newFLIssue("f1", 1)
+	p := NewUniqByLine(false)
+	i1 := newULIssue("f1", 1)
 
 	processAssertSame(t, p, i1)
 	processAssertSame(t, p, i1) // check the same issue passed twice