chore: upgrade golangci-lint to v2, please linters

Author: Thomas Delbende

.golangci.yml

@@ -1,71 +1,86 @@
+version: "2"
 run:
   go: "1.24"
   timeout: 5m
 
 linters:
-  enable-all: true
+  default: all
   disable:
-    # Base linters disabled for all projects.
-    - funlen
-    - mnd # Same as above
+    - contextcheck # Requires to change a lot of code to pass a context everywhere.
+    - cyclop # We use maintidx to lint function complexity.
+    - errorlint # Should be enabled, but it's difficult to test that we keep the same behavior with errors.As.
     - exhaustruct # This linter is meant to be used only for special cases. It is not recommended to use it for all files in a project.
-    - gci # Conflicts with gofumpt.
-    - ireturn # Complain that interface A implementation method return an interface B... it's a requirement of interface A that is unavoidable.
-    - nonamedreturns # Warn for every named return, not useful.
+    - funlen
+    - gocognit # We use maintidx to lint function complexity.
+    - gocyclo # We use maintidx to lint function complexity.
+    - godox # Too many TODO in code, but should be removed and TODO fixed :)
+    - gomoddirectives # We sometimes need to use mod replacements to fix upgrades.
     - interfacebloat # Warn when an interface has too many methods, not useful.
-    # Deprecated and replaced linter.
-    - tenv
-    # We use maintidx to lint function complexity.
-    - gocyclo
-    - cyclop
-    - gocognit
-
-    # Project specific disable.
+    - ireturn # Complain that interface A implementation method return an interface B... it's a requirement of interface A that is unavoidable.
     - lll
-    - varnamelen # I think there is too many false-positive.
-    - godox # too many TODO in code, but should be removed and TODO fixed :)
+    - mnd # Too picky.
+    - musttag # json tags must be added public fields used in JSON. Disabled because it also reports errors on dependencies.
     - nestif # Too many error for now, which would require significant refactor.
+    - nonamedreturns # Warn for every named return, not useful.
+    - paralleltest # Requires reviewing all our tests. Should be done.
     - tagliatelle # Check struct tags. Too many errors we can't fix.
+    - testpackage # Requires reviewing all our tests. Should be done.
+    - tparallel # Requires reviewing all our tests. Should be done.
+    - varnamelen # I think there is too many false-positive.
     - wrapcheck # Too many errors, which would require to refactor most returned errors.
-    - errorlint # Should be enabled, but it's difficult to test that we keep the same behavior with errors.As.
-    - contextcheck # Requires to change a lot of code to pass a context everywhere.
-    - gomoddirectives # We sometimes need to use mod replacements to fix upgrades.
-    - musttag # json tags must be added public fields used in JSON. Disabled because it also report errors on dependencies.
-    # Requires to review all our tests. Should be done.
-    - paralleltest
-    - tparallel
-    - testpackage
 
-linters-settings:
-  nolintlint:
-    # Require nolint directives to mention the specific linter being suppressed.
-    require-specific: true
-
-  tagliatelle:
-    # Check struct tag name case.
-    case:
-      # Use the struct field name to check the name of the struct tag.
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: io/ioutil
+              desc: ioutil is deprecated starting with Go 1.16
+    nolintlint:
+      # Require nolint directives to mention the specific linter being suppressed.
+      require-specific: true
+    revive:
       rules:
-        json: snake
-        yaml: snake
+        - name: exported
+          disabled: true
+    staticcheck:
+      checks:
+        - "all"
+        - "-QF1008" # Omit embedded fields from selector expression
+        - "-ST1000" # Incorrect or missing package comment
+    tagliatelle:
+      # Check struct tag name case.
+      case:
+        # Use the struct field name to check the name of the struct tag.
+        rules:
+          json: snake
+          yaml: snake
 
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: "io/ioutil"
-            desc: "ioutil is deprecated starting with Go 1.16"
+  exclusions:
+    generated: lax
+    presets:
+      - common-false-positives
+      - std-error-handling
+    paths:
+      - work
+      - third_party$
+      - builtin$
+      - examples$
 
 issues:
