Merge pull request #1168 from wakatime/feature/lint-update

Update lint dependency

Author: gandarez

.github/workflows/on_push.yml

@@ -34,7 +34,7 @@ jobs:
         run: make test
       -
         name: Linter
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: latest
           skip-cache: true
@@ -94,7 +94,7 @@ jobs:
         run: make test
       -
         name: Linter
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: latest
           skip-cache: true
@@ -145,7 +145,7 @@ jobs:
         run: make test
       -
         name: Linter
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: latest
           skip-cache: true

.golangci.yml

@@ -1,74 +1,87 @@
+version: "2"
 run:
-  timeout: 5m
   build-tags:
     - integration
 linters:
   enable:
     - bodyclose
-    - gochecknoinits
     - gochecknoglobals
+    - gochecknoinits
     - gocritic
     - gocyclo
     - godot
-    - gofmt
-    - goimports
     - gosec
     - misspell
     - nestif
     - revive
     - testpackage
     - unconvert
-    - usetesting
     - usestdlibvars
+    - usetesting
     - whitespace
     - wsl
-linters-settings:
-  revive:
+  settings:
+    revive:
+      rules:
+        - name: bare-return
+        - name: blank-imports
+        - name: duplicated-imports
+        - name: defer
+        - name: dot-imports
+        - name: early-return
+        - name: errorf
+        - name: error-naming
+        - name: error-return
+        - name: error-strings
+        - name: exported
+        - name: function-result-limit
+          arguments:
+            - 3
+        - name: if-return
+        - name: increment-decrement
+        - name: indent-error-flow
+        - name: line-length-limit
+          arguments:
+            - 125
+        - name: superfluous-else
+        - name: range
+        - name: receiver-naming
+        - name: struct-tag
+        - name: time-naming
+        - name: unexported-naming
+        - name: unexported-return
+        - name: unnecessary-stmt
+        - name: unused-parameter
+        - name: unused-receiver
+        - name: var-declaration
+        - name: var-naming
+    usetesting:
+      os-setenv: true
+      os-temp-dir: true
+  exclusions:
+    generated: lax
     rules:
-      - name: bare-return
-      - name: blank-imports
-      - name: duplicated-imports
-      - name: defer
-      - name: dot-imports
-      - name: early-return
-      - name: errorf
-      - name: error-naming
-      - name: error-return
-      - name: error-strings
-      - name: exported
-      - name: function-result-limit
-        arguments: [3]
-      - name: if-return
-      - name: increment-decrement
-      - name: indent-error-flow
-      - name: line-length-limit
-        arguments: [125]
-      - name: superfluous-else
-      - name: range
-      - name: receiver-naming
-      - name: struct-tag
-      - name: time-naming
-      - name: unexported-naming
-      - name: unexported-return
-      - name: unnecessary-stmt
-      - name: unused-parameter
-      - name: unused-receiver
-      - name: var-declaration
-      - name: var-naming
-  usetesting:
-    os-setenv: true
-    os-temp-dir: true
+      - linters:
+          - errcheck
+          - gosec
+        path: _test\.go
+    paths:
+      - pkg/file/file_windows.go
+      - testdata
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  exclude-use-default: false
-  exclude-dirs:
-    - testdata
-  exclude-files:
-    - pkg/file/file_windows.go
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - errcheck
-        - gosec
-  include:
-    - EXC0002
   fix: true
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - pkg/file/file_windows.go
+      - testdata
+      - third_party$
+      - builtin$
+      - examples$

cmd/configwrite/configwrite_test.go

