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>
230 lines
6.3 KiB
Go
230 lines
6.3 KiB
Go
// Package types provides custom types for better type safety across the
|
|
// vaultik codebase. Using distinct types for IDs, hashes, paths, and
|
|
// credentials prevents accidental mixing of semantically different values
|
|
// that happen to share the same underlying type.
|
|
package types
|
|
|
|
import (
|
|
"database/sql/driver"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/google/uuid"
|
|
)
|
|
|
|
// errCannotScan is returned when a database value cannot be scanned into
|
|
// an ID type.
|
|
var errCannotScan = errors.New("cannot scan value")
|
|
|
|
// FileID is a UUID identifying a file record in the database.
|
|
//
|
|
// used on values.
|
|
//
|
|
//nolint:recvcheck // Scan requires a pointer receiver; String/Value are
|
|
type FileID uuid.UUID
|
|
|
|
// NewFileID generates a new random FileID.
|
|
func NewFileID() FileID {
|
|
return FileID(uuid.New())
|
|
}
|
|
|
|
// ParseFileID parses a string into a FileID.
|
|
func ParseFileID(s string) (FileID, error) {
|
|
id, err := uuid.Parse(s)
|
|
if err != nil {
|
|
return FileID{}, err
|
|
}
|
|
|
|
return FileID(id), nil
|
|
}
|
|
|
|
// IsZero returns true if the FileID is the zero value.
|
|
func (id FileID) IsZero() bool {
|
|
return uuid.UUID(id) == uuid.Nil
|
|
}
|
|
|
|
// Value implements driver.Valuer for database serialization.
|
|
func (id FileID) Value() (driver.Value, error) {
|
|
return uuid.UUID(id).String(), nil
|
|
}
|
|
|
|
// Scan implements sql.Scanner for database deserialization.
|
|
func (id *FileID) Scan(src any) error {
|
|
if src == nil {
|
|
*id = FileID{}
|
|
|
|
return nil
|
|
}
|
|
|
|
var s string
|
|
|
|
switch v := src.(type) {
|
|
case string:
|
|
s = v
|
|
case []byte:
|
|
s = string(v)
|
|
default:
|
|
return fmt.Errorf("%w: %T into FileID", errCannotScan, src)
|
|
}
|
|
|
|
parsed, err := uuid.Parse(s)
|
|
if err != nil {
|
|
return fmt.Errorf("invalid FileID: %w", err)
|
|
}
|
|
|
|
*id = FileID(parsed)
|
|
|
|
return nil
|
|
}
|
|
|
|
// BlobID is a UUID identifying a blob record in the database.
|
|
// This is distinct from BlobHash which is the content-addressed hash of the blob.
|
|
//
|
|
// used on values.
|
|
//
|
|
//nolint:recvcheck // Scan requires a pointer receiver; String/Value are
|
|
type BlobID uuid.UUID
|
|
|
|
// NewBlobID generates a new random BlobID.
|
|
func NewBlobID() BlobID {
|
|
return BlobID(uuid.New())
|
|
}
|
|
|
|
// ParseBlobID parses a string into a BlobID.
|
|
func ParseBlobID(s string) (BlobID, error) {
|
|
id, err := uuid.Parse(s)
|
|
if err != nil {
|
|
return BlobID{}, err
|
|
}
|
|
|
|
return BlobID(id), nil
|
|
}
|
|
|
|
// IsZero returns true if the BlobID is the zero value.
|
|
func (id BlobID) IsZero() bool {
|
|
return uuid.UUID(id) == uuid.Nil
|
|
}
|
|
|
|
// Value implements driver.Valuer for database serialization.
|
|
func (id BlobID) Value() (driver.Value, error) {
|
|
return uuid.UUID(id).String(), nil
|
|
}
|
|
|
|
// Scan implements sql.Scanner for database deserialization.
|
|
func (id *BlobID) Scan(src any) error {
|
|
if src == nil {
|
|
*id = BlobID{}
|
|
|
|
return nil
|
|
}
|
|
|
|
var s string
|
|
|
|
switch v := src.(type) {
|
|
case string:
|
|
s = v
|
|
case []byte:
|
|
s = string(v)
|
|
default:
|
|
return fmt.Errorf("%w: %T into BlobID", errCannotScan, src)
|
|
}
|
|
|
|
parsed, err := uuid.Parse(s)
|
|
if err != nil {
|
|
return fmt.Errorf("invalid BlobID: %w", err)
|
|
}
|
|
|
|
*id = BlobID(parsed)
|
|
|
|
return nil
|
|
}
|
|
|
|
// SnapshotID identifies a snapshot, typically in format "hostname_name_timestamp".
|
|
type SnapshotID string
|
|
|
|
// ChunkHash is the SHA256 hash of a chunk's content.
|
|
// Used for content-addressing and deduplication of file chunks.
|
|
type ChunkHash string
|
|
|
|
// BlobHash is the SHA256 hash of a blob's compressed and encrypted content.
|
|
// This is used as the filename in S3 storage for content-addressed retrieval.
|
|
type BlobHash string
|
|
|
|
// FilePath represents an absolute path to a file or directory.
|
|
type FilePath string
|
|
|
|
// SourcePath represents the root directory from which files are backed up.
|
|
// Used during restore to strip the source prefix from paths.
|
|
type SourcePath string
|
|
|
|
// AgeRecipient is an age public key used for encryption.
|
|
// Format: age1... (Bech32-encoded X25519 public key)
|
|
type AgeRecipient string
|
|
|
|
// AgeSecretKey is an age private key used for decryption.
|
|
// Format: AGE-SECRET-KEY-... (Bech32-encoded X25519 private key)
|
|
// This type should never be logged or serialized in plaintext.
|
|
type AgeSecretKey string
|
|
|
|
// S3Endpoint is the URL of an S3-compatible storage endpoint.
|
|
type S3Endpoint string
|
|
|
|
// BucketName is the name of an S3 bucket.
|
|
type BucketName string
|
|
|
|
// S3Prefix is the path prefix within an S3 bucket.
|
|
type S3Prefix string
|
|
|
|
// AWSRegion is an AWS region identifier (e.g., "us-east-1").
|
|
type AWSRegion string
|
|
|
|
// AWSAccessKeyID is an AWS access key ID for authentication.
|
|
type AWSAccessKeyID string
|
|
|
|
// AWSSecretAccessKey is an AWS secret access key for authentication.
|
|
// This type should never be logged or serialized in plaintext.
|
|
type AWSSecretAccessKey string
|
|
|
|
// Hostname identifies a host machine.
|
|
type Hostname string
|
|
|
|
// Version is a semantic version string.
|
|
type Version string
|
|
|
|
// GitRevision is a git commit SHA.
|
|
type GitRevision string
|
|
|
|
// GlobPattern is a glob pattern for file matching (e.g., "*.log", "node_modules").
|
|
type GlobPattern string
|
|
|
|
// String methods for Stringer interface
|
|
|
|
func (id FileID) String() string { return uuid.UUID(id).String() }
|
|
func (id BlobID) String() string { return uuid.UUID(id).String() }
|
|
func (id SnapshotID) String() string { return string(id) }
|
|
func (h ChunkHash) String() string { return string(h) }
|
|
func (h BlobHash) String() string { return string(h) }
|
|
func (p FilePath) String() string { return string(p) }
|
|
func (p SourcePath) String() string { return string(p) }
|
|
func (r AgeRecipient) String() string { return string(r) }
|
|
func (e S3Endpoint) String() string { return string(e) }
|
|
func (b BucketName) String() string { return string(b) }
|
|
func (p S3Prefix) String() string { return string(p) }
|
|
func (r AWSRegion) String() string { return string(r) }
|
|
func (k AWSAccessKeyID) String() string { return string(k) }
|
|
func (h Hostname) String() string { return string(h) }
|
|
func (v Version) String() string { return string(v) }
|
|
func (r GitRevision) String() string { return string(r) }
|
|
func (p GlobPattern) String() string { return string(p) }
|
|
|
|
// Redacted String methods for sensitive types - prevents accidental logging
|
|
|
|
func (k AgeSecretKey) String() string { return "[REDACTED]" }
|
|
func (k AWSSecretAccessKey) String() string { return "[REDACTED]" }
|
|
|
|
// Raw returns the actual value for sensitive types when explicitly needed.
|
|
func (k AgeSecretKey) Raw() string { return string(k) }
|
|
|
|
// Raw returns the actual value for sensitive types when explicitly needed.
|
|
func (k AWSSecretAccessKey) Raw() string { return string(k) }
|