From 440133ca307a978ee3c398fa8ee28ea12638522b Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Fri, 8 Mar 2024 22:31:20 +0100
Subject: [PATCH] Revert "feat: option to not override severity from linters
 (#4452)"

This reverts commit 3d9135248ba0ac28fae50bdfc06f4593e03fb940.
---
 .golangci.reference.yml           | 4 ----
 pkg/config/severity.go            | 7 +++----
 pkg/lint/runner.go                | 1 -
 pkg/result/processors/severity.go | 7 -------
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.golangci.reference.yml b/.golangci.reference.yml
index 6a6239774b19..ae5a971ab04a 100644
--- a/.golangci.reference.yml
+++ b/.golangci.reference.yml
@@ -2888,10 +2888,6 @@ severity:
   # Default: false
   case-sensitive: true
 
-  # Don't override severity defined by linters.
-  # Default: false
-  keep-linter-severity: true
-
   # When a list of severity rules are provided, severity information will be added to lint issues.
   # Severity rules have the same filtering capability as exclude rules
   # except you are allowed to specify one matcher per severity rule.
diff --git a/pkg/config/severity.go b/pkg/config/severity.go
index 49874c9a4c3a..a6d2c9ec3fb3 100644
--- a/pkg/config/severity.go
+++ b/pkg/config/severity.go
@@ -8,10 +8,9 @@ import (
 const severityRuleMinConditionsCount = 1
 
 type Severity struct {
-	Default            string         `mapstructure:"default-severity"`
-	CaseSensitive      bool           `mapstructure:"case-sensitive"`
-	Rules              []SeverityRule `mapstructure:"rules"`
-	KeepLinterSeverity bool           `mapstructure:"keep-linter-severity"` // TODO(ldez): in v2 should be changed to `Override`.
+	Default       string         `mapstructure:"default-severity"`
+	CaseSensitive bool           `mapstructure:"case-sensitive"`
+	Rules         []SeverityRule `mapstructure:"rules"`
 }
 
 func (s *Severity) Validate() error {
diff --git a/pkg/lint/runner.go b/pkg/lint/runner.go
index 78be9382dac4..13daa3b3b6cd 100644
--- a/pkg/lint/runner.go
+++ b/pkg/lint/runner.go
@@ -302,7 +302,6 @@ func getSeverityRulesProcessor(cfg *config.Severity, log logutils.Log, files *fs
 		Default:       cfg.Default,
 		Rules:         severityRules,
 		CaseSensitive: cfg.CaseSensitive,
-		Override:      !cfg.KeepLinterSeverity,
 	}
 
 	return processors.NewSeverity(log.Child(logutils.DebugKeySeverityRules), files, severityOpts)
diff --git a/pkg/result/processors/severity.go b/pkg/result/processors/severity.go
index 943b14a429db..8c62b64b9d5b 100644
--- a/pkg/result/processors/severity.go
+++ b/pkg/result/processors/severity.go
@@ -24,7 +24,6 @@ type SeverityOptions struct {
 	Default       string
 	Rules         []SeverityRule
 	CaseSensitive bool
-	Override      bool
 }
 
 type Severity struct {
@@ -36,7 +35,6 @@ type Severity struct {
 
 	defaultSeverity string
 	rules           []severityRule
-	override        bool
 }
 
 func NewSeverity(log logutils.Log, files *fsutils.Files, opts SeverityOptions) *Severity {
@@ -45,7 +43,6 @@ func NewSeverity(log logutils.Log, files *fsutils.Files, opts SeverityOptions) *
 		files:           files,
 		log:             log,
 		defaultSeverity: opts.Default,
-		override:        opts.Override,
 	}
 
 	prefix := caseInsensitivePrefix
@@ -65,10 +62,6 @@ func (p *Severity) Process(issues []result.Issue) ([]result.Issue, error) {
 	}
 
 	return transformIssues(issues, func(issue *result.Issue) *result.Issue {
-		if issue.Severity != "" && !p.override {
-			return issue
-		}
-
 		for _, rule := range p.rules {
 			rule := rule