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>
82 lines
2.1 KiB
Go
82 lines
2.1 KiB
Go
package snapshot
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/klauspost/compress/zstd"
|
|
)
|
|
|
|
// Manifest represents the structure of a snapshot's blob manifest
|
|
//
|
|
//nolint:tagliatelle // snake_case is the established on-disk manifest format
|
|
type Manifest struct {
|
|
SnapshotID string `json:"snapshot_id"`
|
|
Timestamp string `json:"timestamp"`
|
|
BlobCount int `json:"blob_count"`
|
|
TotalCompressedSize int64 `json:"total_compressed_size"`
|
|
Blobs []BlobInfo `json:"blobs"`
|
|
}
|
|
|
|
// BlobInfo represents information about a single blob in the manifest
|
|
//
|
|
//nolint:tagliatelle // snake_case is the established on-disk manifest format
|
|
type BlobInfo struct {
|
|
Hash string `json:"hash"`
|
|
CompressedSize int64 `json:"compressed_size"`
|
|
}
|
|
|
|
// DecodeManifest decodes a manifest from a reader containing compressed JSON
|
|
func DecodeManifest(r io.Reader) (*Manifest, error) {
|
|
// Decompress using zstd
|
|
zr, err := zstd.NewReader(r)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("creating zstd reader: %w", err)
|
|
}
|
|
defer zr.Close()
|
|
|
|
// Decode JSON manifest
|
|
var manifest Manifest
|
|
|
|
err = json.NewDecoder(zr).Decode(&manifest)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("decoding manifest: %w", err)
|
|
}
|
|
|
|
return &manifest, nil
|
|
}
|
|
|
|
// EncodeManifest encodes a manifest to compressed JSON
|
|
func EncodeManifest(manifest *Manifest, compressionLevel int) ([]byte, error) {
|
|
// Marshal to JSON
|
|
jsonData, err := json.MarshalIndent(manifest, "", " ")
|
|
if err != nil {
|
|
return nil, fmt.Errorf("marshaling manifest: %w", err)
|
|
}
|
|
|
|
// Compress using zstd
|
|
var compressedBuf bytes.Buffer
|
|
|
|
writer, err := zstd.NewWriter(&compressedBuf,
|
|
zstd.WithEncoderLevel(zstd.EncoderLevelFromZstd(compressionLevel)))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("creating zstd writer: %w", err)
|
|
}
|
|
|
|
_, err = writer.Write(jsonData)
|
|
if err != nil {
|
|
_ = writer.Close()
|
|
|
|
return nil, fmt.Errorf("writing compressed data: %w", err)
|
|
}
|
|
|
|
err = writer.Close()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("closing zstd writer: %w", err)
|
|
}
|
|
|
|
return compressedBuf.Bytes(), nil
|
|
}
|