update lint configuration (#120)

Author: mmetc

.golangci.yml

@@ -3,19 +3,14 @@ version: "2"
 linters:
   default: all
   disable:
-    - testableexamples
     - errcheck
-    - exptostd
-    - forbidigo
     - forcetypeassert
-    - gocritic
     - promlinter
     - embeddedstructfieldcheck
     - funcorder
     - noinlineerr
     - wsl_v5
 
-
     #
     # Redundant
     #
@@ -76,16 +71,16 @@ linters:
               desc: yaml.v2 is deprecated for new code in favor of yaml.v3
 
     errcheck:
-      # Report about not checking of errors in type assertions: `a := b.(MyStruct)`.
-      # Such cases aren't reported by default.
       check-type-assertions: false
-      # List of functions to exclude from checking, where each entry is a single function to exclude.
-      # See https://github.com/kisielk/errcheck#excluding-functions for details.
 
     gocritic:
       enable-all: true
       disabled-checks:
+        - appendCombine
+        - hugeParam
+        - importShadow
         - paramTypeCombine
+        - whyNoLint
 
     govet:
       disable:
@@ -115,8 +110,6 @@ linters:
             - 33
         - name: comment-spacings
           disabled: true
-#        - name: confusing-results
-#          disabled: true
         - name: cyclomatic
           arguments:
             # lower this after refactoring
@@ -142,8 +135,6 @@ linters:
           disabled: true
         - name: package-comments
           disabled: true
-        - name: var-naming
-          disabled: true
         - name: unchecked-type-assertion
           disabled: true
         - name: useless-break
@@ -153,10 +144,6 @@ linters:
       checks:
         - all
 
-    wsl:
-      # Allow blocks to end with comments
-      allow-trailing-comment: true
-
   exclusions:
     presets:
       - comments

cmd/root.go

@@ -56,7 +56,7 @@ func Execute() error {
 	flag.Parse()
 
 	if *bouncerVersion {
-		fmt.Printf("%s", version.FullString())
+		fmt.Fprintf(os.Stdout, "%s", version.FullString())
 		return nil
 	}
 
@@ -70,7 +70,7 @@ func Execute() error {
 	}
 
 	if *showConfig {
-		fmt.Println(string(configBytes))
+		fmt.Fprintln(os.Stdout, string(configBytes))
 		return nil
 	}
 

pkg/server/logging.go

@@ -119,7 +119,7 @@ const lowerhex = "0123456789abcdef"
 func appendQuoted(buf []byte, s string) []byte {
 	var runeTmp [utf8.UTFMax]byte
 	//nolint:wastedassign
-	for width := 0; len(s) > 0; s = s[width:] {
+	for width := 0; s != ""; s = s[width:] {
 		r := rune(s[0])
 		width = 1
 

scripts/_bouncer.sh

@@ -49,20 +49,23 @@ msg() {
 }
 
 require() {
-    set | grep -q "^$1=" || { msg err "missing required variable \$$1"; exit 1; }
+    set | grep -q "^$1=" || {
+        msg err "missing required variable \$$1"
+            exit 1
+        }
     shift
     [ "$#" -eq 0 ] || require "$@"
 }
 
 # shellcheck disable=SC2034
 {
-SERVICE="$BOUNCER.service"
-BIN_PATH_INSTALLED="/usr/local/bin/$BOUNCER"
-BIN_PATH="./$BOUNCER"
-CONFIG_DIR="/etc/crowdsec/bouncers"
-CONFIG_FILE="$BOUNCER.yaml"
-CONFIG="$CONFIG_DIR/$CONFIG_FILE"
-SYSTEMD_PATH_FILE="/etc/systemd/system/$SERVICE"
+    SERVICE="$BOUNCER.service"
+    BIN_PATH_INSTALLED="/usr/local/bin/$BOUNCER"
+    BIN_PATH="./$BOUNCER"
+    CONFIG_DIR="/etc/crowdsec/bouncers"
+    CONFIG_FILE="$BOUNCER.yaml"
+    CONFIG="$CONFIG_DIR/$CONFIG_FILE"
+    SYSTEMD_PATH_FILE="/etc/systemd/system/$SERVICE"
 }
 
 assert_root() {
@@ -141,7 +144,7 @@ set_api_key() {
             ret=1
         else
             echo "API Key successfully created" >&2
-            echo "$bouncer_id" > "$CONFIG.id"
+            echo "$bouncer_id" >"$CONFIG.id"
         fi
     else
         echo "cscli/crowdsec is not present, please set the API key manually" >&2