add linter

Author: brainexe

.github/workflows/ci.yml

@@ -14,22 +14,12 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: Set up Go
-      uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
-        go-version: '1.26'
-
-    - name: Install dependencies
-      run: go mod download
+        go-version: stable
 
     - name: Run tests
-      run: go test -v -race -coverprofile=coverage.out ./...
-
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v3
-      with:
-        file: ./coverage.out
-        fail_ci_if_error: false
+      run: go test ./...
 
   build:
     name: Build
@@ -39,9 +29,9 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
-        go-version: '1.26'
+        go-version: stable
 
     - name: Install dependencies
       run: go mod download
@@ -64,61 +54,21 @@ jobs:
         # Build for macOS ARM64 (Apple Silicon)
         GOOS=darwin GOARCH=arm64 go build -o bin/serveradmin-go-darwin-arm64 .
 
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: serveradmin-go-builds
-        path: bin/
-
-  lint:
-    name: Lint
+  format-check:
+    name: Format Check
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: Set up Go
-      uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
-        go-version: '1.26'
+        go-version: stable
 
     - name: Run golangci-lint
-      uses: golangci/golangci-lint-action@v4
+      uses: golangci/golangci-lint-action@v8
       with:
         version: latest
-        args: --enable-all --timeout=5m --verbose
-        working-directory: .
-        only-new-issues: false
-        fail-on-error: true
-
-  format-check:
-    name: Format Check
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '1.26'
-
-    - name: Check gofmt
-      run: |
-        if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then
-          echo "Code is not formatted. Please run 'gofmt -s -w .'"
-          gofmt -s -l .
-          exit 1
-        fi
-
-    - name: Check goimports
-      run: |
-        go install golang.org/x/tools/cmd/goimports@latest
-        if [ "$(goimports -l . | wc -l)" -gt 0 ]; then
-          echo "Imports are not properly formatted. Please run 'goimports -w .'"
-          goimports -l .
-          exit 1
-        fi
 
     - name: Check go mod tidy
       run: |

.github/workflows/golangci-lint.yml

@@ -1,79 +1,71 @@
-run:
-  timeout: 5m
-  go: "1.24"
-  modules-download-mode: readonly
-  allow-parallel-runners: true
-  allow-serial-runners: false
-
+version: "2"
 linters:
   enable:
-    - gofmt
-    - goimports
-    - govet
-    - errcheck
-    - staticcheck
-    - unused
-    - gosimple
-    - structcheck
-    - varcheck
-    - ineffassign
-    - deadcode
-    - typecheck
-    - gosec
-    - gocyclo
+    - asasalint
+    - asciicheck
+    - bodyclose
+    - copyloopvar
+    - dogsled
     - dupl
-    - misspell
-    - unparam
-    - nakedret
-    - prealloc
+    - errname
+    - errorlint
+    - exhaustive
+    - fatcontext
+    - gocheckcompilerdirectives
+    - gochecknoinits
     - gocritic
-    - gomnd
-    - gomodguard
+    - gocyclo
     - goprintffuncname
+    - gosec
+    - importas
+    - intrange
+    - loggercheck
+    - makezero
+    - mirror
+    - misspell
+    - musttag
+    - nakedret
+    - nilerr
     - noctx
     - nolintlint
+    - perfsprint
+    - prealloc
+    - predeclared
+    - revive
+    - rowserrcheck
+    - staticcheck
+    - tagalign
+    - testifylint
+    - thelper
     - unconvert
+    - unparam
+    - usestdlibvars
+    - wastedassign
     - whitespace
-
-linters-settings:
-  gocyclo:
-    min-complexity: 15
-  dupl:
-    threshold: 100
-  gocritic:
-    enabled-tags:
-      - diagnostic
-      - experimental
-      - opinionated
-      - performance
-      - style
-  gomnd:
-    checks: argument,case,condition,operation,return,assign
-  gomodguard:
-    allowed:
-      modules:
-        - gopkg.in/yaml.v3
-        - github.com/stretchr/testify
-        - golang.org/x/crypto
-        - golang.org/x/sys
-    blocked:
-      modules:
-        - github.com/ugorji/go/codec
-        - github.com/ugorji/go
-
-issues:
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - gomnd
-        - gocyclo
-        - dupl
-    - path: testdata/
-      linters:
-        - all
-  max-issues-per-linter: 0
-  max-same-issues: 0
-  exclude-use-default: false
-  new: false
-  new-from-rev: ""
-  new-from-patch: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - errcheck
+          - perfsprint
+          - usestdlibvars
+        path: _test\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofumpt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.golangci.yml

