Update golangci-lint to v2.12.2 with canonical config (#62)
All checks were successful
check / check (push) Successful in 5s
All checks were successful
check / check (push) Successful in 5s
Updates golangci-lint to v2.12.2 everywhere it is pinned and installs the canonical `.golangci.yml`, then remediates every finding the new linter/config surfaces so `make check` is green. ## Version bump - `Dockerfile` lint stage: `golangci/golangci-lint:v2.11.3-alpine` -> `v2.12.2-alpine` (digest-pinned, date comment updated) - `Makefile` `deps` target: `go install` moved from the old v1 module path at `@latest` to the pinned `github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2` - `.golangci.yml` replaced with the canonical config (v2 schema; settings under `linters.settings` so the thresholds actually apply; `default: all` with the standard six disables) - `script/bootstrap` installs golangci-lint via the system package manager and carries no version pin, so it is unchanged - CI (`.gitea/workflows/check.yml`) only runs `script/cibuild`, so it needed no change ## Lint remediation The canonical config surfaced ~3,300 findings across 56k lines. All are fixed, behavior-preserving; incorporates and supersedes the per-package mechanical passes already merged to `main` (refs #61). Highlights: - `err113`: dynamic errors replaced with package sentinels + `%w` wrapping; comparisons via `errors.Is` - `goprintffuncname`: printf-style helpers renamed with an `f` suffix (`ui.Writer` message methods, `cli.ReportErrorf`, `database.Fatalf`) and all call sites updated - `revive` stutter renames: `blob.Handler`, `blob.WithReader`, `blob.ChunkPosition`, `storage.URL`, `storage.Info`; missing doc comments added - `contextcheck`/`noctx`: `context.Context` threaded through `blob.Packer` and the scanner call sites; context-aware `exec`/`sql` variants - `funlen`/`cyclop`/`gocognit`/`dupl`: oversized and duplicated functions split into focused helpers (production and test code) - tests: `t.Parallel()` added where safe (global logger init kept in the serial phase for `-race`), `t.TempDir()`/`t.Helper()` adopted, several suites converted to external test packages - `gosec`: bounded integer conversions, `ReadHeaderTimeout` on the test HTTP server; remaining warnings suppressed per-site with justifications - remaining `nolint` directives are rare, targeted, and each carries a reason (e.g. `nilnil` not-found contract in the repository layer, fx module globals, on-disk snake_case struct tags) - removed the deprecated `log.LogOptions` alias (callers migrated to `log.Options`) `make check` (tests with `-race`, lint, fmt-check) passes. Co-authored-by: sneak <sneak@sneak.berlin> Reviewed-on: #62 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
This commit was merged in pull request #62.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package database
|
||||
package database_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -7,21 +7,21 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"sneak.berlin/go/vaultik/internal/database"
|
||||
"sneak.berlin/go/vaultik/internal/types"
|
||||
)
|
||||
|
||||
func TestRepositoriesTransaction(t *testing.T) {
|
||||
db, cleanup := setupTestDB(t)
|
||||
defer cleanup()
|
||||
// errIntentionalRollback forces a transaction rollback in tests.
|
||||
var errIntentionalRollback = errors.New("intentional rollback")
|
||||
|
||||
ctx := context.Background()
|
||||
repos := NewRepositories(db)
|
||||
|
||||
// Test successful transaction with multiple operations
|
||||
err := repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
|
||||
// Create a file
|
||||
file := &File{
|
||||
Path: "/test/tx_file.txt",
|
||||
// createTxTestData returns a transaction body that creates a file with
|
||||
// two chunks packed into one blob.
|
||||
func createTxTestData(
|
||||
repos *database.Repositories,
|
||||
) func(context.Context, *sql.Tx) error {
|
||||
return func(ctx context.Context, tx *sql.Tx) error {
|
||||
file := &database.File{
|
||||
Path: testTxFile,
|
||||
MTime: time.Now().Truncate(time.Second),
|
||||
Size: 1024,
|
||||
Mode: 0644,
|
||||
@@ -34,95 +34,116 @@ func TestRepositoriesTransaction(t *testing.T) {
|
||||
return err
|
||||
}
|
||||
|
||||
// Create chunks
|
||||
chunk1 := &Chunk{
|
||||
ChunkHash: types.ChunkHash("tx_chunk1"),
|
||||
Size: 512,
|
||||
}
|
||||
|
||||
err = repos.Chunks.Create(ctx, tx, chunk1)
|
||||
err = createTxFileChunks(ctx, tx, repos, file.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
chunk2 := &Chunk{
|
||||
ChunkHash: types.ChunkHash("tx_chunk2"),
|
||||
Size: 512,
|
||||
}
|
||||
return createTxBlob(ctx, tx, repos)
|
||||
}
|
||||
}
|
||||
|
||||
err = repos.Chunks.Create(ctx, tx, chunk2)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// createTxFileChunks creates the two test chunks and maps them to the file.
|
||||
func createTxFileChunks(
|
||||
ctx context.Context, tx *sql.Tx,
|
||||
repos *database.Repositories, fileID types.FileID,
|
||||
) error {
|
||||
// Create chunks
|
||||
chunk1 := &database.Chunk{
|
||||
ChunkHash: types.ChunkHash("tx_chunk1"),
|
||||
Size: 512,
|
||||
}
|
||||
|
||||
// Map chunks to file
|
||||
fc1 := &FileChunk{
|
||||
FileID: file.ID,
|
||||
Idx: 0,
|
||||
ChunkHash: chunk1.ChunkHash,
|
||||
}
|
||||
err := repos.Chunks.Create(ctx, tx, chunk1)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = repos.FileChunks.Create(ctx, tx, fc1)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
chunk2 := &database.Chunk{
|
||||
ChunkHash: types.ChunkHash("tx_chunk2"),
|
||||
Size: 512,
|
||||
}
|
||||
|
||||
fc2 := &FileChunk{
|
||||
FileID: file.ID,
|
||||
Idx: 1,
|
||||
ChunkHash: chunk2.ChunkHash,
|
||||
}
|
||||
err = repos.Chunks.Create(ctx, tx, chunk2)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = repos.FileChunks.Create(ctx, tx, fc2)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// Map chunks to file
|
||||
fc1 := &database.FileChunk{
|
||||
FileID: fileID,
|
||||
Idx: 0,
|
||||
ChunkHash: chunk1.ChunkHash,
|
||||
}
|
||||
|
||||
// Create blob
|
||||
blob := &Blob{
|
||||
ID: types.NewBlobID(),
|
||||
Hash: types.BlobHash("tx_blob1"),
|
||||
CreatedTS: time.Now().Truncate(time.Second),
|
||||
}
|
||||
err = repos.FileChunks.Create(ctx, tx, fc1)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = repos.Blobs.Create(ctx, tx, blob)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fc2 := &database.FileChunk{
|
||||
FileID: fileID,
|
||||
Idx: 1,
|
||||
ChunkHash: chunk2.ChunkHash,
|
||||
}
|
||||
|
||||
// Map chunks to blob
|
||||
bc1 := &BlobChunk{
|
||||
BlobID: blob.ID,
|
||||
ChunkHash: chunk1.ChunkHash,
|
||||
Offset: 0,
|
||||
Length: 512,
|
||||
}
|
||||
return repos.FileChunks.Create(ctx, tx, fc2)
|
||||
}
|
||||
|
||||
err = repos.BlobChunks.Create(ctx, tx, bc1)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// createTxBlob creates the test blob and maps both chunks into it.
|
||||
func createTxBlob(
|
||||
ctx context.Context, tx *sql.Tx, repos *database.Repositories,
|
||||
) error {
|
||||
blob := &database.Blob{
|
||||
ID: types.NewBlobID(),
|
||||
Hash: types.BlobHash("tx_blob1"),
|
||||
CreatedTS: time.Now().Truncate(time.Second),
|
||||
}
|
||||
|
||||
bc2 := &BlobChunk{
|
||||
BlobID: blob.ID,
|
||||
ChunkHash: chunk2.ChunkHash,
|
||||
Offset: 512,
|
||||
Length: 512,
|
||||
}
|
||||
err := repos.Blobs.Create(ctx, tx, blob)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = repos.BlobChunks.Create(ctx, tx, bc2)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// Map chunks to blob
|
||||
bc1 := &database.BlobChunk{
|
||||
BlobID: blob.ID,
|
||||
ChunkHash: types.ChunkHash("tx_chunk1"),
|
||||
Offset: 0,
|
||||
Length: 512,
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
err = repos.BlobChunks.Create(ctx, tx, bc1)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
bc2 := &database.BlobChunk{
|
||||
BlobID: blob.ID,
|
||||
ChunkHash: types.ChunkHash("tx_chunk2"),
|
||||
Offset: 512,
|
||||
Length: 512,
|
||||
}
|
||||
|
||||
return repos.BlobChunks.Create(ctx, tx, bc2)
|
||||
}
|
||||
|
||||
func TestRepositoriesTransaction(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
db, cleanup := setupTestDB(t)
|
||||
defer cleanup()
|
||||
|
||||
ctx := context.Background()
|
||||
repos := database.NewRepositories(db)
|
||||
|
||||
err := repos.WithTx(ctx, createTxTestData(repos))
|
||||
if err != nil {
|
||||
t.Fatalf("transaction failed: %v", err)
|
||||
}
|
||||
|
||||
// Verify all data was committed
|
||||
file, err := repos.Files.GetByPath(ctx, "/test/tx_file.txt")
|
||||
file, err := repos.Files.GetByPath(ctx, testTxFile)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to get file: %v", err)
|
||||
}
|
||||
@@ -131,7 +152,7 @@ func TestRepositoriesTransaction(t *testing.T) {
|
||||
t.Error("expected file after transaction")
|
||||
}
|
||||
|
||||
chunks, err := repos.FileChunks.GetByFile(ctx, "/test/tx_file.txt")
|
||||
chunks, err := repos.FileChunks.GetByFile(ctx, testTxFile)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to get file chunks: %v", err)
|
||||
}
|
||||
@@ -151,16 +172,18 @@ func TestRepositoriesTransaction(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestRepositoriesTransactionRollback(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
db, cleanup := setupTestDB(t)
|
||||
defer cleanup()
|
||||
|
||||
ctx := context.Background()
|
||||
repos := NewRepositories(db)
|
||||
repos := database.NewRepositories(db)
|
||||
|
||||
// Test transaction rollback
|
||||
err := repos.WithTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
|
||||
// Create a file
|
||||
file := &File{
|
||||
file := &database.File{
|
||||
Path: "/test/rollback_file.txt",
|
||||
MTime: time.Now().Truncate(time.Second),
|
||||
Size: 1024,
|
||||
@@ -175,7 +198,7 @@ func TestRepositoriesTransactionRollback(t *testing.T) {
|
||||
}
|
||||
|
||||
// Create a chunk
|
||||
chunk := &Chunk{
|
||||
chunk := &database.Chunk{
|
||||
ChunkHash: types.ChunkHash("rollback_chunk"),
|
||||
Size: 1024,
|
||||
}
|
||||
@@ -186,10 +209,9 @@ func TestRepositoriesTransactionRollback(t *testing.T) {
|
||||
}
|
||||
|
||||
// Return error to trigger rollback
|
||||
return errors.New("intentional rollback")
|
||||
return errIntentionalRollback
|
||||
})
|
||||
|
||||
if err == nil || err.Error() != "intentional rollback" {
|
||||
if !errors.Is(err, errIntentionalRollback) {
|
||||
t.Fatalf("expected rollback error, got: %v", err)
|
||||
}
|
||||
|
||||
@@ -214,14 +236,16 @@ func TestRepositoriesTransactionRollback(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestRepositoriesReadTransaction(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
db, cleanup := setupTestDB(t)
|
||||
defer cleanup()
|
||||
|
||||
ctx := context.Background()
|
||||
repos := NewRepositories(db)
|
||||
repos := database.NewRepositories(db)
|
||||
|
||||
// First, create some data
|
||||
file := &File{
|
||||
file := &database.File{
|
||||
Path: "/test/read_file.txt",
|
||||
MTime: time.Now().Truncate(time.Second),
|
||||
Size: 1024,
|
||||
@@ -236,7 +260,7 @@ func TestRepositoriesReadTransaction(t *testing.T) {
|
||||
}
|
||||
|
||||
// Test read-only transaction
|
||||
var retrievedFile *File
|
||||
var retrievedFile *database.File
|
||||
|
||||
err = repos.WithReadTx(ctx, func(ctx context.Context, tx *sql.Tx) error {
|
||||
var err error
|
||||
@@ -247,7 +271,7 @@ func TestRepositoriesReadTransaction(t *testing.T) {
|
||||
}
|
||||
|
||||
// Try to write in read-only transaction (should fail)
|
||||
_ = repos.Files.Create(ctx, tx, &File{
|
||||
_ = repos.Files.Create(ctx, tx, &database.File{
|
||||
Path: "/test/should_fail.txt",
|
||||
MTime: time.Now(),
|
||||
Size: 0,
|
||||
|
||||
Reference in New Issue
Block a user