lint: upgraded linter and fixed issues

Author: khtufteland

.github/workflows/go.yml

@@ -32,13 +32,14 @@ jobs:
       - name: Test (main module)
         run: go test -race ./...
 
-      - name: Lint (main module)
-        uses: golangci/golangci-lint-action@v6
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.62
+          version: "v2.0"
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          only-new-issues: true # Required for go-header check
-          args: --timeout=10m
+          skip-cache: true
+          only-new-issues: false
+          args: --timeout=15m
 
       - name: Test example/devdata_cli (sub module)
         run: cd ./examples/devdata_cli && go test -race ./...

.golangci.yml

@@ -1,17 +1,58 @@
+version: "2"
+run:
+  modules-download-mode: readonly
+  tests: true
 linters:
   enable:
-    - asciicheck # Simple linter to check that your code does not contain non-ASCII identifiers.
-    - gci # Control golang package import order and make it always deterministic.
-    - godot # Check if comments end in a period.
-    - misspell # Finds commonly misspelled English words in comments.
-    - goheader # Checks is file header matches pattern.
+    - asciicheck
+    - bidichk
+    - dupword
+    #- errname
+    - goconst
+    - godot
+    - misspell
+    - nakedret
+    - nilerr
+    - rowserrcheck
+    - sqlclosecheck
+    - staticcheck
+    - unconvert
+    - usestdlibvars
+    - wastedassign
+    - whitespace
+  settings:
+    staticcheck:
+      checks:
+        - all
+        - -SA1019
+        - -ST1000
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+issues:
+  new: false
+formatters:
+  enable:
+    - gci
+    - gofmt
     - gofumpt
-
-linters-settings:
-  goheader:
-    values:
-      const:
-        COMPANY: Searis AS
-      regexp:
-        ANY_AUTHOR: "(.*)"
-    template-path: .go-header.txt
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/clarify/clarify-go/)
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

automation/automationcli/config.go

@@ -26,6 +26,7 @@ import (
 	"time"
 
 	"github.com/clarify/clarify-go"
+
 	"github.com/clarify/clarify-go/automation"
 	"github.com/clarify/clarify-go/internal/logging"
 	"github.com/clarify/clarify-go/jsonrpc"

automation/routines_test.go

@@ -97,7 +97,7 @@ func TestRoutinesSubRoutines(t *testing.T) {
 			`level=INFO msg=OK routine=routine2`,
 		},
 	}))
-	t.Run("wildcard wildcard", test(testCase{
+	t.Run("wildcard", test(testCase{
 		patterns: []string{"*/*"},
 		expectLines: []string{
 			`level=INFO msg=OK routine=folder1/folder1/routine1`,
@@ -135,7 +135,7 @@ func TestRoutinesSubRoutines(t *testing.T) {
 			`level=INFO msg=OK routine=folder1/folder2/routine1`,
 		},
 	}))
-	t.Run("wildcard wildcard routine2", test(testCase{
+	t.Run("wildcard routine2", test(testCase{
 		patterns: []string{"*/*/routine2"},
 		expectLines: []string{
 			`level=INFO msg=OK routine=folder1/folder1/routine2`,

credentials.go

@@ -24,8 +24,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/clarify/clarify-go/jsonrpc"
 	"golang.org/x/oauth2/clientcredentials"
+
+	"github.com/clarify/clarify-go/jsonrpc"
 )
 
 // Credentials contain a data-structure with Clarify integration credentials.

example_test.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/clarify/clarify-go"
+
 	"github.com/clarify/clarify-go/fields"
 	"github.com/clarify/clarify-go/testdata"
 )

examples/automation_cli/README.md

@@ -56,4 +56,4 @@ export CLARIFY_EXAMPLE_STATUS_ITEM_ID=...
 go run . evaluate/detect-fire
 ```
 
-You should now have about 45 % chance to see the text "FIRE! FIRE! FIRE!".
+You should now have about 45 % chance to see the text "FIRE!".

examples/automation_cli/routines.go

@@ -23,23 +23,17 @@ import (
 	"strings"
 	"time"
 
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
+
 	"github.com/clarify/clarify-go/automation"
 	"github.com/clarify/clarify-go/fields"
 	"github.com/clarify/clarify-go/views"
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
 )
 
 const (
 	exampleName = "automation_cli"
 
-	// For more advanced applications, defining your annotations as constants,
-	// is less error prone. Annotation keys should be prefixed to avoid
-	// collision.
-	keyTransformVersion     = "clarify/clarify-go/example/transform"
-	keySignalAttributesHash = "clarify/clarify-go/example/source-signal/attributes-hash"
-	keySignalID             = "clarify/clarify-go/example/source-signal/id"
-
 	// In this example we filter which signals to expose using the following
 	// annotation keys and values.
 	keyExampleName    = "clarify/clarify-go/example/name"
@@ -191,6 +185,6 @@ var detectFire = automation.EvaluateActions{
 	},
 	Actions: []automation.ActionFunc{
 		automation.ActionSeriesContains("has_fire", 1),
-		automation.ActionRoutine(automation.LogInfo("FIRE! FIRE! FIRE!")),
+		automation.ActionRoutine(automation.LogInfo("FIRE!")),
 	},
 }

examples/basic_auth/main.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	clarify "github.com/clarify/clarify-go"
+
 	"github.com/clarify/clarify-go/fields"
 	"github.com/clarify/clarify-go/views"
 )

examples/connect_signals/main.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/clarify/clarify-go"
+
 	"github.com/clarify/clarify-go/fields"
 	clarifyx "github.com/clarify/clarify-go/x"
 )
@@ -36,5 +37,7 @@ func main() {
 
 	enc := json.NewEncoder(os.Stdout)
 	enc.SetIndent("", "  ")
-	enc.Encode(result)
+	if err := enc.Encode(result); err != nil {
+		panic(err)
+	}
 }