GROUNDWORK-4166: fix linter

.github/workflows/golangci-lint.yml

@@ -13,16 +13,16 @@ jobs:
         with:
           go-version: 1.23
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v5
+        uses: golangci/golangci-lint-action@v6
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.59.1
+          version: v1.61.0
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
 
           # Optional: golangci-lint command line arguments.
-          args: --timeout=5m --disable depguard
+          args: --config .golangci.yaml  --timeout=10m
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true

.golangci.yaml

@@ -1,17 +1,7 @@
 run:
   go: '1.23'
-  skip-dirs:
-    - vendor
-    - bin
-    - var
-    - tmp
-    - gotocjson
-    - libtransit
-    - deprecated
-    - connectors/nsca
-  skip-files:
-    - \.pb\.go$
-  modules-download-mode: readonly
+  build-tags:
+    - codeanalysis
 
 govet:
   enable:
@@ -34,11 +24,8 @@ linters:
     - staticcheck
     - stylecheck
     - unconvert
-    # TODO:    - unparam
     - unused
     - whitespace
-  # TODO:    - gocognit
-  # TODO:    - gocyclo
   disable:
     - depguard
     - gochecknoglobals
@@ -50,8 +37,21 @@ linters:
     - gosimple
     - gosec
     - funlen
-
+    - typecheck
 issues:
+  exclude-dirs:
+    - vendor
+    - bin
+    - var
+    - tmp
+    - gotocjson
+    - libtransit
+    - deprecated
+    - connectors/nsca
+    - connector/nsca/nsca
+  exclude-files:
+    - \.pb\.go$
+    - connector/nsca/nsca/nsca.go
   # Excluding configuration per-path, per-linter, per-text and per-source
   exclude-rules:
     - path: _test\.go

config/config.go

@@ -198,7 +198,7 @@ func (c *GWConnection) UnmarshalYAML(unmarshal func(interface{}) error) error {
 			return fmt.Errorf("unmarshaler error: %s SecKeyEnv is empty", SecVerPrefix)
 		}
 		var encrypted []byte
-		fmt.Sscanf(c.Password, SecVerPrefix+"%x", &encrypted)
+		fmt.Sscanf(c.Password, SecVerPrefix+"%x", &encrypted) //nolint:errcheck
 		decrypted, err := Decrypt(encrypted, []byte(s))
 		if err != nil {
 			return err

connectors/checker/checker.go

@@ -1,3 +1,5 @@
+//go:build !codeanalysis
+
 package checker
 
 import (

connectors/checker/checker_test.go

@@ -1,3 +1,5 @@
+//go:build !codeanalysis
+
 package checker
 
 import (

connectors/checker/cmd.go

@@ -1,3 +1,5 @@
+//go:build !codeanalysis
+
 package checker
 
 import (

connectors/nsca/cmd.go

@@ -1,3 +1,5 @@
+//go:build !codeanalysis
+
 package nsca
 
 import (

connectors/nsca/nsca.go

@@ -1,3 +1,5 @@
+//go:build !codeanalysis
+
 package nsca
 
 import (

connectors/nsca/nsca/nsca.go

@@ -1,3 +1,5 @@
+//go:build !codeanalysis
+
 package nsca
 
 import (

connectors/nsca/parser/parser.go

@@ -1,3 +1,5 @@
+//go:build !codeanalysis
+
 package parser
 
 import (

connectors/nsca/parser/parser_test.go

@@ -1,3 +1,5 @@
+//go:build !codeanalysis
+
 package parser
 
 import (
@@ -85,7 +87,7 @@ S;1628530909;awips-demo-2;example-service-7;0;OK - example-service-7 (2021-08-09
 
 func TestBronxParser2(t *testing.T) {
 	data := []byte(
-`H;1628546296;awips-demo-2;0;UP - awips-demo-2 (2021-08-09 21:58:16 :: 1628546296) | result=21ms;;;0;
+		`H;1628546296;awips-demo-2;0;UP - awips-demo-2 (2021-08-09 21:58:16 :: 1628546296) | result=21ms;;;0;
 S;1628546296;awips-demo-2;example-service;0;OK - example-service (2021-08-09 21:58:16 :: 1628546296) | result=168ms;;;0;
 S;1628546296;awips-demo-2;example-service-1;0;OK - example-service-1 (2021-08-09 21:58:16 :: 1628546296) | result=168ms;;;0;
 S;1628546296;awips-demo-2;example-service-2;0;OK - example-service-2 (2021-08-09 21:58:16 :: 1628546296) | result=84ms;;;0;

connectors/snmp/model.go

@@ -175,7 +175,11 @@ func (device *DeviceExt) retrieveMonitoredServices(metricDefinitions map[string]
 				mService.LastPluginOutput = "Interface Operational and Administrative states are UNKNOWN"
 			}
 			if thresholdMessage != "" {
-				mService.LastPluginOutput += fmt.Sprintf(" | %s", thresholdMessage)
+				if mService.LastPluginOutput != "" {
+					mService.LastPluginOutput += fmt.Sprintf(" | %s", thresholdMessage)
+				} else {
+					mService.LastPluginOutput = thresholdMessage
+				}
 			}
 			mServices = append(mServices, *mService)
 		}

integration/integration_test.go

@@ -146,7 +146,6 @@ func BenchmarkE2E(b *testing.B) {
 			}
 		}
 	})
-
 }
 
 func resources(countHst, countSvc int) []transit.MonitoredResource {

main.go

@@ -1,3 +1,5 @@
+//go:build !codeanalysis
+
 package main
 
 import (

services/agent.go

@@ -546,7 +546,6 @@ func (service *AgentService) startTransport() error {
 		service.Connector.AppType == traceOnDemandAppType ||
 		len(service.Connector.AgentID) == 0 ||
 		len(service.Connector.AppType) == 0 {
-
 		err := fmt.Errorf("connector is not configured: AppType/AgentID: %v/%v",
 			service.Connector.AppType, service.Connector.AgentID)
 		log.Err(err).Msg("could not start")
@@ -619,7 +618,6 @@ func (service *AgentService) fixTracerContext(payloadJSON []byte) []byte {
 		service.Connector.AppType == traceOnDemandAppType ||
 		len(service.Connector.AgentID) == 0 ||
 		len(service.Connector.AppType) == 0 {
-
 		err := fmt.Errorf("connector is not configured: AppType/AgentID: %v/%v",
 			service.Connector.AppType, service.Connector.AgentID)
 		log.Err(err).Msg("could not fixTracerContext")