From b1cbc84edd134591dbc6d0110e11784fc48e9dca Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter@icb4dc0.de>
Date: Wed, 10 Apr 2024 08:35:15 +0200
Subject: [PATCH] fix: golangci-lint settings

---
 .golangci.yml      | 25 +++++++++++++------------
 cmd/app.go         |  1 -
 config/env_test.go |  2 --
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index d4ebddc..9167fed 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,7 +5,14 @@ linters-settings:
     lines: 100
     statements: 50
   gci:
-    local-prefixes: code.icb4dc0.de/prskr/nurse
+    sections:
+      - standard
+      - default
+      - prefix(code.icb4dc0.de/prskr/nurse)
+      - blank
+      - dot
+      - alias
+    custom-order: true
   goconst:
     min-len: 2
     min-occurrences: 2
@@ -32,19 +39,15 @@ linters-settings:
   golint:
     min-confidence: 0
   gomnd:
-    settings:
-      mnd:
-        # don't include the "operation" and "assign"
-        checks:
-          - argument
-          - case
-          - condition
-          - return
+    checks:
+      - argument
+      - case
+      - condition
+      - return
   gomoddirectives:
     replace-allow-list:
       - github.com/docker/docker
   govet:
-    check-shadowing: true
     enable-all: true
     disable:
       - fieldalignment
@@ -125,7 +128,5 @@ issues:
           - govet
 
 run:
-  skip-files:
-    - ".*.mock.\\.go$"
   modules-download-mode: readonly
   timeout: 5m
diff --git a/cmd/app.go b/cmd/app.go
index d2f314d..b4c3a16 100644
--- a/cmd/app.go
+++ b/cmd/app.go
@@ -144,7 +144,6 @@ func (a *app) init(ctx *cli.Context) (err error) {
 		config.WithServersFromArgs(ctx.StringSlice(serversFlag)),
 		config.WithEndpointsFromEnv(),
 	)
-
 	if err != nil {
 		return fmt.Errorf("failed to load Nurse config: %w", err)
 	}
diff --git a/config/env_test.go b/config/env_test.go
index 18b0d93..f73a592 100644
--- a/config/env_test.go
+++ b/config/env_test.go
@@ -9,7 +9,6 @@ import (
 	"code.icb4dc0.de/prskr/nurse/config"
 )
 
-//nolint:paralleltest // not possible with env setup
 func TestServersFromEnv(t *testing.T) {
 	tests := []struct {
 		name    string
@@ -76,7 +75,6 @@ func TestServersFromEnv(t *testing.T) {
 	}
 }
 
-//nolint:paralleltest // not possible with env setup
 func TestEndpointsFromEnv(t *testing.T) {
 	tests := []struct {
 		name    string