-  include: # the list of ids of default excludes to include
-    - EXC0005 # ineffective break statement
-    - EXC0009 # create files/directories with minimum permissions
-    # - EXC0011 # TODO: should have a package comment|comment should be of the form
-    # - EXC0012 # TODO: exported var/functions should have a comment
-    - EXC0013 # package comment should be of the form
-    - EXC0014 # comment on exported var should be of the form
-
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude-dirs:
-    - work
+
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+
+  exclusions:
+    generated: lax
+    paths:
+      - work
+      - third_party$
+      - builtin$
+      - examples$

agent/agent.go

@@ -119,7 +119,7 @@ const (
 
 var (
 	// We want to reply with capitalized U to match output from a Zabbix agent.
-	errUnsupportedKey     = errors.New("Unsupported item key") //nolint:stylecheck
+	errUnsupportedKey     = errors.New("Unsupported item key") //nolint:staticcheck
 	errFeatureUnavailable = errors.New("some features are unavailable")
 )
 
@@ -2745,39 +2745,39 @@ func setupContainer(hostRootPath string) {
 		if os.Getenv("HOST_VAR") == "" {
 			// gopsutil will use HOST_VAR as prefix to host /var
 			// It's used at least for reading the number of connected user from /var/run/utmp
-			os.Setenv("HOST_VAR", filepath.Join(hostRootPath, "var"))
+			_ = os.Setenv("HOST_VAR", filepath.Join(hostRootPath, "var"))
 
 			// ... but /var/run is usually a symlink to /run.
 			varRun := filepath.Join(hostRootPath, "var/run")
 			target, err := os.Readlink(varRun)
 
 			if err == nil && target == "/run" {
-				os.Setenv("HOST_VAR", hostRootPath)
+				_ = os.Setenv("HOST_VAR", hostRootPath)
 			}
 		}
 
 		if os.Getenv("HOST_ETC") == "" {
-			os.Setenv("HOST_ETC", filepath.Join(hostRootPath, "etc"))
+			_ = os.Setenv("HOST_ETC", filepath.Join(hostRootPath, "etc"))
 		}
 
 		if os.Getenv("HOST_PROC") == "" {
-			os.Setenv("HOST_PROC", filepath.Join(hostRootPath, "proc"))
+			_ = os.Setenv("HOST_PROC", filepath.Join(hostRootPath, "proc"))
 		}
 
 		if os.Getenv("HOST_SYS") == "" {
-			os.Setenv("HOST_SYS", filepath.Join(hostRootPath, "sys"))
+			_ = os.Setenv("HOST_SYS", filepath.Join(hostRootPath, "sys"))
 		}
 
 		if os.Getenv("HOST_RUN") == "" {
-			os.Setenv("HOST_RUN", filepath.Join(hostRootPath, "run"))
+			_ = os.Setenv("HOST_RUN", filepath.Join(hostRootPath, "run"))
 		}
 
 		if os.Getenv("HOST_DEV") == "" {
-			os.Setenv("HOST_DEV", filepath.Join(hostRootPath, "dev"))
+			_ = os.Setenv("HOST_DEV", filepath.Join(hostRootPath, "dev"))
 		}
 
 		if os.Getenv("HOST_MOUNT_PREFIX") == "" {
-			os.Setenv("HOST_MOUNT_PREFIX", hostRootPath)
+			_ = os.Setenv("HOST_MOUNT_PREFIX", hostRootPath)
 		}
 	}
 }

agent/agent_test.go

