chore: sepration of concerns

Author: ldez

pkg/config/config.go

@@ -1,8 +1,6 @@
 package config
 
 import (
-	"errors"
-	"fmt"
 	"os"
 	"regexp"
 	"strings"
@@ -34,19 +32,16 @@ func (c *Config) GetConfigDir() string {
 }
 
 func (c *Config) Validate() error {
-	for i, rule := range c.Issues.ExcludeRules {
-		if err := rule.Validate(); err != nil {
-			return fmt.Errorf("error in exclude rule #%d: %w", i, err)
-		}
+	if err := c.Issues.Validate(); err != nil {
+		return err
 	}
 
-	if len(c.Severity.Rules) > 0 && c.Severity.Default == "" {
-		return errors.New("can't set severity rule option: no default severity defined")
+	if err := c.Severity.Validate(); err != nil {
+		return err
 	}
-	for i, rule := range c.Severity.Rules {
-		if err := rule.Validate(); err != nil {
-			return fmt.Errorf("error in severity rule #%d: %w", i, err)
-		}
+
+	if err := c.LintersSettings.Validate(); err != nil {
+		return err
 	}
 
 	return nil

pkg/config/issues.go

@@ -122,6 +122,16 @@ type Issues struct {
 	NeedFix bool `mapstructure:"fix"`
 }
 
+func (i *Issues) Validate() error {
+	for i, rule := range i.ExcludeRules {
+		if err := rule.Validate(); err != nil {
+			return fmt.Errorf("error in exclude rule #%d: %w", i, err)
+		}
+	}
+
+	return nil
+}
+
 type ExcludeRule struct {
 	BaseRule `mapstructure:",squash"`
 }

pkg/config/linters_settings.go

@@ -291,6 +291,10 @@ type LintersSettings struct {
 	Custom map[string]CustomLinterSettings
 }
 
+func (s *LintersSettings) Validate() error {
+	return s.Govet.Validate()
+}
+
 type AsasalintSettings struct {
 	Exclude              []string `mapstructure:"exclude"`
 	UseBuiltinExclusions bool     `mapstructure:"use-builtin-exclusions"`
@@ -606,15 +610,14 @@ type GovetSettings struct {
 }
 
 func (cfg *GovetSettings) Validate() error {
-	// TODO(ldez) need to be move into the linter file.
 	if cfg.EnableAll && cfg.DisableAll {
-		return errors.New("enable-all and disable-all can't be combined")
+		return errors.New("govet: enable-all and disable-all can't be combined")
 	}
 	if cfg.EnableAll && len(cfg.Enable) != 0 {
-		return errors.New("enable-all and enable can't be combined")
+		return errors.New("govet: enable-all and enable can't be combined")
 	}
 	if cfg.DisableAll && len(cfg.Disable) != 0 {
-		return errors.New("disable-all and disable can't be combined")
+		return errors.New("govet: disable-all and disable can't be combined")
 	}
 	return nil
 }

pkg/config/severity.go

@@ -1,5 +1,10 @@
 package config
 
+import (
+	"errors"
+	"fmt"
+)
+
 const severityRuleMinConditionsCount = 1
 
 type Severity struct {
@@ -8,6 +13,20 @@ type Severity struct {
 	Rules         []SeverityRule `mapstructure:"rules"`
 }
 
+func (s *Severity) Validate() error {
+	if len(s.Rules) > 0 && s.Default == "" {
+		return errors.New("can't set severity rule option: no default severity defined")
+	}
+
+	for i, rule := range s.Rules {
+		if err := rule.Validate(); err != nil {
+			return fmt.Errorf("error in severity rule #%d: %w", i, err)
+		}
+	}
+
+	return nil
+}
+
 type SeverityRule struct {
 	BaseRule `mapstructure:",squash"`
 	Severity string

pkg/golinters/govet.go

@@ -139,11 +139,6 @@ var (
 func NewGovet(settings *config.GovetSettings) *goanalysis.Linter {
 	var conf map[string]map[string]any
 	if settings != nil {
-		err := settings.Validate()
-		if err != nil {
-			linterLogger.Fatalf("govet configuration: %v", err)
-		}
-
 		conf = settings.Settings
 	}