Update golangci-lint and apply lint fixes

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

.golangci.yml

@@ -11,6 +11,7 @@ linters:
     - bodyclose
     - containedctx
     - contextcheck
+    - cyclop
     - decorder
     - dogsled
     - dupl
@@ -25,8 +26,14 @@ linters:
     - exportloopref
     - forbidigo
     - forcetypeassert
+    - funlen
+    - gci
+    - ginkgolinter
+    - gocheckcompilerdirectives
     - gochecknoglobals
     - gochecknoinits
+    - gochecksumtype
+    - gocognit
     - goconst
     - gocritic
     - gocyclo
@@ -37,22 +44,27 @@ linters:
     - gofumpt
     - goheader
     - goimports
+    - gomnd
     - gomoddirectives
     - gomodguard
     - goprintffuncname
     - gosec
     - gosimple
+    - gosmopolitan
     - govet
     - grouper
     - importas
+    - inamedparam
     - ineffassign
     - interfacebloat
     - ireturn
     - lll
     - loggercheck
     - maintidx
     - makezero
+    - mirror
     - misspell
+    - musttag
     - nakedret
     - nestif
     - nilerr
@@ -63,18 +75,26 @@ linters:
     - nonamedreturns
     - nosprintfhostport
     - paralleltest
+    - perfsprint
     - prealloc
     - predeclared
     - promlinter
+    - protogetter
     - reassign
+    - revive
     - rowserrcheck
+    - sloglint
+    - spancheck
     - sqlclosecheck
     - staticcheck
     - stylecheck
+    - tagalign
     - tagliatelle
     - tenv
     - testableexamples
+    - testifylint
     - testpackage
+    - thelper
     - tparallel
     - typecheck
     - unconvert
@@ -83,22 +103,23 @@ linters:
     - usestdlibvars
     - wastedassign
     - whitespace
-    # - cyclop
+    - wrapcheck
+    - zerologlint
     # - depguard
     # - exhaustruct
-    # - funlen
-    # - gci
-    # - gocognit
-    # - gomnd
-    # - revive
-    # - thelper
     # - varnamelen
-    # - wrapcheck
     # - wsl
 linters-settings:
-  errcheck:
-    check-type-assertions: true
-    check-blank: true
+  funlen:
+    lines: 150
+  cyclop:
+    max-complexity: 15
+  gocognit:
+    min-complexity: 40
+  revive:
+    rules:
+      - name: dot-imports
+        disabled: true
   gocritic:
     enabled-checks:
       - appendAssign
@@ -110,6 +131,7 @@ linters-settings:
       - badLock
       - badRegexp
       - badSorting
+      - badSyncOnceFunc
       - boolExprSimplify
       - builtinShadow
       - builtinShadowDecl
@@ -175,7 +197,6 @@ linters-settings:
       - sliceClear
       - sloppyLen
       - sloppyReassign
-      - sloppyTestFuncName
       - sloppyTypeAssert
       - sortSlice
       - sprintfQuotedString
@@ -185,7 +206,6 @@ linters-settings:
       - stringsCompare
       - switchTrue
       - syncMapLoadAndDelete
-      - timeCmpSimplify
       - timeExprSimplify
       - todoCommentWithoutDetail
       - tooManyResultsChecker

Makefile

@@ -40,7 +40,7 @@ test:
 
 ${GOLANGCI_LINT}:
 	export \
-		VERSION=v1.55.2 \
+		VERSION=v1.56.2 \
 		URL=https://raw.githubusercontent.com/golangci/golangci-lint \
 		BINDIR=${BUILD_PATH} && \
 	curl -sfL $$URL/$$VERSION/install.sh | sh -s $$VERSION

cmd/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	. "github.com/saschagrunert/demo" //nolint:revive,stylecheck // dot imports are intended here
+	. "github.com/saschagrunert/demo" //nolint:stylecheck // dot imports are intended here
 	"github.com/urfave/cli/v2"
 )
 
@@ -28,7 +28,7 @@ func main() {
 }
 
 // setup will run before every demo.
