diff --git a/.golangci.yml b/.golangci.yml index 8e543c3a..4d937c87 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -23,9 +23,6 @@ linters: # Known findings as of 2026-10-24 in code other open PRs are changing; delete each rule once fixed. rules: # errcheck still has findings under these paths; delete a path's rule once it is clean. - - path: ^cmd/mount/ - linters: [errcheck] - - path: ^tests/benchmark/ linters: [errcheck] diff --git a/cmd/mount/health_test.go b/cmd/mount/health_test.go index 654575fe..746acbbd 100644 --- a/cmd/mount/health_test.go +++ b/cmd/mount/health_test.go @@ -58,7 +58,7 @@ func TestHealthChecksSeparateDegradedFromDown(t *testing.T) { if err := srv.Start(context.Background()); err != nil { t.Fatal(err) } - defer srv.Stop() + defer func() { _ = srv.Stop() }() resp := api.AggregateHealth(context.Background(), srv.GetHealthCheckers()...) if resp.Status != tt.want { t.Errorf("status = %s, want %s: %+v", resp.Status, tt.want, resp.Checks) @@ -79,7 +79,7 @@ func TestHealthChecksSeparateDegradedFromDown(t *testing.T) { if err != nil { t.Fatal(err) } - defer got.Body.Close() + defer func() { _ = got.Body.Close() }() var body api.HealthResponse if err := json.NewDecoder(got.Body).Decode(&body); err != nil { t.Fatal(err) diff --git a/cmd/mount/main.go b/cmd/mount/main.go index 511ff888..4de26989 100644 --- a/cmd/mount/main.go +++ b/cmd/mount/main.go @@ -504,7 +504,9 @@ func main() { apiServer.SetAdminService(adminOps{journal: j, trim: trimMgr, cache: cacheMgr}) if err := apiServer.Start(ctx); err != nil { log.Printf("Warning: Failed to start the API server: %v; the mount continues without it. Choose a free -api-addr, or pass -api=false", err) - apiServer.Stop() + if err := apiServer.Stop(); err != nil && !errors.Is(err, api.ErrServerNotStarted) { + log.Printf("Warning: Failed to stop the API server: %v", err) + } apiServer = nil sampler.Stop() sampler = nil diff --git a/cmd/mount/recovery_test.go b/cmd/mount/recovery_test.go index 158b6cc2..f352285f 100644 --- a/cmd/mount/recovery_test.go +++ b/cmd/mount/recovery_test.go @@ -25,7 +25,7 @@ func dirtyJournal(t *testing.T) *storage.Device { if err := os.WriteFile(path, nil, 0o600); err != nil { t.Fatal(err) } - t.Cleanup(func() { os.Remove(path) }) + t.Cleanup(func() { _ = os.Remove(path) }) if err := os.Truncate(path, int64(journal.DefaultJournalSlotSize)); err != nil { t.Fatal(err) } @@ -33,7 +33,7 @@ func dirtyJournal(t *testing.T) *storage.Device { if err != nil { t.Skipf("O_DIRECT not supported: %v", err) } - t.Cleanup(func() { dev.Close() }) + t.Cleanup(func() { _ = dev.Close() }) j, err := journal.Init(dev, 0, journal.DefaultJournalSlotSize, [16]byte{1}, 1, journal.DefaultConfig()) if err != nil { t.Fatal(err) diff --git a/cmd/mount/token.go b/cmd/mount/token.go index 3c90bf39..d028ab77 100644 --- a/cmd/mount/token.go +++ b/cmd/mount/token.go @@ -62,7 +62,7 @@ func readTokenFile(path string, uid int) (string, error) { if err != nil { return "", fmt.Errorf("-api-token-file: %w", err) } - defer f.Close() + defer func() { _ = f.Close() }() info, err := f.Stat() if err != nil { return "", fmt.Errorf("-api-token-file: %w", err)