fix: Migrate golangci-lint to v2

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>

Author: mem

.golangci.yaml

@@ -1,146 +1,90 @@
-enable:
-
-run:
-  deadline: 10m
-
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - asciicheck
     - bodyclose
-    # TODO(mem): - containedctx
-    # TODO(mem):- contextcheck
-    # TODO(mem): - cyclop
     - decorder
-    # - depguard
     - dogsled
-    # TODO(mem): - dupl
     - dupword
     - durationcheck
-    - errchkjson
     - errcheck
+    - errchkjson
     - errname
-    # TODO(mem): - errorlint
-    # TODO(mem): - exhaustive
     - gocheckcompilerdirectives
-    # - TODO(mem): gochecknoglobals
     - gochecknoinits
     - goconst
     - gocritic
-    # - gocognit
     - gocyclo
-    - gofmt
-    - gofumpt
-    - goimports
-    # - golint
-    # TODO(mem): - gomnd
     - goprintffuncname
-    # - gosec
     - gosmopolitan
-    - grouper
-    - gosimple
     - govet
-    # TODO(mem): fails because we are runnig in a container?: - importas
+    - grouper
     - ineffassign
     - interfacebloat
-    # TODO(mem): - ireturn
-    # - lll
     - loggercheck
-    # TODO(mem): - maintidx
     - mirror
     - misspell
-    # TODO(mem): fails because it's trying to run `go list all`?: - musttag
     - nakedret
     - nestif
-    # TODO(mem): - noctx
     - nolintlint
     - nosprintfhostport
-    # TODO(mem): - paralleltest
-    # TODO(mem): - prealloc
-    # TODO(mem): - promlinter
     - reassign
-    # TODO(mem): - revive
     - rowserrcheck
     - sqlclosecheck
     - staticcheck
-    # TODO(mem): - tagalign
-    - tenv
     - testableexamples
-    # TODO(mem): - thelper
-    - typecheck
     - unconvert
-    # TODO(mem): - unparam
-    # TODO(mem): - varnamelen
-    - wastedassign
     - unused
+    - wastedassign
     - whitespace
-    # TODO(mem): - wsl
     - zerologlint
-
-linters-settings:
-  goconst:
-    ignore-tests: false
-    min-len: 5
-    min-occurrences: 5
-  gocyclo:
-    min-complexity: 18
-  golint:
-    ignore-tests: false
-    min-confidence: 3
-  rowserrcheck:
-    packages:
-      - github.com/jmoiron/sqlx
-  gocritic:
-    enabled-checks:
-      - appendAssign
-      - argOrder
-      - assignOp
-      - badCall
-      - badCond
-      - captLocal
-      - caseOrder
-      - codegenComment
-      - commentFormatting
-      - defaultCaseOrder
-      - deprecatedComment
-      - dupArg
-      - dupBranchBody
-      - dupCase
-      - dupSubExpr
-      - elseif
-      - exitAfterDefer
-      - flagDeref
-      - flagName
-      - ifElseChain
-      - mapKey
-      - newDeref
-      - offBy1
-      - regexpMust
-      # - ruleguard
-      - singleCaseSwitch
-      - sloppyLen
-      - stringXbytes
-      - switchTrue
-      - typeSwitchVar
-      - underef
-      - unlambda
-      - unslice
-      - valSwap
-      - wrapperFunc
-    settings:
-      ruleguard:
-        rules: "internal/rules/rules.go"
-  importas:
-    no-unaliased: true
-    no-extra-aliases: true
-    alias:
-      - pkg: github.com/grafana/synthetic-monitoring-agent/pkg/pb/synthetic_monitoring
-        alias: sm
-      - pkg: github.com/prometheus/client_model/go
-        alias: dto
-
-issues:
-  exclude:
-    - "(func|method|type|var|struct field|func parameter|method parameter) [^ ]+ should be .*"
-  # new: true
-  # new-from-rev: v0.0.3
+  settings:
+    goconst:
+      min-len: 5
+      min-occurrences: 5
+    gocritic:
+      enabled-checks:
+        - stringXbytes
+        - ruleguard
+      settings:
+        ruleguard:
+          rules: internal/rules/rules.go
+    gocyclo:
+      min-complexity: 18
+    importas:
+      alias:
+        - pkg: github.com/grafana/synthetic-monitoring-agent/pkg/pb/synthetic_monitoring
+          alias: sm
+        - pkg: github.com/prometheus/client_model/go
+          alias: dto
+      no-unaliased: true
+      no-extra-aliases: true
+    rowserrcheck:
+      packages:
+        - github.com/jmoiron/sqlx
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - path: (.+)\.go$
+        text: (func|method|type|var|struct field|func parameter|method parameter) [^ ]+ should be .*
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