-func setup(ctx *cli.Context) error {
+func setup(*cli.Context) error {
 	// Ensure can be used for easy sequential command execution
 	return Ensure(
 		"echo 'Doing first setup…'",
@@ -38,7 +38,7 @@ func setup(ctx *cli.Context) error {
 }
 
 // setup will run after every demo.
-func cleanup(ctx *cli.Context) error {
+func cleanup(*cli.Context) error {
 	return Ensure("echo 'Doing cleanup…'")
 }
 

demo.go

@@ -1,10 +1,10 @@
 package demo
 
 import (
-	"fmt"
 	"log"
 	"os"
 	"os/signal"
+	"strconv"
 	"time"
 
 	"github.com/urfave/cli/v2"
@@ -194,7 +194,7 @@ func (d *Demo) Cleanup(cleanupFn func(*cli.Context) error) {
 
 func (d *Demo) Add(run *Run, name, description string) {
 	flag := &cli.BoolFlag{
-		Name:    fmt.Sprintf("%d", len(d.runs)),
+		Name:    strconv.Itoa(len(d.runs)),
 		Aliases: []string{name},
 		Usage:   description,
 	}

demo_test.go

@@ -5,9 +5,8 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/urfave/cli/v2"
-
 	"github.com/saschagrunert/demo"
+	"github.com/urfave/cli/v2"
 )
 
 var _ = t.Describe("Demo", func() {

run.go

@@ -196,8 +196,11 @@ func (r *Run) printTitleAndDescription() error {
 
 func write(w io.Writer, str string) error {
 	_, err := w.Write([]byte(str))
+	if err != nil {
+		return fmt.Errorf("write: %w", err)
+	}
 
-	return err
+	return nil
 }
 
 func (s *step) run(current, max int) error {
@@ -284,7 +287,7 @@ func (s *step) print(msg ...string) error {
 	for _, m := range msg {
 		for _, c := range m {
 			if !s.r.options.Immediate {
-				//nolint:gosec // the sleep has no security implications
+				//nolint:gosec,gomnd // the sleep has no security implications and is randomly chosen
 				time.Sleep(time.Duration(rand.Intn(40)) * time.Millisecond)
 			}
 			if err := write(s.r.out, fmt.Sprintf("%c", c)); err != nil {

run_test.go

@@ -6,9 +6,8 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/urfave/cli/v2"
-
 	"github.com/saschagrunert/demo"
+	"github.com/urfave/cli/v2"
 )
 
 var _ = t.Describe("Run", func() {
@@ -26,7 +25,7 @@ var _ = t.Describe("Run", func() {
 
 		out = &strings.Builder{}
 		err := sut.SetOutput(out)
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 
 		opts = demo.Options{
 			AutoTimeout: 0,
@@ -42,7 +41,7 @@ var _ = t.Describe("Run", func() {
 		err := sut.RunWithOptions(opts)
 
 		// Then
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 		Expect(out).To(ContainSubstring(title))
 		Expect(out).To(ContainSubstring(description[0]))
 		Expect(out).To(ContainSubstring(description[1]))
@@ -60,7 +59,7 @@ var _ = t.Describe("Run", func() {
 		err := sut.RunWithOptions(opts)
 
 		// Then
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 		Expect(out).To(ContainSubstring(title))
 		Expect(out).To(ContainSubstring(description[0]))
 		Expect(out).To(ContainSubstring(description[1]))
@@ -80,7 +79,7 @@ var _ = t.Describe("Run", func() {
 		err := sut.RunWithOptions(opts)
 
 		// Then
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("should fail to set nil output", func() {
@@ -89,7 +88,7 @@ var _ = t.Describe("Run", func() {
 		err := sut.SetOutput(nil)
 
 		// Then
-		Expect(err).NotTo(BeNil())
+		Expect(err).To(HaveOccurred())
 	})
 
 	It("should succeed to run from a cli context", func() {
@@ -105,6 +104,6 @@ var _ = t.Describe("Run", func() {
 		err := sut.Run(ctx)
 
 		// Then
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 })

test/framework/framework.go

@@ -23,7 +23,7 @@ func NewTestFramework(setup, teardown func(*TestFramework) error) *TestFramework
 }
 
 // NilFunc is a convenience function which simply does nothing.
-func NilFunc(f *TestFramework) error {
+func NilFunc(*TestFramework) error {
 	return nil
 }
 
@@ -52,5 +52,6 @@ func (t *TestFramework) Describe(text string, body func()) bool {
 
 // RunFrameworkSpecs is a convenience wrapper for running tests.
 func RunFrameworkSpecs(t *testing.T, suiteName string) {
+	t.Helper()
 	ginkgo.RunSpecs(t, suiteName)
 }

util.go

@@ -1,6 +1,7 @@
 package demo
 
 import (
+	"fmt"
 	"os/exec"
 )
 
@@ -12,7 +13,7 @@ func Ensure(commands ...string) error {
 		cmd.Stderr = nil
 		cmd.Stdout = nil
 		if err := cmd.Run(); err != nil {
-			return err
+			return fmt.Errorf("run command: %w", err)
 		}
 	}
 

util_test.go

@@ -3,7 +3,6 @@ package demo_test
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
 	"github.com/saschagrunert/demo"
 )
 
@@ -14,6 +13,6 @@ var _ = t.Describe("Util", func() {
 		err := demo.Ensure("echo hi")
 
 		// When
-		Expect(err).To(BeNil())
+		Expect(err).ToNot(HaveOccurred())
 	})
 })