lint: nosprintfhostport, ifelsechain (#3838)

* lint: nosprintfhostport

* lint: enable gocritic check "ifelsechain"

* update lint config

* lint

Author: mmetc

.golangci.yml

@@ -142,11 +142,19 @@ linters:
         - (*github.com/crowdsecurity/crowdsec/pkg/appsec.ReqDumpFilter).FilterHeaders
         - (*github.com/crowdsecurity/crowdsec/pkg/longpollclient.LongPollClient).Stop
 
+    errorlint:
+      # Check whether fmt.Errorf uses the %w verb for formatting errors.
+      # See the https://github.com/polyfloyd/go-errorlint for caveats.
+      # Default: true
+      errorf: false
+      errorf-multi: true
+      asserts: true
+      comparison: true
+
     gocritic:
       enable-all: true
       disabled-checks:
         - paramTypeCombine
-        - ifElseChain
         - hugeParam
         - commentedOutCode
         - commentedOutImport
@@ -163,6 +171,10 @@ linters:
         - preferFprint
         - importShadow
 
+      settings:
+        ifElseChain:
+          minThreshold: 4
+
     gomoddirectives:
       replace-allow-list:
         - golang.org/x/time/rate
@@ -297,10 +309,6 @@ linters:
         - -QF1003
         - -QF1012
 
-    wsl:
-      # Allow blocks to end with comments
-      allow-trailing-comment: true
-
   exclusions:
     presets:
       - comments
@@ -323,13 +331,6 @@ linters:
 
       # Will fix, easy but some thinking required
 
-      - linters:
-          - errorlint
-        text: non-wrapping format verb for fmt.Errorf. Use `%w` to format errors
-      - linters:
-          - nosprintfhostport
-        text: host:port in url should be constructed with net.JoinHostPort and not directly with fmt.Sprintf
-
       # https://github.com/timakin/bodyclose
       - linters:
           - bodyclose

cmd/crowdsec/run_in_svc_windows.go

@@ -37,31 +37,33 @@ func StartRunSvc() error {
 		return runService(svcName)
 	}
 
-	if flags.WinSvc == "Install" {
+	switch flags.WinSvc {
+	case "Install":
 		err = installService(svcName, svcDescription)
 		if err != nil {
 			return fmt.Errorf("failed to %s %s: %w", flags.WinSvc, svcName, err)
 		}
-	} else if flags.WinSvc == "Remove" {
+	case "Remove":
 		err = removeService(svcName)
 		if err != nil {
 			return fmt.Errorf("failed to %s %s: %w", flags.WinSvc, svcName, err)
 		}
-	} else if flags.WinSvc == "Start" {
+	case "Start":
 		err = startService(svcName)
 		if err != nil {
 			return fmt.Errorf("failed to %s %s: %w", flags.WinSvc, svcName, err)
 		}
-	} else if flags.WinSvc == "Stop" {
+	case "Stop":
 		err = controlService(svcName, svc.Stop, svc.Stopped)
 		if err != nil {
 			return fmt.Errorf("failed to %s %s: %w", flags.WinSvc, svcName, err)
 		}
-	} else if flags.WinSvc == "" {
+	case "":
 		return WindowsRun()
-	} else {
+	default:
 		return fmt.Errorf("Invalid value for winsvc parameter: %s", flags.WinSvc)
 	}
+
 	return nil
 }
 

pkg/csconfig/config.go

@@ -45,7 +45,6 @@ type Config struct {
 	Hub          *LocalHubCfg        `yaml:"-"`
 }
 
-// NewConfig
 func NewConfig(configFile string, disableAgent bool, disableAPI bool, quiet bool) (*Config, string, error) {
 	patcher := csyaml.NewPatcher(configFile, ".local")
 	patcher.SetQuiet(quiet)
@@ -99,9 +98,7 @@ func NewConfig(configFile string, disableAgent bool, disableAPI bool, quiet bool
 		return nil, "", err
 	}
 
-	if err = cfg.loadCSCLI(); err != nil {
-		return nil, "", err
-	}
+	cfg.loadCSCLI()
 
 	globalConfig = cfg
 

pkg/csconfig/cscli.go

@@ -1,10 +1,10 @@
 package csconfig
 
 import (
-	"fmt"
+	"net"
+	"strconv"
 )
 
-/*cscli specific config, such as hub directory*/
 type CscliCfg struct {
 	Output           string            `yaml:"output,omitempty"`
 	Color            string            `yaml:"color,omitempty"`
@@ -20,18 +20,19 @@ type CscliCfg struct {
 
 const defaultHubURLTemplate = "https://cdn-hub.crowdsec.net/crowdsecurity/%s/%s"
 
-func (c *Config) loadCSCLI() error {
+func (c *Config) loadCSCLI() {
 	if c.Cscli == nil {
 		c.Cscli = &CscliCfg{}
 	}
 
 	if c.Prometheus.ListenAddr != "" && c.Prometheus.ListenPort != 0 {
-		c.Cscli.PrometheusUrl = fmt.Sprintf("http://%s:%d/metrics", c.Prometheus.ListenAddr, c.Prometheus.ListenPort)
+		c.Cscli.PrometheusUrl = "http://" + net.JoinHostPort(
+			c.Prometheus.ListenAddr,
+			strconv.Itoa(c.Prometheus.ListenPort),
+		) + "/metrics"
 	}
 
 	if c.Cscli.HubURLTemplate == "" {
 		c.Cscli.HubURLTemplate = defaultHubURLTemplate
 	}
-
-	return nil
 }

pkg/csconfig/cscli_test.go

@@ -4,16 +4,13 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
-	"github.com/crowdsecurity/go-cs-lib/cstest"
 )
 
 func TestLoadCSCLI(t *testing.T) {
 	tests := []struct {
-		name        string
-		input       *Config
-		expected    *CscliCfg
-		expectedErr string
+		name     string
+		input    *Config
+		expected *CscliCfg
 	}{
 		{
 			name: "basic valid configuration",
@@ -40,12 +37,7 @@ func TestLoadCSCLI(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			err := tc.input.loadCSCLI()
-			cstest.RequireErrorContains(t, err, tc.expectedErr)
-			if tc.expectedErr != "" {
-				return
-			}
-
+			tc.input.loadCSCLI()
 			assert.Equal(t, tc.expected, tc.input.Cscli)
 		})
 	}

pkg/parser/runtime.go

@@ -160,7 +160,8 @@ func (n *Node) ProcessStatics(statics []ExtraField, event *types.Event) error {
 			}
 		}
 
-		if static.Method != "" {
+		switch {
+		case static.Method != "":
 			processed := false
 			/*still way too hackish, but : inject all the results in enriched, and */
 			if enricherPlugin, ok := n.EnrichFunctions.Registered[static.Method]; ok {
@@ -186,22 +187,22 @@ func (n *Node) ProcessStatics(statics []ExtraField, event *types.Event) error {
 			if !processed {
 				clog.Debugf("method '%s' doesn't exist", static.Method)
 			}
-		} else if static.Parsed != "" {
+		case static.Parsed != "":
 			clog.Debugf(".Parsed[%s] = '%s'", static.Parsed, value)
 			event.Parsed[static.Parsed] = value
-		} else if static.Meta != "" {
+		case static.Meta != "":
 			clog.Debugf(".Meta[%s] = '%s'", static.Meta, value)
 			event.Meta[static.Meta] = value
-		} else if static.Enriched != "" {
+		case static.Enriched != "":
 			clog.Debugf(".Enriched[%s] = '%s'", static.Enriched, value)
 			event.Enriched[static.Enriched] = value
-		} else if static.TargetByName != "" {
+		case static.TargetByName != "":
 			if !SetTargetByName(static.TargetByName, value, event) {
 				clog.Errorf("Unable to set value of '%s'", static.TargetByName)
 			} else {
 				clog.Debugf("%s = '%s'", static.TargetByName, value)
 			}
-		} else {
+		default:
 			clog.Fatal("unable to process static : unknown target")
 		}
 	}