cli/probe.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana/synthetic-monitoring-agent/pkg/pb/synthetic_monitoring"
 	sm "github.com/grafana/synthetic-monitoring-agent/pkg/pb/synthetic_monitoring"
 	"github.com/urfave/cli/v2"
 )
@@ -231,12 +230,12 @@ func (c ProbesClient) updateProbe(ctx *cli.Context) error {
 	}
 	defer func() { _ = cleanup(ctx.Context) }()
 
-	var probeUpdateFunc func(ctx context.Context, probe synthetic_monitoring.Probe) (*synthetic_monitoring.Probe, []byte, error)
+	var probeUpdateFunc func(ctx context.Context, probe sm.Probe) (*sm.Probe, []byte, error)
 
 	if ctx.Bool("reset-token") {
 		probeUpdateFunc = smClient.ResetProbeToken
 	} else {
-		probeUpdateFunc = func(ctx context.Context, probe synthetic_monitoring.Probe) (*synthetic_monitoring.Probe, []byte, error) {
+		probeUpdateFunc = func(ctx context.Context, probe sm.Probe) (*sm.Probe, []byte, error) {
 			newProbe, err := smClient.UpdateProbe(ctx, probe)
 
 			return newProbe, nil, err //nolint:wrapcheck // this function is an adapter

examples/list-checks/main.go

@@ -44,7 +44,9 @@ func main() {
 	}
 
 	// Delete the access token when we are done.
-	defer c.DeleteToken(ctx)
+	defer func() {
+		_ = c.DeleteToken(ctx)
+	}()
 
 	err = listChecks(ctx, c, os.Stdout)
 	if err != nil {

examples/remove-probe/main.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/grafana/synthetic-monitoring-agent/pkg/pb/synthetic_monitoring"
+	sm "github.com/grafana/synthetic-monitoring-agent/pkg/pb/synthetic_monitoring"
 	smapi "github.com/grafana/synthetic-monitoring-api-go-client"
 )
 
@@ -43,7 +43,9 @@ func main() {
 	}
 
 	// delete the token we created by calling c.Install above.
-	defer c.DeleteToken(ctx)
+	defer func() {
+		_ = c.DeleteToken(ctx)
+	}()
 
 	probe, err := findProbe(ctx, cfg.ProbeName, installResp.TenantInfo.ID, c)
 	if err != nil {
@@ -104,10 +106,10 @@ func processFlags(args []string) (config, error) {
 	return cfg, nil
 }
 
-func findProbe(ctx context.Context, name string, tenantID int64, client *smapi.Client) (synthetic_monitoring.Probe, error) {
+func findProbe(ctx context.Context, name string, tenantID int64, client *smapi.Client) (sm.Probe, error) {
 	existingProbes, err := client.ListProbes(ctx)
 	if err != nil {
-		return synthetic_monitoring.Probe{}, fmt.Errorf("listing probes: %w", err)
+		return sm.Probe{}, fmt.Errorf("listing probes: %w", err)
 	}
 
 	for _, p := range existingProbes {
@@ -116,10 +118,10 @@ func findProbe(ctx context.Context, name string, tenantID int64, client *smapi.C
 		}
 	}
 
-	return synthetic_monitoring.Probe{}, fmt.Errorf(`Probe "%s" not found.`, name)
+	return sm.Probe{}, fmt.Errorf(`probe "%s" not found`, name)
 }
 
-func removeProbeFromChecks(ctx context.Context, probe synthetic_monitoring.Probe, client *smapi.Client) error {
+func removeProbeFromChecks(ctx context.Context, probe sm.Probe, client *smapi.Client) error {
 	checks, err := client.ListChecks(ctx)
 	if err != nil {
 		return fmt.Errorf("cannot list checks: %w", err)