@@ -14,7 +14,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//nolint:scopelint
 package agent
 
 import (

agent/service_test.go

@@ -14,7 +14,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//nolint:scopelint
 package agent
 
 import "testing"

agent/state/state.go

@@ -119,7 +119,7 @@ func load(readOnly bool, persistentPath string, cachePath string) (*State, error
 		decoder := json.NewDecoder(f)
 		err = decoder.Decode(&state.persistent)
 
-		f.Close()
+		_ = f.Close()
 
 		if err != nil {
 			return nil, err
@@ -146,7 +146,7 @@ func load(readOnly bool, persistentPath string, cachePath string) (*State, error
 				logger.V(1).Printf("unable to load state cache: %v", err)
 			}
 
-			f.Close()
+			_ = f.Close()
 		} else {
 			logger.V(1).Printf("unable to load state cache: %v", err)
 		}
@@ -274,13 +274,13 @@ func (s *State) savePersistent() error {
 
 		err = s.savePersistentTo(w)
 		if err != nil {
-			w.Close()
+			_ = w.Close()
 
 			return err
 		}
 
 		_ = w.Sync()
-		w.Close()
+		_ = w.Close()
 
 		err = os.Rename(s.persistentPath+tmpExt, s.persistentPath)
 		if err != nil {
@@ -378,12 +378,12 @@ func (s *State) writeCache(onlyIfFileExists bool) error {
 
 	_, err = w.Write(data)
 	if err != nil {
-		w.Close()
+		_ = w.Close()
 
 		return err
 	}
 
-	w.Close()
+	_ = w.Close()
 
 	err = os.Rename(tmpCachePath, cachePath)
 

agent/state/state_test.go

@@ -607,7 +607,7 @@ func TestSkipCacheWriteIfRemoved(t *testing.T) {
 	}
 
 	// user now remove the state.cache.json
-	os.Remove(cachePath)
+	_ = os.Remove(cachePath)
 
 	_ = state.SetBleemeoCredentials(agentID, password2)
 	_ = state.Set("key2", cacheKeyString2)

api/api.go

@@ -121,7 +121,7 @@ func (api *API) init() {
 	indexFile, err := staticFolder.Open(indexFileName)
 	if err == nil {
 		indexBody, err = io.ReadAll(indexFile)
-		indexFile.Close()
+		_ = indexFile.Close()
 	}
 
 	if err != nil {
@@ -142,7 +142,7 @@ func (api *API) init() {
 	diagnosticFile, err := staticFolder.Open("static/diagnostic.html")
 	if err == nil {
 		diagnosticBody, err = io.ReadAll(diagnosticFile)
-		diagnosticFile.Close()
+		_ = diagnosticFile.Close()
 	}
 
 	if err != nil {

bleemeo/internal/cache/cache.go

@@ -277,7 +277,7 @@ func (c *Cache) AccountConfigsByUUID() map[string]bleemeoTypes.GloutonAccountCon
 		_, isHost := config.AgentConfigByName[bleemeo.AgentType_vSphereHost]
 		_, isCluster := config.AgentConfigByName[bleemeo.AgentType_vSphereCluster]
 
-		if !(isVM || isHost || isCluster) {
+		if !isVM && !isHost && !isCluster {
 			config.VSphereIntegration = false
 		}
 

bleemeo/internal/common/diagnostic.go

@@ -105,15 +105,17 @@ func diagnosticTLS(builder io.Writer, tlsConfig *tls.Config, host string, hostPo
 			rawConn.LocalAddr().String(),
 			err,
 		)
-		rawConn.Close()
+
+		_ = rawConn.Close()
 	} else {
 		fmt.Fprintf(
 			builder,
 			"Glouton is able to establish TLS connection to %s (%s)\n",
 			hostPort,
 			rawConn.RemoteAddr().String(),
 		)
-		tlsConn.Close()
+
+		_ = tlsConn.Close()
 	}
 }
 

bleemeo/internal/mqtt/state.go

@@ -130,11 +130,11 @@ func (rs *reloadState) SetPendingPoints(points []gloutonTypes.MetricPoint) {
 func (rs *reloadState) Close() {
 	// Consume all events on channels to make sure the paho client is not blocked.
 	go func() {
-		for range rs.notificationChannel { //nolint:revive
+		for range rs.notificationChannel {
 		}
 	}()
 	go func() {
-		for range rs.connectChannel { //nolint:revive
+		for range rs.connectChannel {
 		}
 	}()