chore: remove SeverityOptions and getSeverityRulesProcessor

Author: ldez

pkg/lint/runner.go

@@ -91,7 +91,7 @@ func NewRunner(log logutils.Log, cfg *config.Config, args []string, goenv *gouti
 			processors.NewMaxFromLinter(cfg.Issues.MaxIssuesPerLinter, log.Child(logutils.DebugKeyMaxFromLinter), cfg),
 			processors.NewSourceCode(lineCache, log.Child(logutils.DebugKeySourceCode)),
 			processors.NewPathShortener(),
-			getSeverityRulesProcessor(&cfg.Severity, log, files),
+			processors.NewSeverity(log.Child(logutils.DebugKeySeverityRules), files, &cfg.Severity),
 
 			// The fixer still needs to see paths for the issues that are relative to the current directory.
 			processors.NewFixer(cfg, log, fileCache),
@@ -276,13 +276,3 @@ func getExcludeRulesProcessor(cfg *config.Issues, log logutils.Log, files *fsuti
 
 	return processors.NewExcludeRules(log.Child(logutils.DebugKeyExcludeRules), files, opts)
 }
-
-func getSeverityRulesProcessor(cfg *config.Severity, log logutils.Log, files *fsutils.Files) processors.Processor {
-	severityOpts := processors.SeverityOptions{
-		Default:       cfg.Default,
-		Rules:         cfg.Rules,
-		CaseSensitive: cfg.CaseSensitive,
-	}
-
-	return processors.NewSeverity(log.Child(logutils.DebugKeySeverityRules), files, severityOpts)
-}

pkg/result/processors/severity.go

@@ -18,12 +18,6 @@ type severityRule struct {
 	severity string
 }
 
-type SeverityOptions struct {
-	Default       string
-	Rules         []config.SeverityRule
-	CaseSensitive bool
-}
-
 type Severity struct {
 	name string
 
@@ -35,21 +29,21 @@ type Severity struct {
 	rules           []severityRule
 }
 
-func NewSeverity(log logutils.Log, files *fsutils.Files, opts SeverityOptions) *Severity {
+func NewSeverity(log logutils.Log, files *fsutils.Files, cfg *config.Severity) *Severity {
 	p := &Severity{
 		name:            "severity-rules",
 		files:           files,
 		log:             log,
-		defaultSeverity: opts.Default,
+		defaultSeverity: cfg.Default,
 	}
 
 	prefix := caseInsensitivePrefix
-	if opts.CaseSensitive {
+	if cfg.CaseSensitive {
 		prefix = ""
 		p.name = "severity-rules-case-sensitive"
 	}
 
-	p.rules = createSeverityRules(opts.Rules, prefix)
+	p.rules = createSeverityRules(cfg.Rules, prefix)
 
 	return p
 }

pkg/result/processors/severity_test.go

@@ -18,7 +18,7 @@ func TestSeverity_multiple(t *testing.T) {
 	files := fsutils.NewFiles(lineCache, "")
 	log := logutils.NewStderrLog(logutils.DebugKeyEmpty)
 
-	opts := SeverityOptions{
+	opts := &config.Severity{
 		Default: "error",
 		Rules: []config.SeverityRule{
 			{
@@ -134,7 +134,7 @@ func TestSeverity_pathPrefix(t *testing.T) {
 	files := fsutils.NewFiles(lineCache, pathPrefix)
 	log := logutils.NewStderrLog(logutils.DebugKeyEmpty)
 
-	opts := SeverityOptions{
+	opts := &config.Severity{
 		Default: "error",
 		Rules: []config.SeverityRule{
 			{
@@ -181,7 +181,7 @@ func TestSeverity_pathPrefix(t *testing.T) {
 }
 
 func TestSeverity_text(t *testing.T) {
-	opts := SeverityOptions{
+	opts := &config.Severity{
 		Rules: []config.SeverityRule{
 			{
 				BaseRule: config.BaseRule{
@@ -219,12 +219,12 @@ func TestSeverity_onlyDefault(t *testing.T) {
 	files := fsutils.NewFiles(lineCache, "")
 	log := logutils.NewStderrLog(logutils.DebugKeyEmpty)
 
-	opts := SeverityOptions{
+	opts := config.Severity{
 		Default: "info",
 		Rules:   []config.SeverityRule{},
 	}
 
-	p := NewSeverity(log, files, opts)
+	p := NewSeverity(log, files, &opts)
 
 	cases := []issueTestCase{
 		{Path: "ssl.go", Text: "ssl", Linter: "gosec"},
@@ -258,7 +258,7 @@ func TestSeverity_onlyDefault(t *testing.T) {
 }
 
 func TestSeverity_empty(t *testing.T) {
-	p := NewSeverity(nil, nil, SeverityOptions{})
+	p := NewSeverity(nil, nil, &config.Severity{})
 
 	processAssertSame(t, p, newIssueFromTextTestCase("test"))
 }
@@ -267,7 +267,7 @@ func TestSeverity_caseSensitive(t *testing.T) {
 	lineCache := fsutils.NewLineCache(fsutils.NewFileCache())
 	files := fsutils.NewFiles(lineCache, "")
 
-	opts := SeverityOptions{
+	opts := &config.Severity{
 		Default: "error",
 		Rules: []config.SeverityRule{
 			{
@@ -318,13 +318,13 @@ func TestSeverity_transform(t *testing.T) {
 
 	testCases := []struct {
 		desc     string
-		opts     SeverityOptions
+		opts     *config.Severity
 		issue    *result.Issue
 		expected *result.Issue
 	}{
 		{
 			desc: "apply severity from rule",
-			opts: SeverityOptions{
+			opts: &config.Severity{
 				Default: "error",
 				Rules: []config.SeverityRule{
 					{
@@ -347,7 +347,7 @@ func TestSeverity_transform(t *testing.T) {
 		},
 		{
 			desc: "apply severity from default",
-			opts: SeverityOptions{
+			opts: &config.Severity{
 				Default: "error",
 				Rules: []config.SeverityRule{
 					{
@@ -370,7 +370,7 @@ func TestSeverity_transform(t *testing.T) {
 		},
 		{
 			desc: "severity from rule override severity from linter",
-			opts: SeverityOptions{
+			opts: &config.Severity{
 				Default: "error",
 				Rules: []config.SeverityRule{
 					{
@@ -394,7 +394,7 @@ func TestSeverity_transform(t *testing.T) {
 		},
 		{
 			desc: "severity from default override severity from linter",
-			opts: SeverityOptions{
+			opts: &config.Severity{
 				Default: "error",
 				Rules: []config.SeverityRule{
 					{
@@ -418,7 +418,7 @@ func TestSeverity_transform(t *testing.T) {
 		},
 		{
 			desc: "keep severity from linter as rule",
-			opts: SeverityOptions{
+			opts: &config.Severity{
 				Default: "error",
 				Rules: []config.SeverityRule{
 					{
@@ -442,7 +442,7 @@ func TestSeverity_transform(t *testing.T) {
 		},
 		{
 			desc: "keep severity from linter as default",
-			opts: SeverityOptions{
+			opts: &config.Severity{
 				Default: severityFromLinter,
 				Rules: []config.SeverityRule{
 					{
@@ -466,7 +466,7 @@ func TestSeverity_transform(t *testing.T) {
 		},
 		{
 			desc: "keep severity from linter as default (without rule)",
-			opts: SeverityOptions{
+			opts: &config.Severity{
 				Default: severityFromLinter,
 			},
 			issue: &result.Issue{