@@ -11,4 +11,4 @@ test-coverage:
 	  go tool cover -html=coverage.out -o coverage.html
 
 linter:
-	  golangci-lint run --enable-all
+	  golangci-lint run

Makefile

@@ -6,7 +6,7 @@ import (
 	"context"
 	"crypto/hmac"
 	"crypto/rand"
-	"crypto/sha1"
+	"crypto/sha1" //nolint:gosec // SHA1 is required by the protocol
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
@@ -54,8 +54,8 @@ func (s ServerObject) GetString(attribute string) any {
 	return nil
 }
 
-// ObjectId returns the "object_id" attribute of the ServerObject
-func (s ServerObject) ObjectId() int {
+// ObjectID returns the "object_id" attribute of the ServerObject
+func (s ServerObject) ObjectID() int {
 	return s.Get("object_id").(int)
 }
 
@@ -66,7 +66,7 @@ func sendRequest(endpoint string, postData any) (*http.Response, error) {
 	}
 
 	postStr, _ := json.Marshal(postData)
-	req, err := http.NewRequestWithContext(context.Background(), "GET", config.baseURL+endpoint, bytes.NewBuffer(postStr))
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, config.baseURL+endpoint, bytes.NewBuffer(postStr))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
@@ -152,7 +152,7 @@ func calcMessage(timestamp int64, data []byte) []byte {
 
 // calcAppID computes SHA-1 hash of the auth token
 func calcAppID(authToken []byte) string {
-	hash := sha1.Sum(authToken)
+	hash := sha1.Sum(authToken) //nolint:gosec // SHA1 is required by the protocol
 
 	return hex.EncodeToString(hash[:])
 }

adminapi/api.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestFakeServer(t *testing.T) {
@@ -35,20 +36,20 @@ func TestFakeServer(t *testing.T) {
 	query.SetAttributes([]string{"hostname"})
 
 	servers, err := query.All()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Len(t, servers, 1)
 
 	object := servers[0]
 	assert.Equal(t, "foo.bar.local", object.Get("hostname"))
 	assert.Equal(t, "foo.bar.local", object.GetString("hostname"))
 	assert.Equal(t, 483903, object.Get("object_id"))
-	assert.Equal(t, 483903, object.ObjectId())
-	assert.Equal(t, nil, object.GetString("object_id"))
+	assert.Equal(t, 483903, object.ObjectID())
+	assert.Nil(t, object.GetString("object_id"))
 	assert.Nil(t, object.Get("nope"))
 	assert.Nil(t, object.GetString("nope"))
 
 	one, err := query.One()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, 483903, one.Get("object_id"))
 }
 

adminapi/api_test.go

@@ -2,6 +2,7 @@ package adminapi
 
 import (
 	"crypto/rand"
+	"errors"
 	"fmt"
 	"net"
 	"os"
@@ -33,11 +34,11 @@ var loadConfig = func() (config, error) {
 		apiVersion: version,
 	}
 
-	baseUrl := os.Getenv("SERVERADMIN_BASE_URL")
-	if baseUrl == "" {
-		return cfg, fmt.Errorf("env var SERVERADMIN_BASE_URL not set")
+	baseURL := os.Getenv("SERVERADMIN_BASE_URL")
+	if baseURL == "" {
+		return cfg, errors.New("env var SERVERADMIN_BASE_URL not set")
 	}
-	cfg.baseURL = strings.TrimRight(baseUrl, "/api")
+	cfg.baseURL = strings.TrimRight(baseURL, "/api")
 
 	if privateKeyPath, ok := os.LookupEnv("SERVERADMIN_KEY_PATH"); ok {
 		keyBytes, err := os.ReadFile(privateKeyPath)
@@ -72,7 +73,7 @@ var loadConfig = func() (config, error) {
 	}
 
 	if len(cfg.authToken) == 0 && cfg.sshSigner == nil {
-		return cfg, fmt.Errorf("no authentication method found: set SERVERADMIN_TOKEN/SERVERADMIN_KEY_PATH/SSH_AUTH_SOCK")
+		return cfg, errors.New("no authentication method found: set SERVERADMIN_TOKEN/SERVERADMIN_KEY_PATH/SSH_AUTH_SOCK")
 	}
 
 	return cfg, nil