grendervill/glchat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(lint): настроить golangci-lint v2, gofumpt и форматирование в make

Browse Source 
- .golangci.yml: набор линтеров под требования §14 (gosec, gocritic, sloglint,
  noctx, revive, depguard для запрета циклических зависимостей internal/*)
- gofumpt вынесен из formatters golangci-lint v2.13 (сообщал о расхождениях,
  которые сам же не устранял) и применяется отдельным инструментом
- make fmt/go-lint: проверка gofumpt + golangci-lint fmt --diff
- scripts/gitleaks-scan.sh: поддержка gitleaks 8.19+ (dir) и старых версий (detect)
- исправлены замечания линтеров: обработка ошибок Close, контекст в логах,
  NewRequestWithContext в тестах, комментарий к blank-import драйвера SQLite
This commit is contained in:
grendervill
2026-09-19 18:25:20 +03:00
parent 4bd1770cb5
commit 2bf7101f2d
7 changed files with 64 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/database/database.go
+16 -8
View File
@@ -6,6 +6,7 @@ import (
"embed"
"errors"
"fmt"
"io"
"log/slog"
"os"
"path/filepath"
@@ -13,6 +14,7 @@ import (
"strings"
"time"
// Регистрирует драйвер "sqlite3" для database/sql (CGO, AGENT.md 5.1).
_ "github.com/mattn/go-sqlite3"
"github.com/pressly/goose/v3"
)
@@ -59,38 +61,38 @@ func Open(ctx context.Context, opts Options) (*DB, error) {
writer.SetConnMaxLifetime(connMaxLifetime)
if err := applyPragmas(ctx, writer, opts); err != nil {
writer.Close()
closeQuietly(writer)
return nil, err
}
if err := writer.PingContext(ctx); err != nil {
writer.Close()
closeQuietly(writer)
return nil, fmt.Errorf("ping writer connection: %w", err)
}
db := &DB{Writer: writer, path: opts.Path}
if opts.Migrate {
if err := db.Migrate(ctx); err != nil {
db.Close()
closeQuietly(db.Writer)
return nil, err
}
}
reader, err := sql.Open("sqlite3", dsn(opts, false))
if err != nil {
db.Close()
closeQuietly(db.Writer)
return nil, fmt.Errorf("open reader connection: %w", err)
}
reader.SetMaxOpenConns(opts.ReadPool)
reader.SetMaxIdleConns(opts.ReadPool)
reader.SetConnMaxLifetime(connMaxLifetime)
if err := applyPragmas(ctx, reader, opts); err != nil {
reader.Close()
db.Close()
closeQuietly(reader)
closeQuietly(db.Writer)
return nil, err
}
if err := reader.PingContext(ctx); err != nil {
reader.Close()
db.Close()
closeQuietly(reader)
closeQuietly(db.Writer)
return nil, fmt.Errorf("ping reader connection: %w", err)
}
db.Reader = reader
@@ -226,6 +228,12 @@ func (db *DB) Close() error {
return nil
}
func closeQuietly(closer io.Closer) {
if err := closer.Close(); err != nil {
slog.Debug("close sql handle", slog.Any("error", err))
}
}
func EnsureDir(path string) error {
if err := os.MkdirAll(filepath.Dir(path), 0o750); err != nil {
return fmt.Errorf("create data directory: %w", err)
internal/httpx/errors.go
+3 -4
View File
@@ -2,7 +2,6 @@ package httpx
import (
"encoding/json"
"errors"
"log/slog"
"net/http"
)
@@ -29,6 +28,8 @@ type errorEnvelope struct {
func (e Error) HTTPStatus() int {
switch e.Code {
case CodeInternalError:
return http.StatusInternalServerError
case CodeNotFound:
return http.StatusNotFound
case CodeBadRequest:
@@ -54,7 +55,7 @@ func WriteJSON(w http.ResponseWriter, status int, body any) {
return
}
if err := json.NewEncoder(w).Encode(body); err != nil {
slog.Error("write json response", "error", err)
slog.Error("write json response", slog.Any("error", err))
}
}
@@ -67,5 +68,3 @@ func WriteErrorStatus(w http.ResponseWriter, status int, code ErrorCode, message
}
func StatusForCode(code ErrorCode) int { return NewError(code, "").HTTPStatus() }
var errBodyTooLarge = errors.New("request body too large")
internal/server/server.go
+2 -2
View File
@@ -108,11 +108,11 @@ func (s *Server) handleMeta(w http.ResponseWriter, r *http.Request) {
httpx.WriteJSON(w, http.StatusOK, meta.New(s.cfg))
}
func (s *Server) handleOpenAPI(w http.ResponseWriter, _ *http.Request) {
func (s *Server) handleOpenAPI(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json; charset=utf-8")
w.WriteHeader(http.StatusOK)
if _, err := w.Write(openAPIDocument); err != nil {
s.logger.Error("write openapi document", slog.Any("error", err))
s.logger.ErrorContext(r.Context(), "write openapi document", slog.Any("error", err))
}
}
internal/server/server_test.go
+12 -13
View File
@@ -3,7 +3,6 @@ package server
import (
"context"
"encoding/json"
"io"
"log/slog"
"net/http"
"net/http/httptest"
@@ -45,14 +44,14 @@ func newTestServer(t *testing.T) (*Server, *database.DB) {
LogLevel: "error",
LogFormat: "json",
}
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
logger := slog.New(slog.DiscardHandler)
return New(cfg, db, logger), db
}
func TestHealthz(t *testing.T) {
srv, _ := newTestServer(t)
rec := httptest.NewRecorder()
srv.Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/healthz", nil))
srv.Handler().ServeHTTP(rec, httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/healthz", nil))
if rec.Code != http.StatusOK {
t.Fatalf("status = %d, want 200", rec.Code)
@@ -78,7 +77,7 @@ func TestHealthz(t *testing.T) {
func TestReadyzReportsDatabase(t *testing.T) {
srv, _ := newTestServer(t)
rec := httptest.NewRecorder()
srv.Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/readyz", nil))
srv.Handler().ServeHTTP(rec, httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/readyz", nil))
if rec.Code != http.StatusOK {
t.Fatalf("status = %d, want 200", rec.Code)
@@ -104,7 +103,7 @@ func TestReadyzFailsWhenDatabaseClosed(t *testing.T) {
t.Fatalf("close database: %v", err)
}
rec := httptest.NewRecorder()
srv.Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/readyz", nil))
srv.Handler().ServeHTTP(rec, httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/readyz", nil))
if rec.Code != http.StatusServiceUnavailable {
t.Fatalf("status = %d, want 503", rec.Code)
@@ -114,7 +113,7 @@ func TestReadyzFailsWhenDatabaseClosed(t *testing.T) {
func TestMetaEndpoint(t *testing.T) {
srv, _ := newTestServer(t)
rec := httptest.NewRecorder()
srv.Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/api/v1/meta", nil))
srv.Handler().ServeHTTP(rec, httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/api/v1/meta", nil))
if rec.Code != http.StatusOK {
t.Fatalf("status = %d, want 200", rec.Code)
@@ -137,7 +136,7 @@ func TestMetaEndpoint(t *testing.T) {
func TestOpenAPIDocumentIsServed(t *testing.T) {
srv, _ := newTestServer(t)
rec := httptest.NewRecorder()
srv.Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/api/v1/openapi.json", nil))
srv.Handler().ServeHTTP(rec, httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/api/v1/openapi.json", nil))
if rec.Code != http.StatusOK {
t.Fatalf("status = %d, want 200", rec.Code)
@@ -157,7 +156,7 @@ func TestOpenAPIDocumentIsServed(t *testing.T) {
func TestUnknownAPIRouteUsesErrorEnvelope(t *testing.T) {
srv, _ := newTestServer(t)
rec := httptest.NewRecorder()
srv.Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/api/v1/does-not-exist", nil))
srv.Handler().ServeHTTP(rec, httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/api/v1/does-not-exist", nil))
if rec.Code != http.StatusNotFound {
t.Fatalf("status = %d, want 404", rec.Code)
@@ -191,7 +190,7 @@ func TestServesWebClientWithSPAFallback(t *testing.T) {
}
for _, tc := range cases {
rec := httptest.NewRecorder()
srv.Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodGet, tc.path, nil))
srv.Handler().ServeHTTP(rec, httptest.NewRequestWithContext(context.Background(), http.MethodGet, tc.path, nil))
if rec.Code != tc.wantStatus {
t.Errorf("GET %s status = %d, want %d", tc.path, rec.Code, tc.wantStatus)
}
@@ -201,7 +200,7 @@ func TestServesWebClientWithSPAFallback(t *testing.T) {
}
rec := httptest.NewRecorder()
srv.Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/assets/app.js", nil))
srv.Handler().ServeHTTP(rec, httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/assets/app.js", nil))
if got := rec.Header().Get("Cache-Control"); !strings.Contains(got, "immutable") {
t.Errorf("assets Cache-Control = %q, want immutable", got)
}
@@ -220,11 +219,11 @@ func TestServeWebClientReportsMissingBundle(t *testing.T) {
t.Cleanup(func() { _ = db.Close() })
cfg := config.Config{Domain: "localhost", WebRoot: t.TempDir(), LogFormat: "json", LogLevel: "error"}
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
logger := slog.New(slog.DiscardHandler)
srv := New(cfg, db, logger)
rec := httptest.NewRecorder()
srv.Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/", nil))
srv.Handler().ServeHTTP(rec, httptest.NewRequestWithContext(context.Background(), http.MethodGet, "/", nil))
if rec.Code != http.StatusServiceUnavailable {
t.Errorf("status = %d, want 503 when the bundle is absent", rec.Code)
}
@@ -233,7 +232,7 @@ func TestServeWebClientReportsMissingBundle(t *testing.T) {
func TestMethodNotAllowedOnMeta(t *testing.T) {
srv, _ := newTestServer(t)
rec := httptest.NewRecorder()
srv.Handler().ServeHTTP(rec, httptest.NewRequest(http.MethodPost, "/api/v1/meta", nil))
srv.Handler().ServeHTTP(rec, httptest.NewRequestWithContext(context.Background(), http.MethodPost, "/api/v1/meta", nil))
if rec.Code != http.StatusMethodNotAllowed {
t.Fatalf("status = %d, want 405", rec.Code)