@@ -73,7 +73,7 @@ func TestWrite(t *testing.T) {
 
 	defer tmpFile.Close()
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	v := viper.New()
 	ini, err := ini.NewWriter(ctx, v, func(_ context.Context, vp *viper.Viper) (string, error) {
@@ -120,7 +120,7 @@ func TestWriteErr(t *testing.T) {
 			v.Set("config-section", test.Section)
 			v.Set("config-write", test.Value)
 
-			err := configwrite.Write(context.Background(), v, w)
+			err := configwrite.Write(t.Context(), v, w)
 			require.Error(t, err)
 
 			assert.Equal(
@@ -147,7 +147,7 @@ func TestWriteSaveErr(t *testing.T) {
 	v.Set("config-section", "settings")
 	v.Set("config-write", map[string]string{"debug": "false"})
 
-	err := configwrite.Write(context.Background(), v, w)
+	err := configwrite.Write(t.Context(), v, w)
 	assert.Error(t, err)
 }
 

cmd/fileexperts/fileexperts_test.go

@@ -1,7 +1,6 @@
 package fileexperts_test
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -88,7 +87,7 @@ func TestFileExperts(t *testing.T) {
 	v.Set("project", "wakatime-cli")
 	v.Set("entity", "testdata/main.go")
 
-	output, err := fileexperts.FileExperts(context.Background(), v)
+	output, err := fileexperts.FileExperts(t.Context(), v)
 	require.NoError(t, err)
 
 	assert.Equal(t, "You: 40 mins | Karl: 21 mins", output)
@@ -97,7 +96,7 @@ func TestFileExperts(t *testing.T) {
 }
 
 func TestFileExperts_NonExistingEntity(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	logFile, err := os.CreateTemp(t.TempDir(), "")
 	require.NoError(t, err)
@@ -144,7 +143,7 @@ func TestFileExperts_ErrApi(t *testing.T) {
 	v.Set("api-url", testServerURL)
 	v.Set("entity", "testdata/main.go")
 
-	_, err := fileexperts.FileExperts(context.Background(), v)
+	_, err := fileexperts.FileExperts(t.Context(), v)
 	require.Error(t, err)
 
 	var errapi api.Err
@@ -178,7 +177,7 @@ func TestFileExperts_ErrAuth(t *testing.T) {
 	v.Set("api-url", testServerURL)
 	v.Set("entity", "testdata/main.go")
 
-	_, err := fileexperts.FileExperts(context.Background(), v)
+	_, err := fileexperts.FileExperts(t.Context(), v)
 	require.Error(t, err)
 
 	var errauth api.ErrAuth
@@ -211,7 +210,7 @@ func TestFileExperts_ErrBadRequest(t *testing.T) {
 	v.Set("api-url", testServerURL)
 	v.Set("entity", "testdata/main.go")
 
-	_, err := fileexperts.FileExperts(context.Background(), v)
+	_, err := fileexperts.FileExperts(t.Context(), v)
 	require.Error(t, err)
 
 	var errbadRequest api.ErrBadRequest

cmd/heartbeat/heartbeat_test.go

@@ -87,7 +87,7 @@ func TestSendHeartbeats(t *testing.T) {
 			string(expectedBody),
 			entity.Entity,
 			subfolders,
-			heartbeat.UserAgent(context.Background(), plugin),
+			heartbeat.UserAgent(t.Context(), plugin),
 		)
 
 		assert.True(t, strings.HasSuffix(entity.Entity, "testdata/main.go"))
@@ -129,7 +129,7 @@ func TestSendHeartbeats(t *testing.T) {
 
 	defer offlineQueueFile.Close()
 
-	err = cmdheartbeat.SendHeartbeats(context.Background(), v, offlineQueueFile.Name())
+	err = cmdheartbeat.SendHeartbeats(t.Context(), v, offlineQueueFile.Name())
 	require.NoError(t, err)
 
 	assert.Eventually(t, func() bool { return numCalls == 1 }, time.Second, 50*time.Millisecond)
@@ -190,7 +190,7 @@ func TestSendHeartbeats_RateLimited(t *testing.T) {
 	v.Set("offline-queue-file", offlineQueueFile.Name())
 	v.Set("internal.heartbeats_last_sent_at", time.Now().Add(-time.Minute).Format(time.RFC3339))
 
-	err = cmdheartbeat.SendHeartbeats(context.Background(), v, offlineQueueFile.Name())
+	err = cmdheartbeat.SendHeartbeats(t.Context(), v, offlineQueueFile.Name())
 	require.NoError(t, err)
 
 	assert.Zero(t, numCalls)
@@ -228,7 +228,7 @@ func TestSendHeartbeats_WithFiltering_Exclude(t *testing.T) {
 
 	defer offlineQueueFile.Close()
 
-	err = cmdheartbeat.SendHeartbeats(context.Background(), v, offlineQueueFile.Name())
+	err = cmdheartbeat.SendHeartbeats(t.Context(), v, offlineQueueFile.Name())
 	require.NoError(t, err)
 
 	assert.Equal(t, 0, numCalls)
@@ -266,7 +266,7 @@ func TestSendHeartbeats_WithFiltering_Exclude_All(t *testing.T) {
 
 	defer offlineQueueFile.Close()
 
-	err = cmdheartbeat.SendHeartbeats(context.Background(), v, offlineQueueFile.Name())
+	err = cmdheartbeat.SendHeartbeats(t.Context(), v, offlineQueueFile.Name())
 	require.NoError(t, err)
 
 	assert.Equal(t, 0, numCalls)
@@ -283,7 +283,7 @@ func TestSendHeartbeats_ExtraHeartbeats(t *testing.T) {
 		numCalls int
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	projectFolder, err := filepath.Abs("../..")
 	require.NoError(t, err)
@@ -429,7 +429,7 @@ func TestSendHeartbeats_ExtraHeartbeats_Sanitize(t *testing.T) {
 		numCalls int
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	router.HandleFunc("/users/current/heartbeats.bulk", func(w http.ResponseWriter, _ *http.Request) {
 		// send response
@@ -566,7 +566,7 @@ func TestSendHeartbeats_NonExistingEntity(t *testing.T) {
 
 	defer logFile.Close()
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	v := viper.New()
 	v.SetDefault("sync-offline-activity", 1000)
@@ -609,7 +609,7 @@ func TestSendHeartbeats_ExtraHeartbeatsIsUnsavedEntity(t *testing.T) {
 		numCalls int
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	projectFolder, err := filepath.Abs("../..")
 	require.NoError(t, err)
@@ -743,7 +743,7 @@ func TestSendHeartbeats_NonExistingExtraHeartbeatsEntity(t *testing.T) {
 		numCalls int
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	projectFolder, err := filepath.Abs("../..")
 	require.NoError(t, err)
@@ -878,7 +878,7 @@ func TestSendHeartbeats_ErrAuth_UnsetAPIKey(t *testing.T) {
 
 	defer offlineQueueFile.Close()
 
-	err = cmdheartbeat.SendHeartbeats(context.Background(), v, offlineQueueFile.Name())
+	err = cmdheartbeat.SendHeartbeats(t.Context(), v, offlineQueueFile.Name())
 	require.Error(t, err)
 
 	var errauth api.ErrAuth
@@ -908,7 +908,7 @@ func TestSendHeartbeats_ErrBackoff(t *testing.T) {
 		w.WriteHeader(http.StatusInternalServerError)
 	})
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	tmpDir := t.TempDir()
 
@@ -969,7 +969,7 @@ func TestSendHeartbeats_ErrBackoff_Verbose(t *testing.T) {
 		w.WriteHeader(http.StatusInternalServerError)
 	})
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	tmpDir := t.TempDir()
 
@@ -1029,7 +1029,7 @@ func TestSendHeartbeats_ObfuscateProject(t *testing.T) {
 		numCalls int
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	fp := setupTestGitBasic(t)
 
@@ -1124,7 +1124,7 @@ func TestSendHeartbeats_ObfuscateProjectNotBranch(t *testing.T) {
 		numCalls int
 	)
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	fp := setupTestGitBasic(t)
 
@@ -1269,7 +1269,7 @@ func TestResetRateLimit(t *testing.T) {
 
 	defer tmpFileInternal.Close()
 
-	ctx := context.Background()
+	ctx := t.Context()
 
 	v := viper.New()
 	v.Set("config", tmpFileInternal.Name())