clawbotandsneak
cc58583130
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>
79 lines
2.2 KiB
Go
79 lines
2.2 KiB
Go
package vaultik_test
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"sneak.berlin/go/vaultik/internal/config"
|
|
"sneak.berlin/go/vaultik/internal/database"
|
|
"sneak.berlin/go/vaultik/internal/log"
|
|
"sneak.berlin/go/vaultik/internal/vaultik"
|
|
)
|
|
|
|
// buildBindTestVaultik returns a minimal Vaultik wired with a real
|
|
// in-memory DB and a config carrying the given StorageURL. Enough to
|
|
// exercise EnsureStorageBinding without spinning up storage or fx.
|
|
func buildBindTestVaultik(
|
|
t *testing.T, storageURL string,
|
|
) (*vaultik.TestVaultik, *database.Repositories) {
|
|
t.Helper()
|
|
|
|
db, err := database.NewTestDB()
|
|
require.NoError(t, err)
|
|
t.Cleanup(func() { _ = db.Close() })
|
|
|
|
repos := database.NewRepositories(db)
|
|
|
|
tv := vaultik.NewForTesting(nil)
|
|
tv.Repositories = repos
|
|
tv.DB = db
|
|
tv.Config = &config.Config{StorageURL: storageURL}
|
|
tv.SetContext(context.Background())
|
|
|
|
return tv, repos
|
|
}
|
|
|
|
func TestEnsureStorageBinding_FreshDBRecordsURL(t *testing.T) {
|
|
log.Initialize(log.Config{})
|
|
t.Parallel()
|
|
|
|
tv, repos := buildBindTestVaultik(t, "file:///mnt/backups/new")
|
|
|
|
require.NoError(t, tv.EnsureStorageBinding())
|
|
|
|
got, err := repos.LocalMeta.Get(context.Background(), database.LocalMetaKeyStorageURL)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "file:///mnt/backups/new", got,
|
|
"first call must record the configured URL")
|
|
}
|
|
|
|
func TestEnsureStorageBinding_MatchingURLPasses(t *testing.T) {
|
|
log.Initialize(log.Config{})
|
|
t.Parallel()
|
|
|
|
tv, repos := buildBindTestVaultik(t, "s3://bucket/prefix")
|
|
|
|
require.NoError(t, repos.LocalMeta.Set(context.Background(),
|
|
database.LocalMetaKeyStorageURL, "s3://bucket/prefix"))
|
|
|
|
require.NoError(t, tv.EnsureStorageBinding())
|
|
}
|
|
|
|
func TestEnsureStorageBinding_MismatchRefuses(t *testing.T) {
|
|
log.Initialize(log.Config{})
|
|
t.Parallel()
|
|
|
|
tv, repos := buildBindTestVaultik(t, "file:///mnt/backups/new")
|
|
|
|
require.NoError(t, repos.LocalMeta.Set(context.Background(),
|
|
database.LocalMetaKeyStorageURL, "file:///mnt/backups/old"))
|
|
|
|
err := tv.EnsureStorageBinding()
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "file:///mnt/backups/old")
|
|
assert.Contains(t, err.Error(), "file:///mnt/backups/new")
|
|
assert.Contains(t, err.Error(), "vaultik database delete")
|
|
}
|