Compare commits
12 Commits
fix/sql-in
...
a53203d60d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a53203d60d | ||
| c24e7e6360 | |||
| 7a5943958d | |||
| d8a51804d2 | |||
| 76f4421eb3 | |||
| 53ac868c5d | |||
| 8c4ea2b870 | |||
| 597b560398 | |||
| 1e2eced092 | |||
| 76e047bbb2 | |||
|
|
ddc23f8057 | ||
| cafb3d45b8 |
8
.dockerignore
Normal file
8
.dockerignore
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
.git
|
||||||
|
.gitea
|
||||||
|
*.md
|
||||||
|
LICENSE
|
||||||
|
vaultik
|
||||||
|
coverage.out
|
||||||
|
coverage.html
|
||||||
|
.DS_Store
|
||||||
14
.gitea/workflows/check.yml
Normal file
14
.gitea/workflows/check.yml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
name: check
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
pull_request:
|
||||||
|
branches: [main]
|
||||||
|
jobs:
|
||||||
|
check:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
# actions/checkout v4, 2024-09-16
|
||||||
|
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
|
||||||
|
- name: Build and check
|
||||||
|
run: docker build .
|
||||||
61
Dockerfile
Normal file
61
Dockerfile
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
# Lint stage
|
||||||
|
# golangci/golangci-lint:v2.11.3-alpine, 2026-03-17
|
||||||
|
FROM golangci/golangci-lint:v2.11.3-alpine@sha256:b1c3de5862ad0a95b4e45a993b0f00415835d687e4f12c845c7493b86c13414e AS lint
|
||||||
|
|
||||||
|
RUN apk add --no-cache make build-base
|
||||||
|
|
||||||
|
WORKDIR /src
|
||||||
|
|
||||||
|
# Copy go mod files first for better layer caching
|
||||||
|
COPY go.mod go.sum ./
|
||||||
|
RUN go mod download
|
||||||
|
|
||||||
|
# Copy source code
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Run formatting check and linter
|
||||||
|
RUN make fmt-check
|
||||||
|
RUN make lint
|
||||||
|
|
||||||
|
# Build stage
|
||||||
|
# golang:1.26.1-alpine, 2026-03-17
|
||||||
|
FROM golang:1.26.1-alpine@sha256:2389ebfa5b7f43eeafbd6be0c3700cc46690ef842ad962f6c5bd6be49ed82039 AS builder
|
||||||
|
|
||||||
|
# Depend on lint stage passing
|
||||||
|
COPY --from=lint /src/go.sum /dev/null
|
||||||
|
|
||||||
|
ARG VERSION=dev
|
||||||
|
|
||||||
|
# Install build dependencies for CGO (mattn/go-sqlite3) and sqlite3 CLI (tests)
|
||||||
|
RUN apk add --no-cache make build-base sqlite
|
||||||
|
|
||||||
|
WORKDIR /src
|
||||||
|
|
||||||
|
# Copy go mod files first for better layer caching
|
||||||
|
COPY go.mod go.sum ./
|
||||||
|
RUN go mod download
|
||||||
|
|
||||||
|
# Copy source code
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Run tests
|
||||||
|
RUN make test
|
||||||
|
|
||||||
|
# Build with CGO enabled (required for mattn/go-sqlite3)
|
||||||
|
RUN CGO_ENABLED=1 go build -ldflags "-X 'git.eeqj.de/sneak/vaultik/internal/globals.Version=${VERSION}' -X 'git.eeqj.de/sneak/vaultik/internal/globals.Commit=$(git rev-parse HEAD 2>/dev/null || echo unknown)'" -o /vaultik ./cmd/vaultik
|
||||||
|
|
||||||
|
# Runtime stage
|
||||||
|
# alpine:3.21, 2026-02-25
|
||||||
|
FROM alpine:3.21@sha256:c3f8e73fdb79deaebaa2037150150191b9dcbfba68b4a46d70103204c53f4709
|
||||||
|
|
||||||
|
RUN apk add --no-cache ca-certificates sqlite
|
||||||
|
|
||||||
|
# Copy binary from builder
|
||||||
|
COPY --from=builder /vaultik /usr/local/bin/vaultik
|
||||||
|
|
||||||
|
# Create non-root user
|
||||||
|
RUN adduser -D -H -s /sbin/nologin vaultik
|
||||||
|
|
||||||
|
USER vaultik
|
||||||
|
|
||||||
|
ENTRYPOINT ["/usr/local/bin/vaultik"]
|
||||||
40
Makefile
40
Makefile
@@ -1,4 +1,4 @@
|
|||||||
.PHONY: test fmt lint build clean all
|
.PHONY: test fmt lint fmt-check check build clean all docker hooks
|
||||||
|
|
||||||
# Version number
|
# Version number
|
||||||
VERSION := 0.0.1
|
VERSION := 0.0.1
|
||||||
@@ -14,21 +14,12 @@ LDFLAGS := -X 'git.eeqj.de/sneak/vaultik/internal/globals.Version=$(VERSION)' \
|
|||||||
all: vaultik
|
all: vaultik
|
||||||
|
|
||||||
# Run tests
|
# Run tests
|
||||||
test: lint fmt-check
|
test:
|
||||||
@echo "Running tests..."
|
go test -race -timeout 30s ./...
|
||||||
@if ! go test -v -timeout 10s ./... 2>&1; then \
|
|
||||||
echo ""; \
|
|
||||||
echo "TEST FAILURES DETECTED"; \
|
|
||||||
echo "Run 'go test -v ./internal/database' to see database test details"; \
|
|
||||||
exit 1; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if code is formatted
|
# Check if code is formatted (read-only)
|
||||||
fmt-check:
|
fmt-check:
|
||||||
@if [ -n "$$(go fmt ./...)" ]; then \
|
@test -z "$$(gofmt -l .)" || (echo "Files not formatted:" && gofmt -l . && exit 1)
|
||||||
echo "Error: Code is not formatted. Run 'make fmt' to fix."; \
|
|
||||||
exit 1; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Format code
|
# Format code
|
||||||
fmt:
|
fmt:
|
||||||
@@ -36,7 +27,7 @@ fmt:
|
|||||||
|
|
||||||
# Run linter
|
# Run linter
|
||||||
lint:
|
lint:
|
||||||
golangci-lint run
|
golangci-lint run ./...
|
||||||
|
|
||||||
# Build binary
|
# Build binary
|
||||||
vaultik: internal/*/*.go cmd/vaultik/*.go
|
vaultik: internal/*/*.go cmd/vaultik/*.go
|
||||||
@@ -47,11 +38,6 @@ clean:
|
|||||||
rm -f vaultik
|
rm -f vaultik
|
||||||
go clean
|
go clean
|
||||||
|
|
||||||
# Install dependencies
|
|
||||||
deps:
|
|
||||||
go mod download
|
|
||||||
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
|
|
||||||
|
|
||||||
# Run tests with coverage
|
# Run tests with coverage
|
||||||
test-coverage:
|
test-coverage:
|
||||||
go test -v -coverprofile=coverage.out ./...
|
go test -v -coverprofile=coverage.out ./...
|
||||||
@@ -67,3 +53,17 @@ local:
|
|||||||
|
|
||||||
install: vaultik
|
install: vaultik
|
||||||
cp ./vaultik $(HOME)/bin/
|
cp ./vaultik $(HOME)/bin/
|
||||||
|
|
||||||
|
# Run all checks (formatting, linting, tests) without modifying files
|
||||||
|
check: fmt-check lint test
|
||||||
|
|
||||||
|
# Build Docker image
|
||||||
|
docker:
|
||||||
|
docker build -t vaultik .
|
||||||
|
|
||||||
|
# Install pre-commit hook
|
||||||
|
hooks:
|
||||||
|
@printf '#!/bin/sh\nset -e\n' > .git/hooks/pre-commit
|
||||||
|
@printf 'go mod tidy\ngo fmt ./...\ngit diff --exit-code -- go.mod go.sum || { echo "go mod tidy changed files; please stage and retry"; exit 1; }\n' >> .git/hooks/pre-commit
|
||||||
|
@printf 'make check\n' >> .git/hooks/pre-commit
|
||||||
|
@chmod +x .git/hooks/pre-commit
|
||||||
|
|||||||
46
README.md
46
README.md
@@ -194,8 +194,11 @@ vaultik [--config <path>] store info
|
|||||||
* Requires `VAULTIK_AGE_SECRET_KEY` environment variable with age private key
|
* Requires `VAULTIK_AGE_SECRET_KEY` environment variable with age private key
|
||||||
* Optional path arguments to restore specific files/directories (default: all)
|
* Optional path arguments to restore specific files/directories (default: all)
|
||||||
* Downloads and decrypts metadata, fetches required blobs, reconstructs files
|
* Downloads and decrypts metadata, fetches required blobs, reconstructs files
|
||||||
* Preserves file permissions, timestamps, and ownership (ownership requires root)
|
* Preserves file permissions, timestamps (mtime), and ownership (ownership requires root)
|
||||||
* Handles symlinks and directories
|
* Handles symlinks and directories
|
||||||
|
* Note: ctime is recorded in the snapshot for informational purposes but is not
|
||||||
|
restored, as setting ctime is not possible through standard system calls on
|
||||||
|
most platforms
|
||||||
|
|
||||||
**prune**: Remove unreferenced blobs from remote storage
|
**prune**: Remove unreferenced blobs from remote storage
|
||||||
* Scans all snapshots for referenced blobs
|
* Scans all snapshots for referenced blobs
|
||||||
@@ -207,6 +210,42 @@ vaultik [--config <path>] store info
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## file metadata
|
||||||
|
|
||||||
|
vaultik records the following metadata for each file: path, size, mode
|
||||||
|
(permissions), uid, gid, mtime (modification time), ctime, and symlink
|
||||||
|
target.
|
||||||
|
|
||||||
|
### ctime semantics (platform-specific)
|
||||||
|
|
||||||
|
The `ctime` field has different meanings depending on the operating system:
|
||||||
|
|
||||||
|
| Platform | ctime value | Source |
|
||||||
|
|----------|-------------|--------|
|
||||||
|
| **macOS** | File birth (creation) time | `syscall.Stat_t.Birthtimespec` |
|
||||||
|
| **Linux** | Inode change time | `syscall.Stat_t.Ctim` |
|
||||||
|
| **Other** | Falls back to mtime | `os.FileInfo.ModTime()` |
|
||||||
|
|
||||||
|
**macOS (Darwin):** HFS+ and APFS filesystems natively track file creation
|
||||||
|
time. The `ctime` field contains the true file birth time — when the file was
|
||||||
|
first created on disk.
|
||||||
|
|
||||||
|
**Linux:** Most Linux filesystems do not expose file creation time through
|
||||||
|
standard Go APIs. The `ctime` field contains the inode change time, which is
|
||||||
|
updated whenever file metadata (permissions, ownership, link count) or content
|
||||||
|
changes. Linux ext4 (kernel 4.11+) and btrfs do track birth time via the
|
||||||
|
`statx()` syscall, but this is not exposed through Go's `os.FileInfo.Sys()`.
|
||||||
|
|
||||||
|
**Restore:** ctime is stored in the snapshot database for informational and
|
||||||
|
forensic purposes but is not restored to the filesystem. Setting ctime is not
|
||||||
|
possible through standard system calls on most Unix platforms — the kernel
|
||||||
|
manages ctime automatically.
|
||||||
|
|
||||||
|
When using in-memory filesystems (e.g. afero `MemMapFs` in tests), ctime falls
|
||||||
|
back to mtime since there is no underlying `syscall.Stat_t`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## architecture
|
## architecture
|
||||||
|
|
||||||
### s3 bucket layout
|
### s3 bucket layout
|
||||||
@@ -247,11 +286,14 @@ Snapshot IDs follow the format `<hostname>_<snapshot-name>_<timestamp>` (e.g., `
|
|||||||
CREATE TABLE files (
|
CREATE TABLE files (
|
||||||
id TEXT PRIMARY KEY,
|
id TEXT PRIMARY KEY,
|
||||||
path TEXT NOT NULL UNIQUE,
|
path TEXT NOT NULL UNIQUE,
|
||||||
|
source_path TEXT NOT NULL DEFAULT '',
|
||||||
mtime INTEGER NOT NULL,
|
mtime INTEGER NOT NULL,
|
||||||
|
ctime INTEGER NOT NULL,
|
||||||
size INTEGER NOT NULL,
|
size INTEGER NOT NULL,
|
||||||
mode INTEGER NOT NULL,
|
mode INTEGER NOT NULL,
|
||||||
uid INTEGER NOT NULL,
|
uid INTEGER NOT NULL,
|
||||||
gid INTEGER NOT NULL
|
gid INTEGER NOT NULL,
|
||||||
|
link_target TEXT
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE file_chunks (
|
CREATE TABLE file_chunks (
|
||||||
|
|||||||
2
go.mod
2
go.mod
@@ -1,6 +1,6 @@
|
|||||||
module git.eeqj.de/sneak/vaultik
|
module git.eeqj.de/sneak/vaultik
|
||||||
|
|
||||||
go 1.24.4
|
go 1.26.1
|
||||||
|
|
||||||
require (
|
require (
|
||||||
filippo.io/age v1.2.1
|
filippo.io/age v1.2.1
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ type File struct {
|
|||||||
Path types.FilePath // Absolute path of the file
|
Path types.FilePath // Absolute path of the file
|
||||||
SourcePath types.SourcePath // The source directory this file came from (for restore path stripping)
|
SourcePath types.SourcePath // The source directory this file came from (for restore path stripping)
|
||||||
MTime time.Time
|
MTime time.Time
|
||||||
|
// CTime is the file creation/change time. On macOS this is the birth time
|
||||||
|
// (when the file was created). On Linux this is the inode change time
|
||||||
|
// (updated on metadata or content changes). See ctime_darwin.go and
|
||||||
|
// ctime_linux.go in the snapshot package for extraction details.
|
||||||
CTime time.Time
|
CTime time.Time
|
||||||
Size int64
|
Size int64
|
||||||
Mode uint32
|
Mode uint32
|
||||||
|
|||||||
23
internal/snapshot/ctime_darwin.go
Normal file
23
internal/snapshot/ctime_darwin.go
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
package snapshot
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// getCTime extracts the file creation time (birth time) from os.FileInfo.
|
||||||
|
//
|
||||||
|
// On macOS (Darwin), this returns the birth time (Birthtimespec) from the
|
||||||
|
// underlying syscall.Stat_t. macOS HFS+ and APFS filesystems natively track
|
||||||
|
// file creation time, making this a true "created at" timestamp.
|
||||||
|
//
|
||||||
|
// Falls back to modification time if the underlying Sys() data is not a
|
||||||
|
// *syscall.Stat_t (e.g. when using in-memory filesystems for testing).
|
||||||
|
func getCTime(info os.FileInfo) time.Time {
|
||||||
|
stat, ok := info.Sys().(*syscall.Stat_t)
|
||||||
|
if !ok {
|
||||||
|
return info.ModTime()
|
||||||
|
}
|
||||||
|
return time.Unix(stat.Birthtimespec.Sec, stat.Birthtimespec.Nsec).UTC()
|
||||||
|
}
|
||||||
29
internal/snapshot/ctime_linux.go
Normal file
29
internal/snapshot/ctime_linux.go
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
package snapshot
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// getCTime extracts the inode change time (ctime) from os.FileInfo.
|
||||||
|
//
|
||||||
|
// On Linux, this returns the inode change time (Ctim) from the underlying
|
||||||
|
// syscall.Stat_t. Linux ctime is updated whenever file metadata (permissions,
|
||||||
|
// ownership, link count) or content changes. It is NOT the file creation
|
||||||
|
// (birth) time.
|
||||||
|
//
|
||||||
|
// Note: Linux ext4 (kernel 4.11+) and btrfs do track birth time via the
|
||||||
|
// statx() syscall, but this is not exposed through Go's os.FileInfo.Sys().
|
||||||
|
// The inode change time is the best available approximation through standard
|
||||||
|
// Go APIs.
|
||||||
|
//
|
||||||
|
// Falls back to modification time if the underlying Sys() data is not a
|
||||||
|
// *syscall.Stat_t (e.g. when using in-memory filesystems for testing).
|
||||||
|
func getCTime(info os.FileInfo) time.Time {
|
||||||
|
stat, ok := info.Sys().(*syscall.Stat_t)
|
||||||
|
if !ok {
|
||||||
|
return info.ModTime()
|
||||||
|
}
|
||||||
|
return time.Unix(stat.Ctim.Sec, stat.Ctim.Nsec).UTC()
|
||||||
|
}
|
||||||
15
internal/snapshot/ctime_other.go
Normal file
15
internal/snapshot/ctime_other.go
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
//go:build !darwin && !linux
|
||||||
|
|
||||||
|
package snapshot
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// getCTime returns the file's modification time as a fallback on unsupported
|
||||||
|
// platforms. See ctime_darwin.go and ctime_linux.go for platform-specific
|
||||||
|
// implementations that extract actual ctime/birth time from syscall data.
|
||||||
|
func getCTime(info os.FileInfo) time.Time {
|
||||||
|
return info.ModTime()
|
||||||
|
}
|
||||||
@@ -728,7 +728,7 @@ func (s *Scanner) checkFileInMemory(path string, info os.FileInfo, knownFiles ma
|
|||||||
Path: types.FilePath(path),
|
Path: types.FilePath(path),
|
||||||
SourcePath: types.SourcePath(s.currentSourcePath), // Store source directory for restore path stripping
|
SourcePath: types.SourcePath(s.currentSourcePath), // Store source directory for restore path stripping
|
||||||
MTime: info.ModTime(),
|
MTime: info.ModTime(),
|
||||||
CTime: info.ModTime(), // afero doesn't provide ctime
|
CTime: getCTime(info),
|
||||||
Size: info.Size(),
|
Size: info.Size(),
|
||||||
Mode: uint32(info.Mode()),
|
Mode: uint32(info.Mode()),
|
||||||
UID: uid,
|
UID: uid,
|
||||||
|
|||||||
@@ -22,6 +22,13 @@ import (
|
|||||||
"golang.org/x/term"
|
"golang.org/x/term"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// progressBarWidth is the character width of the progress bar display.
|
||||||
|
progressBarWidth = 40
|
||||||
|
// progressBarThrottle is the minimum interval between progress bar redraws.
|
||||||
|
progressBarThrottle = 100 * time.Millisecond
|
||||||
|
)
|
||||||
|
|
||||||
// RestoreOptions contains options for the restore operation
|
// RestoreOptions contains options for the restore operation
|
||||||
type RestoreOptions struct {
|
type RestoreOptions struct {
|
||||||
SnapshotID string
|
SnapshotID string
|
||||||
@@ -115,6 +122,15 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {
|
|||||||
}
|
}
|
||||||
defer func() { _ = blobCache.Close() }()
|
defer func() { _ = blobCache.Close() }()
|
||||||
|
|
||||||
|
// Calculate total bytes for progress bar
|
||||||
|
var totalBytesExpected int64
|
||||||
|
for _, file := range files {
|
||||||
|
totalBytesExpected += file.Size
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create progress bar if output is a terminal
|
||||||
|
bar := v.newProgressBar("Restoring", totalBytesExpected)
|
||||||
|
|
||||||
for i, file := range files {
|
for i, file := range files {
|
||||||
if v.ctx.Err() != nil {
|
if v.ctx.Err() != nil {
|
||||||
return v.ctx.Err()
|
return v.ctx.Err()
|
||||||
@@ -122,11 +138,21 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {
|
|||||||
|
|
||||||
if err := v.restoreFile(v.ctx, repos, file, opts.TargetDir, identity, chunkToBlobMap, blobCache, result); err != nil {
|
if err := v.restoreFile(v.ctx, repos, file, opts.TargetDir, identity, chunkToBlobMap, blobCache, result); err != nil {
|
||||||
log.Error("Failed to restore file", "path", file.Path, "error", err)
|
log.Error("Failed to restore file", "path", file.Path, "error", err)
|
||||||
// Continue with other files
|
result.FilesFailed++
|
||||||
|
result.FailedFiles = append(result.FailedFiles, file.Path.String())
|
||||||
|
// Update progress bar even on failure
|
||||||
|
if bar != nil {
|
||||||
|
_ = bar.Add64(file.Size)
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// Progress logging
|
// Update progress bar
|
||||||
|
if bar != nil {
|
||||||
|
_ = bar.Add64(file.Size)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Progress logging (for non-terminal or structured logs)
|
||||||
if (i+1)%100 == 0 || i+1 == len(files) {
|
if (i+1)%100 == 0 || i+1 == len(files) {
|
||||||
log.Info("Restore progress",
|
log.Info("Restore progress",
|
||||||
"files", fmt.Sprintf("%d/%d", i+1, len(files)),
|
"files", fmt.Sprintf("%d/%d", i+1, len(files)),
|
||||||
@@ -135,6 +161,10 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if bar != nil {
|
||||||
|
_ = bar.Finish()
|
||||||
|
}
|
||||||
|
|
||||||
result.Duration = time.Since(startTime)
|
result.Duration = time.Since(startTime)
|
||||||
|
|
||||||
log.Info("Restore complete",
|
log.Info("Restore complete",
|
||||||
@@ -151,6 +181,13 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {
|
|||||||
result.Duration.Round(time.Second),
|
result.Duration.Round(time.Second),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if result.FilesFailed > 0 {
|
||||||
|
_, _ = fmt.Fprintf(v.Stdout, "\nWARNING: %d file(s) failed to restore:\n", result.FilesFailed)
|
||||||
|
for _, path := range result.FailedFiles {
|
||||||
|
_, _ = fmt.Fprintf(v.Stdout, " - %s\n", path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Run verification if requested
|
// Run verification if requested
|
||||||
if opts.Verify {
|
if opts.Verify {
|
||||||
if err := v.verifyRestoredFiles(v.ctx, repos, files, opts.TargetDir, result); err != nil {
|
if err := v.verifyRestoredFiles(v.ctx, repos, files, opts.TargetDir, result); err != nil {
|
||||||
@@ -171,6 +208,10 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if result.FilesFailed > 0 {
|
||||||
|
return fmt.Errorf("%d file(s) failed to restore", result.FilesFailed)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -523,22 +564,7 @@ func (v *Vaultik) verifyRestoredFiles(
|
|||||||
)
|
)
|
||||||
|
|
||||||
// Create progress bar if output is a terminal
|
// Create progress bar if output is a terminal
|
||||||
var bar *progressbar.ProgressBar
|
bar := v.newProgressBar("Verifying", totalBytes)
|
||||||
if isTerminal() {
|
|
||||||
bar = progressbar.NewOptions64(
|
|
||||||
totalBytes,
|
|
||||||
progressbar.OptionSetDescription("Verifying"),
|
|
||||||
progressbar.OptionSetWriter(v.Stderr),
|
|
||||||
progressbar.OptionShowBytes(true),
|
|
||||||
progressbar.OptionShowCount(),
|
|
||||||
progressbar.OptionSetWidth(40),
|
|
||||||
progressbar.OptionThrottle(100*time.Millisecond),
|
|
||||||
progressbar.OptionOnCompletion(func() {
|
|
||||||
v.printfStderr("\n")
|
|
||||||
}),
|
|
||||||
progressbar.OptionSetRenderBlankState(true),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verify each file
|
// Verify each file
|
||||||
for _, file := range regularFiles {
|
for _, file := range regularFiles {
|
||||||
@@ -632,7 +658,37 @@ func (v *Vaultik) verifyFile(
|
|||||||
return bytesVerified, nil
|
return bytesVerified, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// isTerminal returns true if stdout is a terminal
|
// newProgressBar creates a terminal-aware progress bar with standard options.
|
||||||
func isTerminal() bool {
|
// It returns nil if stdout is not a terminal.
|
||||||
return term.IsTerminal(int(os.Stdout.Fd()))
|
func (v *Vaultik) newProgressBar(description string, total int64) *progressbar.ProgressBar {
|
||||||
|
if !v.isTerminal() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return progressbar.NewOptions64(
|
||||||
|
total,
|
||||||
|
progressbar.OptionSetDescription(description),
|
||||||
|
progressbar.OptionSetWriter(v.Stderr),
|
||||||
|
progressbar.OptionShowBytes(true),
|
||||||
|
progressbar.OptionShowCount(),
|
||||||
|
progressbar.OptionSetWidth(progressBarWidth),
|
||||||
|
progressbar.OptionThrottle(progressBarThrottle),
|
||||||
|
progressbar.OptionOnCompletion(func() {
|
||||||
|
v.printfStderr("\n")
|
||||||
|
}),
|
||||||
|
progressbar.OptionSetRenderBlankState(true),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// isTerminal returns true if stdout is a terminal.
|
||||||
|
// It checks whether v.Stdout implements Fd() (i.e. is an *os.File),
|
||||||
|
// and falls back to false for non-file writers (e.g. in tests).
|
||||||
|
func (v *Vaultik) isTerminal() bool {
|
||||||
|
type fder interface {
|
||||||
|
Fd() uintptr
|
||||||
|
}
|
||||||
|
f, ok := v.Stdout.(fder)
|
||||||
|
if !ok {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return term.IsTerminal(int(f.Fd()))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -90,6 +90,24 @@ func (v *Vaultik) CreateSnapshot(opts *SnapshotCreateOptions) error {
|
|||||||
v.printfStdout("\nAll %d snapshots completed in %s\n", len(snapshotNames), time.Since(overallStartTime).Round(time.Second))
|
v.printfStdout("\nAll %d snapshots completed in %s\n", len(snapshotNames), time.Since(overallStartTime).Round(time.Second))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Prune old snapshots and unreferenced blobs if --prune was specified
|
||||||
|
if opts.Prune {
|
||||||
|
log.Info("Pruning enabled - deleting old snapshots and unreferenced blobs")
|
||||||
|
v.printlnStdout("\nPruning old snapshots (keeping latest)...")
|
||||||
|
|
||||||
|
if err := v.PurgeSnapshots(true, "", true); err != nil {
|
||||||
|
return fmt.Errorf("prune: purging old snapshots: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
v.printlnStdout("Pruning unreferenced blobs...")
|
||||||
|
|
||||||
|
if err := v.PruneBlobs(&PruneOptions{Force: true}); err != nil {
|
||||||
|
return fmt.Errorf("prune: removing unreferenced blobs: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Info("Pruning complete")
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -306,11 +324,6 @@ func (v *Vaultik) createNamedSnapshot(opts *SnapshotCreateOptions, hostname, sna
|
|||||||
}
|
}
|
||||||
v.printfStdout("Duration: %s\n", formatDuration(snapshotDuration))
|
v.printfStdout("Duration: %s\n", formatDuration(snapshotDuration))
|
||||||
|
|
||||||
if opts.Prune {
|
|
||||||
log.Info("Pruning enabled - will delete old snapshots after snapshot")
|
|
||||||
// TODO: Implement pruning
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1004,16 +1017,16 @@ func (v *Vaultik) deleteSnapshotFromLocalDB(snapshotID string) error {
|
|||||||
|
|
||||||
// Delete related records first to avoid foreign key constraints
|
// Delete related records first to avoid foreign key constraints
|
||||||
if err := v.Repositories.Snapshots.DeleteSnapshotFiles(v.ctx, snapshotID); err != nil {
|
if err := v.Repositories.Snapshots.DeleteSnapshotFiles(v.ctx, snapshotID); err != nil {
|
||||||
log.Error("Failed to delete snapshot files", "snapshot_id", snapshotID, "error", err)
|
return fmt.Errorf("deleting snapshot files for %s: %w", snapshotID, err)
|
||||||
}
|
}
|
||||||
if err := v.Repositories.Snapshots.DeleteSnapshotBlobs(v.ctx, snapshotID); err != nil {
|
if err := v.Repositories.Snapshots.DeleteSnapshotBlobs(v.ctx, snapshotID); err != nil {
|
||||||
log.Error("Failed to delete snapshot blobs", "snapshot_id", snapshotID, "error", err)
|
return fmt.Errorf("deleting snapshot blobs for %s: %w", snapshotID, err)
|
||||||
}
|
}
|
||||||
if err := v.Repositories.Snapshots.DeleteSnapshotUploads(v.ctx, snapshotID); err != nil {
|
if err := v.Repositories.Snapshots.DeleteSnapshotUploads(v.ctx, snapshotID); err != nil {
|
||||||
log.Error("Failed to delete snapshot uploads", "snapshot_id", snapshotID, "error", err)
|
return fmt.Errorf("deleting snapshot uploads for %s: %w", snapshotID, err)
|
||||||
}
|
}
|
||||||
if err := v.Repositories.Snapshots.Delete(v.ctx, snapshotID); err != nil {
|
if err := v.Repositories.Snapshots.Delete(v.ctx, snapshotID); err != nil {
|
||||||
log.Error("Failed to delete snapshot record", "snapshot_id", snapshotID, "error", err)
|
return fmt.Errorf("deleting snapshot record %s: %w", snapshotID, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
23
internal/vaultik/snapshot_prune_test.go
Normal file
23
internal/vaultik/snapshot_prune_test.go
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
package vaultik
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestSnapshotCreateOptions_PruneFlag verifies the Prune field exists on
|
||||||
|
// SnapshotCreateOptions and can be set.
|
||||||
|
func TestSnapshotCreateOptions_PruneFlag(t *testing.T) {
|
||||||
|
opts := &SnapshotCreateOptions{
|
||||||
|
Prune: true,
|
||||||
|
}
|
||||||
|
if !opts.Prune {
|
||||||
|
t.Error("Expected Prune to be true")
|
||||||
|
}
|
||||||
|
|
||||||
|
opts2 := &SnapshotCreateOptions{
|
||||||
|
Prune: false,
|
||||||
|
}
|
||||||
|
if opts2.Prune {
|
||||||
|
t.Error("Expected Prune to be false")
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user