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>
301 lines
6.7 KiB
Go
301 lines
6.7 KiB
Go
package storage
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/spf13/afero"
|
|
)
|
|
|
|
// FileStorer implements Storer using the local filesystem.
|
|
// It mirrors the S3 path structure for consistency.
|
|
type FileStorer struct {
|
|
fs afero.Fs
|
|
basePath string
|
|
}
|
|
|
|
// NewFileStorer creates a new filesystem storage backend.
|
|
//
|
|
// Construction is intentionally cheap and does not touch the filesystem.
|
|
// The basePath is recorded; the directory is created lazily on first
|
|
// write. Reads (Get/Stat/List) tolerate a missing basePath — a missing
|
|
// or unmounted destination during `snapshot list` should NOT block the
|
|
// command, it should degrade to "no remote snapshots reachable" with a
|
|
// warning. Write operations (Put/PutWithProgress) call MkdirAll for the
|
|
// per-blob parent directory, which also covers basePath on first use.
|
|
//
|
|
// Uses the real OS filesystem by default; call SetFilesystem to
|
|
// override for testing.
|
|
func NewFileStorer(basePath string) (*FileStorer, error) {
|
|
return &FileStorer{
|
|
fs: afero.NewOsFs(),
|
|
basePath: basePath,
|
|
}, nil
|
|
}
|
|
|
|
// SetFilesystem overrides the filesystem for testing.
|
|
func (f *FileStorer) SetFilesystem(fs afero.Fs) {
|
|
f.fs = fs
|
|
}
|
|
|
|
// storageDirPerm is the mode used for directories created under the
|
|
// storage base path.
|
|
const storageDirPerm = 0o755
|
|
|
|
// Put stores data at the specified key.
|
|
func (f *FileStorer) Put(_ context.Context, key string, data io.Reader) error {
|
|
path := f.fullPath(key)
|
|
|
|
// Create parent directories
|
|
dir := filepath.Dir(path)
|
|
|
|
err := f.fs.MkdirAll(dir, storageDirPerm)
|
|
if err != nil {
|
|
return fmt.Errorf("creating directories: %w", err)
|
|
}
|
|
|
|
file, err := f.fs.Create(path)
|
|
if err != nil {
|
|
return fmt.Errorf("creating file: %w", err)
|
|
}
|
|
defer func() { _ = file.Close() }()
|
|
|
|
_, err = io.Copy(file, data)
|
|
if err != nil {
|
|
return fmt.Errorf("writing file: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// PutWithProgress stores data with progress reporting.
|
|
func (f *FileStorer) PutWithProgress(
|
|
_ context.Context, key string, data io.Reader,
|
|
_ int64, progress ProgressCallback,
|
|
) error {
|
|
path := f.fullPath(key)
|
|
|
|
// Create parent directories
|
|
dir := filepath.Dir(path)
|
|
|
|
err := f.fs.MkdirAll(dir, storageDirPerm)
|
|
if err != nil {
|
|
return fmt.Errorf("creating directories: %w", err)
|
|
}
|
|
|
|
file, err := f.fs.Create(path)
|
|
if err != nil {
|
|
return fmt.Errorf("creating file: %w", err)
|
|
}
|
|
defer func() { _ = file.Close() }()
|
|
|
|
// Wrap with progress tracking
|
|
pw := &progressWriter{
|
|
writer: file,
|
|
callback: progress,
|
|
}
|
|
|
|
_, err = io.Copy(pw, data)
|
|
if err != nil {
|
|
return fmt.Errorf("writing file: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Get retrieves data from the specified key.
|
|
func (f *FileStorer) Get(_ context.Context, key string) (io.ReadCloser, error) {
|
|
path := f.fullPath(key)
|
|
|
|
file, err := f.fs.Open(path)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
return nil, ErrNotFound
|
|
}
|
|
|
|
return nil, fmt.Errorf("opening file: %w", err)
|
|
}
|
|
|
|
return file, nil
|
|
}
|
|
|
|
// Stat returns metadata about an object without retrieving its contents.
|
|
func (f *FileStorer) Stat(_ context.Context, key string) (*ObjectInfo, error) {
|
|
path := f.fullPath(key)
|
|
|
|
info, err := f.fs.Stat(path)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
return nil, ErrNotFound
|
|
}
|
|
|
|
return nil, fmt.Errorf("stat file: %w", err)
|
|
}
|
|
|
|
return &ObjectInfo{
|
|
Key: key,
|
|
Size: info.Size(),
|
|
}, nil
|
|
}
|
|
|
|
// Delete removes an object.
|
|
func (f *FileStorer) Delete(_ context.Context, key string) error {
|
|
path := f.fullPath(key)
|
|
|
|
err := f.fs.Remove(path)
|
|
if os.IsNotExist(err) {
|
|
return nil // Match S3 behavior: no error if doesn't exist
|
|
}
|
|
|
|
if err != nil {
|
|
return fmt.Errorf("removing file: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// List returns all keys with the given prefix.
|
|
func (f *FileStorer) List(ctx context.Context, prefix string) ([]string, error) {
|
|
var keys []string
|
|
|
|
basePath := f.fullPath(prefix)
|
|
|
|
// Check if base path exists
|
|
exists, err := afero.Exists(f.fs, basePath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("checking path: %w", err)
|
|
}
|
|
|
|
if !exists {
|
|
return keys, nil // Empty list for non-existent prefix
|
|
}
|
|
|
|
err = afero.Walk(f.fs, basePath, func(path string, info os.FileInfo, err error) error {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Check context cancellation
|
|
select {
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
default:
|
|
}
|
|
|
|
if !info.IsDir() {
|
|
// Convert back to key (relative path from basePath)
|
|
relPath, err := filepath.Rel(f.basePath, path)
|
|
if err != nil {
|
|
return fmt.Errorf("computing relative path: %w", err)
|
|
}
|
|
// Normalize path separators to forward slashes for consistency
|
|
relPath = strings.ReplaceAll(relPath, string(filepath.Separator), "/")
|
|
keys = append(keys, relPath)
|
|
}
|
|
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("walking directory: %w", err)
|
|
}
|
|
|
|
return keys, nil
|
|
}
|
|
|
|
// ListStream returns a channel of ObjectInfo for large result sets.
|
|
func (f *FileStorer) ListStream(ctx context.Context, prefix string) <-chan ObjectInfo {
|
|
ch := make(chan ObjectInfo)
|
|
go func() {
|
|
defer close(ch)
|
|
|
|
basePath := f.fullPath(prefix)
|
|
|
|
// Check if base path exists
|
|
exists, err := afero.Exists(f.fs, basePath)
|
|
if err != nil {
|
|
ch <- ObjectInfo{Err: fmt.Errorf("checking path: %w", err)}
|
|
|
|
return
|
|
}
|
|
|
|
if !exists {
|
|
return // Empty channel for non-existent prefix
|
|
}
|
|
|
|
_ = afero.Walk(f.fs, basePath, func(path string, info os.FileInfo, err error) error {
|
|
// Check context cancellation
|
|
select {
|
|
case <-ctx.Done():
|
|
ch <- ObjectInfo{Err: ctx.Err()}
|
|
|
|
return ctx.Err()
|
|
default:
|
|
}
|
|
|
|
if err != nil {
|
|
ch <- ObjectInfo{Err: err}
|
|
|
|
return nil //nolint:nilerr // continue walking despite errors
|
|
}
|
|
|
|
if !info.IsDir() {
|
|
relPath, err := filepath.Rel(f.basePath, path)
|
|
if err != nil {
|
|
ch <- ObjectInfo{Err: fmt.Errorf("computing relative path: %w", err)}
|
|
|
|
return nil
|
|
}
|
|
// Normalize path separators
|
|
relPath = strings.ReplaceAll(relPath, string(filepath.Separator), "/")
|
|
ch <- ObjectInfo{
|
|
Key: relPath,
|
|
Size: info.Size(),
|
|
}
|
|
}
|
|
|
|
return nil
|
|
})
|
|
}()
|
|
|
|
return ch
|
|
}
|
|
|
|
// Info returns human-readable storage location information.
|
|
func (f *FileStorer) Info() Info {
|
|
return Info{
|
|
Type: schemeFile,
|
|
Location: f.basePath,
|
|
}
|
|
}
|
|
|
|
// fullPath returns the full filesystem path for a key.
|
|
func (f *FileStorer) fullPath(key string) string {
|
|
return filepath.Join(f.basePath, key)
|
|
}
|
|
|
|
// progressWriter wraps an io.Writer to track write progress.
|
|
type progressWriter struct {
|
|
writer io.Writer
|
|
written int64
|
|
callback ProgressCallback
|
|
}
|
|
|
|
func (pw *progressWriter) Write(p []byte) (int, error) {
|
|
n, err := pw.writer.Write(p)
|
|
if n > 0 {
|
|
pw.written += int64(n)
|
|
if pw.callback != nil {
|
|
callbackErr := pw.callback(pw.written)
|
|
if callbackErr != nil {
|
|
return n, callbackErr
|
|
}
|
|
}
|
|
}
|
|
|
|
return n, err
|
|
}
|