Compare commits
13 Commits
380442604b
...
ed5d777d05
| Author | SHA1 | Date | |
|---|---|---|---|
| ed5d777d05 | |||
| 70d4fe2aa0 | |||
|
|
2f249e3ddd | ||
|
|
3f834f1c9c | ||
|
|
9879668c31 | ||
|
|
0a0d9f33b0 | ||
| df0e8c275b | |||
|
|
d77ac18aaa | ||
| 825f25da58 | |||
| 162d76bb38 | |||
|
|
bfd7334221 | ||
|
|
9b32bf0846 | ||
|
|
4d9f912a5f |
@ -1,15 +1,12 @@
|
|||||||
package vaultik
|
package vaultik
|
||||||
|
|
||||||
// TODO: These are stub implementations for methods referenced but not yet
|
|
||||||
// implemented. They allow the package to compile for testing.
|
|
||||||
// Remove once the real implementations land.
|
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
"filippo.io/age"
|
"filippo.io/age"
|
||||||
|
"git.eeqj.de/sneak/vaultik/internal/blobgen"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FetchAndDecryptBlobResult holds the result of fetching and decrypting a blob.
|
// FetchAndDecryptBlobResult holds the result of fetching and decrypting a blob.
|
||||||
@ -19,10 +16,40 @@ type FetchAndDecryptBlobResult struct {
|
|||||||
|
|
||||||
// FetchAndDecryptBlob downloads a blob, decrypts it, and returns the plaintext data.
|
// FetchAndDecryptBlob downloads a blob, decrypts it, and returns the plaintext data.
|
||||||
func (v *Vaultik) FetchAndDecryptBlob(ctx context.Context, blobHash string, expectedSize int64, identity age.Identity) (*FetchAndDecryptBlobResult, error) {
|
func (v *Vaultik) FetchAndDecryptBlob(ctx context.Context, blobHash string, expectedSize int64, identity age.Identity) (*FetchAndDecryptBlobResult, error) {
|
||||||
return nil, fmt.Errorf("FetchAndDecryptBlob not yet implemented")
|
rc, _, err := v.FetchBlob(ctx, blobHash, expectedSize)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer func() { _ = rc.Close() }()
|
||||||
|
|
||||||
|
reader, err := blobgen.NewReader(rc, identity)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("creating blob reader: %w", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = reader.Close() }()
|
||||||
|
|
||||||
|
data, err := io.ReadAll(reader)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("reading blob data: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &FetchAndDecryptBlobResult{Data: data}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// FetchBlob downloads a blob and returns a reader for the encrypted data.
|
// FetchBlob downloads a blob and returns a reader for the encrypted data.
|
||||||
func (v *Vaultik) FetchBlob(ctx context.Context, blobHash string, expectedSize int64) (io.ReadCloser, int64, error) {
|
func (v *Vaultik) FetchBlob(ctx context.Context, blobHash string, expectedSize int64) (io.ReadCloser, int64, error) {
|
||||||
return nil, 0, fmt.Errorf("FetchBlob not yet implemented")
|
blobPath := fmt.Sprintf("blobs/%s/%s/%s", blobHash[:2], blobHash[2:4], blobHash)
|
||||||
|
|
||||||
|
rc, err := v.Storage.Get(ctx, blobPath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, 0, fmt.Errorf("downloading blob %s: %w", blobHash[:16], err)
|
||||||
|
}
|
||||||
|
|
||||||
|
info, err := v.Storage.Stat(ctx, blobPath)
|
||||||
|
if err != nil {
|
||||||
|
_ = rc.Close()
|
||||||
|
return nil, 0, fmt.Errorf("stat blob %s: %w", blobHash[:16], err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return rc, info.Size, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,7 +7,6 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
// blobDiskCacheEntry tracks a cached blob on disk.
|
// blobDiskCacheEntry tracks a cached blob on disk.
|
||||||
type blobDiskCacheEntry struct {
|
type blobDiskCacheEntry struct {
|
||||||
key string
|
key string
|
||||||
@ -165,7 +164,7 @@ func (c *blobDiskCache) ReadAt(key string, offset, length int64) ([]byte, error)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer f.Close()
|
defer func() { _ = f.Close() }()
|
||||||
|
|
||||||
buf := make([]byte, length)
|
buf := make([]byte, length)
|
||||||
if _, err := f.ReadAt(buf, offset); err != nil {
|
if _, err := f.ReadAt(buf, offset); err != nil {
|
||||||
|
|||||||
@ -12,7 +12,7 @@ func TestBlobDiskCache_BasicGetPut(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer cache.Close()
|
defer func() { _ = cache.Close() }()
|
||||||
|
|
||||||
data := []byte("hello world")
|
data := []byte("hello world")
|
||||||
if err := cache.Put("key1", data); err != nil {
|
if err := cache.Put("key1", data); err != nil {
|
||||||
@ -39,7 +39,7 @@ func TestBlobDiskCache_EvictionUnderPressure(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer cache.Close()
|
defer func() { _ = cache.Close() }()
|
||||||
|
|
||||||
for i := 0; i < 5; i++ {
|
for i := 0; i < 5; i++ {
|
||||||
data := make([]byte, 300)
|
data := make([]byte, 300)
|
||||||
@ -65,7 +65,7 @@ func TestBlobDiskCache_OversizedEntryRejected(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer cache.Close()
|
defer func() { _ = cache.Close() }()
|
||||||
|
|
||||||
data := make([]byte, 200)
|
data := make([]byte, 200)
|
||||||
if err := cache.Put("big", data); err != nil {
|
if err := cache.Put("big", data); err != nil {
|
||||||
@ -82,7 +82,7 @@ func TestBlobDiskCache_UpdateInPlace(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer cache.Close()
|
defer func() { _ = cache.Close() }()
|
||||||
|
|
||||||
if err := cache.Put("key1", []byte("v1")); err != nil {
|
if err := cache.Put("key1", []byte("v1")); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
@ -111,7 +111,7 @@ func TestBlobDiskCache_ReadAt(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer cache.Close()
|
defer func() { _ = cache.Close() }()
|
||||||
|
|
||||||
data := make([]byte, 1024)
|
data := make([]byte, 1024)
|
||||||
if _, err := rand.Read(data); err != nil {
|
if _, err := rand.Read(data); err != nil {
|
||||||
@ -159,7 +159,7 @@ func TestBlobDiskCache_LRUOrder(t *testing.T) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer cache.Close()
|
defer func() { _ = cache.Close() }()
|
||||||
|
|
||||||
d := make([]byte, 100)
|
d := make([]byte, 100)
|
||||||
if err := cache.Put("a", d); err != nil {
|
if err := cache.Put("a", d); err != nil {
|
||||||
|
|||||||
@ -15,99 +15,99 @@ import (
|
|||||||
// ShowInfo displays system and configuration information
|
// ShowInfo displays system and configuration information
|
||||||
func (v *Vaultik) ShowInfo() error {
|
func (v *Vaultik) ShowInfo() error {
|
||||||
// System Information
|
// System Information
|
||||||
fmt.Printf("=== System Information ===\n")
|
v.printfStdout("=== System Information ===\n")
|
||||||
fmt.Printf("OS/Architecture: %s/%s\n", runtime.GOOS, runtime.GOARCH)
|
v.printfStdout("OS/Architecture: %s/%s\n", runtime.GOOS, runtime.GOARCH)
|
||||||
fmt.Printf("Version: %s\n", v.Globals.Version)
|
v.printfStdout("Version: %s\n", v.Globals.Version)
|
||||||
fmt.Printf("Commit: %s\n", v.Globals.Commit)
|
v.printfStdout("Commit: %s\n", v.Globals.Commit)
|
||||||
fmt.Printf("Go Version: %s\n", runtime.Version())
|
v.printfStdout("Go Version: %s\n", runtime.Version())
|
||||||
fmt.Println()
|
v.printlnStdout()
|
||||||
|
|
||||||
// Storage Configuration
|
// Storage Configuration
|
||||||
fmt.Printf("=== Storage Configuration ===\n")
|
v.printfStdout("=== Storage Configuration ===\n")
|
||||||
fmt.Printf("S3 Bucket: %s\n", v.Config.S3.Bucket)
|
v.printfStdout("S3 Bucket: %s\n", v.Config.S3.Bucket)
|
||||||
if v.Config.S3.Prefix != "" {
|
if v.Config.S3.Prefix != "" {
|
||||||
fmt.Printf("S3 Prefix: %s\n", v.Config.S3.Prefix)
|
v.printfStdout("S3 Prefix: %s\n", v.Config.S3.Prefix)
|
||||||
}
|
}
|
||||||
fmt.Printf("S3 Endpoint: %s\n", v.Config.S3.Endpoint)
|
v.printfStdout("S3 Endpoint: %s\n", v.Config.S3.Endpoint)
|
||||||
fmt.Printf("S3 Region: %s\n", v.Config.S3.Region)
|
v.printfStdout("S3 Region: %s\n", v.Config.S3.Region)
|
||||||
fmt.Println()
|
v.printlnStdout()
|
||||||
|
|
||||||
// Backup Settings
|
// Backup Settings
|
||||||
fmt.Printf("=== Backup Settings ===\n")
|
v.printfStdout("=== Backup Settings ===\n")
|
||||||
|
|
||||||
// Show configured snapshots
|
// Show configured snapshots
|
||||||
fmt.Printf("Snapshots:\n")
|
v.printfStdout("Snapshots:\n")
|
||||||
for _, name := range v.Config.SnapshotNames() {
|
for _, name := range v.Config.SnapshotNames() {
|
||||||
snap := v.Config.Snapshots[name]
|
snap := v.Config.Snapshots[name]
|
||||||
fmt.Printf(" %s:\n", name)
|
v.printfStdout(" %s:\n", name)
|
||||||
for _, path := range snap.Paths {
|
for _, path := range snap.Paths {
|
||||||
fmt.Printf(" - %s\n", path)
|
v.printfStdout(" - %s\n", path)
|
||||||
}
|
}
|
||||||
if len(snap.Exclude) > 0 {
|
if len(snap.Exclude) > 0 {
|
||||||
fmt.Printf(" exclude: %s\n", strings.Join(snap.Exclude, ", "))
|
v.printfStdout(" exclude: %s\n", strings.Join(snap.Exclude, ", "))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Global exclude patterns
|
// Global exclude patterns
|
||||||
if len(v.Config.Exclude) > 0 {
|
if len(v.Config.Exclude) > 0 {
|
||||||
fmt.Printf("Global Exclude: %s\n", strings.Join(v.Config.Exclude, ", "))
|
v.printfStdout("Global Exclude: %s\n", strings.Join(v.Config.Exclude, ", "))
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("Compression: zstd level %d\n", v.Config.CompressionLevel)
|
v.printfStdout("Compression: zstd level %d\n", v.Config.CompressionLevel)
|
||||||
fmt.Printf("Chunk Size: %s\n", humanize.Bytes(uint64(v.Config.ChunkSize)))
|
v.printfStdout("Chunk Size: %s\n", humanize.Bytes(uint64(v.Config.ChunkSize)))
|
||||||
fmt.Printf("Blob Size Limit: %s\n", humanize.Bytes(uint64(v.Config.BlobSizeLimit)))
|
v.printfStdout("Blob Size Limit: %s\n", humanize.Bytes(uint64(v.Config.BlobSizeLimit)))
|
||||||
fmt.Println()
|
v.printlnStdout()
|
||||||
|
|
||||||
// Encryption Configuration
|
// Encryption Configuration
|
||||||
fmt.Printf("=== Encryption Configuration ===\n")
|
v.printfStdout("=== Encryption Configuration ===\n")
|
||||||
fmt.Printf("Recipients:\n")
|
v.printfStdout("Recipients:\n")
|
||||||
for _, recipient := range v.Config.AgeRecipients {
|
for _, recipient := range v.Config.AgeRecipients {
|
||||||
fmt.Printf(" - %s\n", recipient)
|
v.printfStdout(" - %s\n", recipient)
|
||||||
}
|
}
|
||||||
fmt.Println()
|
v.printlnStdout()
|
||||||
|
|
||||||
// Daemon Settings (if applicable)
|
// Daemon Settings (if applicable)
|
||||||
if v.Config.BackupInterval > 0 || v.Config.MinTimeBetweenRun > 0 {
|
if v.Config.BackupInterval > 0 || v.Config.MinTimeBetweenRun > 0 {
|
||||||
fmt.Printf("=== Daemon Settings ===\n")
|
v.printfStdout("=== Daemon Settings ===\n")
|
||||||
if v.Config.BackupInterval > 0 {
|
if v.Config.BackupInterval > 0 {
|
||||||
fmt.Printf("Backup Interval: %s\n", v.Config.BackupInterval)
|
v.printfStdout("Backup Interval: %s\n", v.Config.BackupInterval)
|
||||||
}
|
}
|
||||||
if v.Config.MinTimeBetweenRun > 0 {
|
if v.Config.MinTimeBetweenRun > 0 {
|
||||||
fmt.Printf("Minimum Time: %s\n", v.Config.MinTimeBetweenRun)
|
v.printfStdout("Minimum Time: %s\n", v.Config.MinTimeBetweenRun)
|
||||||
}
|
}
|
||||||
fmt.Println()
|
v.printlnStdout()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Local Database
|
// Local Database
|
||||||
fmt.Printf("=== Local Database ===\n")
|
v.printfStdout("=== Local Database ===\n")
|
||||||
fmt.Printf("Index Path: %s\n", v.Config.IndexPath)
|
v.printfStdout("Index Path: %s\n", v.Config.IndexPath)
|
||||||
|
|
||||||
// Check if index file exists and get its size
|
// Check if index file exists and get its size
|
||||||
if info, err := v.Fs.Stat(v.Config.IndexPath); err == nil {
|
if info, err := v.Fs.Stat(v.Config.IndexPath); err == nil {
|
||||||
fmt.Printf("Index Size: %s\n", humanize.Bytes(uint64(info.Size())))
|
v.printfStdout("Index Size: %s\n", humanize.Bytes(uint64(info.Size())))
|
||||||
|
|
||||||
// Get snapshot count from database
|
// Get snapshot count from database
|
||||||
query := `SELECT COUNT(*) FROM snapshots WHERE completed_at IS NOT NULL`
|
query := `SELECT COUNT(*) FROM snapshots WHERE completed_at IS NOT NULL`
|
||||||
var snapshotCount int
|
var snapshotCount int
|
||||||
if err := v.DB.Conn().QueryRowContext(v.ctx, query).Scan(&snapshotCount); err == nil {
|
if err := v.DB.Conn().QueryRowContext(v.ctx, query).Scan(&snapshotCount); err == nil {
|
||||||
fmt.Printf("Snapshots: %d\n", snapshotCount)
|
v.printfStdout("Snapshots: %d\n", snapshotCount)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get blob count from database
|
// Get blob count from database
|
||||||
query = `SELECT COUNT(*) FROM blobs`
|
query = `SELECT COUNT(*) FROM blobs`
|
||||||
var blobCount int
|
var blobCount int
|
||||||
if err := v.DB.Conn().QueryRowContext(v.ctx, query).Scan(&blobCount); err == nil {
|
if err := v.DB.Conn().QueryRowContext(v.ctx, query).Scan(&blobCount); err == nil {
|
||||||
fmt.Printf("Blobs: %d\n", blobCount)
|
v.printfStdout("Blobs: %d\n", blobCount)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get file count from database
|
// Get file count from database
|
||||||
query = `SELECT COUNT(*) FROM files`
|
query = `SELECT COUNT(*) FROM files`
|
||||||
var fileCount int
|
var fileCount int
|
||||||
if err := v.DB.Conn().QueryRowContext(v.ctx, query).Scan(&fileCount); err == nil {
|
if err := v.DB.Conn().QueryRowContext(v.ctx, query).Scan(&fileCount); err == nil {
|
||||||
fmt.Printf("Files: %d\n", fileCount)
|
v.printfStdout("Files: %d\n", fileCount)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
fmt.Printf("Index Size: (not created)\n")
|
v.printfStdout("Index Size: (not created)\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@ -157,15 +157,15 @@ func (v *Vaultik) RemoteInfo(jsonOutput bool) error {
|
|||||||
result.StorageLocation = storageInfo.Location
|
result.StorageLocation = storageInfo.Location
|
||||||
|
|
||||||
if !jsonOutput {
|
if !jsonOutput {
|
||||||
fmt.Printf("=== Remote Storage ===\n")
|
v.printfStdout("=== Remote Storage ===\n")
|
||||||
fmt.Printf("Type: %s\n", storageInfo.Type)
|
v.printfStdout("Type: %s\n", storageInfo.Type)
|
||||||
fmt.Printf("Location: %s\n", storageInfo.Location)
|
v.printfStdout("Location: %s\n", storageInfo.Location)
|
||||||
fmt.Println()
|
v.printlnStdout()
|
||||||
}
|
}
|
||||||
|
|
||||||
// List all snapshot metadata
|
// List all snapshot metadata
|
||||||
if !jsonOutput {
|
if !jsonOutput {
|
||||||
fmt.Printf("Scanning snapshot metadata...\n")
|
v.printfStdout("Scanning snapshot metadata...\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
snapshotMetadata := make(map[string]*SnapshotMetadataInfo)
|
snapshotMetadata := make(map[string]*SnapshotMetadataInfo)
|
||||||
@ -210,7 +210,7 @@ func (v *Vaultik) RemoteInfo(jsonOutput bool) error {
|
|||||||
|
|
||||||
// Download and parse all manifests to get referenced blobs
|
// Download and parse all manifests to get referenced blobs
|
||||||
if !jsonOutput {
|
if !jsonOutput {
|
||||||
fmt.Printf("Downloading %d manifest(s)...\n", len(snapshotIDs))
|
v.printfStdout("Downloading %d manifest(s)...\n", len(snapshotIDs))
|
||||||
}
|
}
|
||||||
|
|
||||||
referencedBlobs := make(map[string]int64) // hash -> compressed size
|
referencedBlobs := make(map[string]int64) // hash -> compressed size
|
||||||
@ -260,7 +260,7 @@ func (v *Vaultik) RemoteInfo(jsonOutput bool) error {
|
|||||||
|
|
||||||
// List all blobs on remote
|
// List all blobs on remote
|
||||||
if !jsonOutput {
|
if !jsonOutput {
|
||||||
fmt.Printf("Scanning blobs...\n")
|
v.printfStdout("Scanning blobs...\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
allBlobs := make(map[string]int64) // hash -> size from storage
|
allBlobs := make(map[string]int64) // hash -> size from storage
|
||||||
@ -298,14 +298,14 @@ func (v *Vaultik) RemoteInfo(jsonOutput bool) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Human-readable output
|
// Human-readable output
|
||||||
fmt.Printf("\n=== Snapshot Metadata ===\n")
|
v.printfStdout("\n=== Snapshot Metadata ===\n")
|
||||||
if len(result.Snapshots) == 0 {
|
if len(result.Snapshots) == 0 {
|
||||||
fmt.Printf("No snapshots found\n")
|
v.printfStdout("No snapshots found\n")
|
||||||
} else {
|
} else {
|
||||||
fmt.Printf("%-45s %12s %12s %12s %10s %12s\n", "SNAPSHOT", "MANIFEST", "DATABASE", "TOTAL", "BLOBS", "BLOB SIZE")
|
v.printfStdout("%-45s %12s %12s %12s %10s %12s\n", "SNAPSHOT", "MANIFEST", "DATABASE", "TOTAL", "BLOBS", "BLOB SIZE")
|
||||||
fmt.Printf("%-45s %12s %12s %12s %10s %12s\n", strings.Repeat("-", 45), strings.Repeat("-", 12), strings.Repeat("-", 12), strings.Repeat("-", 12), strings.Repeat("-", 10), strings.Repeat("-", 12))
|
v.printfStdout("%-45s %12s %12s %12s %10s %12s\n", strings.Repeat("-", 45), strings.Repeat("-", 12), strings.Repeat("-", 12), strings.Repeat("-", 12), strings.Repeat("-", 10), strings.Repeat("-", 12))
|
||||||
for _, info := range result.Snapshots {
|
for _, info := range result.Snapshots {
|
||||||
fmt.Printf("%-45s %12s %12s %12s %10s %12s\n",
|
v.printfStdout("%-45s %12s %12s %12s %10s %12s\n",
|
||||||
truncateString(info.SnapshotID, 45),
|
truncateString(info.SnapshotID, 45),
|
||||||
humanize.Bytes(uint64(info.ManifestSize)),
|
humanize.Bytes(uint64(info.ManifestSize)),
|
||||||
humanize.Bytes(uint64(info.DatabaseSize)),
|
humanize.Bytes(uint64(info.DatabaseSize)),
|
||||||
@ -314,23 +314,23 @@ func (v *Vaultik) RemoteInfo(jsonOutput bool) error {
|
|||||||
humanize.Bytes(uint64(info.BlobsSize)),
|
humanize.Bytes(uint64(info.BlobsSize)),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
fmt.Printf("%-45s %12s %12s %12s %10s %12s\n", strings.Repeat("-", 45), strings.Repeat("-", 12), strings.Repeat("-", 12), strings.Repeat("-", 12), strings.Repeat("-", 10), strings.Repeat("-", 12))
|
v.printfStdout("%-45s %12s %12s %12s %10s %12s\n", strings.Repeat("-", 45), strings.Repeat("-", 12), strings.Repeat("-", 12), strings.Repeat("-", 12), strings.Repeat("-", 10), strings.Repeat("-", 12))
|
||||||
fmt.Printf("%-45s %12s %12s %12s\n", fmt.Sprintf("Total (%d snapshots)", result.TotalMetadataCount), "", "", humanize.Bytes(uint64(result.TotalMetadataSize)))
|
v.printfStdout("%-45s %12s %12s %12s\n", fmt.Sprintf("Total (%d snapshots)", result.TotalMetadataCount), "", "", humanize.Bytes(uint64(result.TotalMetadataSize)))
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("\n=== Blob Storage ===\n")
|
v.printfStdout("\n=== Blob Storage ===\n")
|
||||||
fmt.Printf("Total blobs on remote: %s (%s)\n",
|
v.printfStdout("Total blobs on remote: %s (%s)\n",
|
||||||
humanize.Comma(int64(result.TotalBlobCount)),
|
humanize.Comma(int64(result.TotalBlobCount)),
|
||||||
humanize.Bytes(uint64(result.TotalBlobSize)))
|
humanize.Bytes(uint64(result.TotalBlobSize)))
|
||||||
fmt.Printf("Referenced by snapshots: %s (%s)\n",
|
v.printfStdout("Referenced by snapshots: %s (%s)\n",
|
||||||
humanize.Comma(int64(result.ReferencedBlobCount)),
|
humanize.Comma(int64(result.ReferencedBlobCount)),
|
||||||
humanize.Bytes(uint64(result.ReferencedBlobSize)))
|
humanize.Bytes(uint64(result.ReferencedBlobSize)))
|
||||||
fmt.Printf("Orphaned (unreferenced): %s (%s)\n",
|
v.printfStdout("Orphaned (unreferenced): %s (%s)\n",
|
||||||
humanize.Comma(int64(result.OrphanedBlobCount)),
|
humanize.Comma(int64(result.OrphanedBlobCount)),
|
||||||
humanize.Bytes(uint64(result.OrphanedBlobSize)))
|
humanize.Bytes(uint64(result.OrphanedBlobSize)))
|
||||||
|
|
||||||
if result.OrphanedBlobCount > 0 {
|
if result.OrphanedBlobCount > 0 {
|
||||||
fmt.Printf("\nRun 'vaultik prune --remote' to remove orphaned blobs.\n")
|
v.printfStdout("\nRun 'vaultik prune --remote' to remove orphaned blobs.\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@ -3,7 +3,6 @@ package vaultik
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.eeqj.de/sneak/vaultik/internal/log"
|
"git.eeqj.de/sneak/vaultik/internal/log"
|
||||||
@ -121,29 +120,29 @@ func (v *Vaultik) PruneBlobs(opts *PruneOptions) error {
|
|||||||
if len(unreferencedBlobs) == 0 {
|
if len(unreferencedBlobs) == 0 {
|
||||||
log.Info("No unreferenced blobs found")
|
log.Info("No unreferenced blobs found")
|
||||||
if opts.JSON {
|
if opts.JSON {
|
||||||
return outputPruneBlobsJSON(result)
|
return v.outputPruneBlobsJSON(result)
|
||||||
}
|
}
|
||||||
fmt.Println("No unreferenced blobs to remove.")
|
v.printlnStdout("No unreferenced blobs to remove.")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show what will be deleted
|
// Show what will be deleted
|
||||||
log.Info("Found unreferenced blobs", "count", len(unreferencedBlobs), "total_size", humanize.Bytes(uint64(totalSize)))
|
log.Info("Found unreferenced blobs", "count", len(unreferencedBlobs), "total_size", humanize.Bytes(uint64(totalSize)))
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
fmt.Printf("Found %d unreferenced blob(s) totaling %s\n", len(unreferencedBlobs), humanize.Bytes(uint64(totalSize)))
|
v.printfStdout("Found %d unreferenced blob(s) totaling %s\n", len(unreferencedBlobs), humanize.Bytes(uint64(totalSize)))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Confirm unless --force is used (skip in JSON mode - require --force)
|
// Confirm unless --force is used (skip in JSON mode - require --force)
|
||||||
if !opts.Force && !opts.JSON {
|
if !opts.Force && !opts.JSON {
|
||||||
fmt.Printf("\nDelete %d unreferenced blob(s)? [y/N] ", len(unreferencedBlobs))
|
v.printfStdout("\nDelete %d unreferenced blob(s)? [y/N] ", len(unreferencedBlobs))
|
||||||
var confirm string
|
var confirm string
|
||||||
if _, err := fmt.Scanln(&confirm); err != nil {
|
if _, err := v.scanStdin(&confirm); err != nil {
|
||||||
// Treat EOF or error as "no"
|
// Treat EOF or error as "no"
|
||||||
fmt.Println("Cancelled")
|
v.printlnStdout("Cancelled")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if strings.ToLower(confirm) != "y" {
|
if strings.ToLower(confirm) != "y" {
|
||||||
fmt.Println("Cancelled")
|
v.printlnStdout("Cancelled")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -185,20 +184,20 @@ func (v *Vaultik) PruneBlobs(opts *PruneOptions) error {
|
|||||||
)
|
)
|
||||||
|
|
||||||
if opts.JSON {
|
if opts.JSON {
|
||||||
return outputPruneBlobsJSON(result)
|
return v.outputPruneBlobsJSON(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("\nDeleted %d blob(s) totaling %s\n", deletedCount, humanize.Bytes(uint64(deletedSize)))
|
v.printfStdout("\nDeleted %d blob(s) totaling %s\n", deletedCount, humanize.Bytes(uint64(deletedSize)))
|
||||||
if deletedCount < len(unreferencedBlobs) {
|
if deletedCount < len(unreferencedBlobs) {
|
||||||
fmt.Printf("Failed to delete %d blob(s)\n", len(unreferencedBlobs)-deletedCount)
|
v.printfStdout("Failed to delete %d blob(s)\n", len(unreferencedBlobs)-deletedCount)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// outputPruneBlobsJSON outputs the prune result as JSON
|
// outputPruneBlobsJSON outputs the prune result as JSON
|
||||||
func outputPruneBlobsJSON(result *PruneBlobsResult) error {
|
func (v *Vaultik) outputPruneBlobsJSON(result *PruneBlobsResult) error {
|
||||||
encoder := json.NewEncoder(os.Stdout)
|
encoder := json.NewEncoder(v.Stdout)
|
||||||
encoder.SetIndent("", " ")
|
encoder.SetIndent("", " ")
|
||||||
return encoder.Encode(result)
|
return encoder.Encode(result)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -113,7 +113,7 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("creating blob cache: %w", err)
|
return fmt.Errorf("creating blob cache: %w", err)
|
||||||
}
|
}
|
||||||
defer blobCache.Close()
|
defer func() { _ = blobCache.Close() }()
|
||||||
|
|
||||||
for i, file := range files {
|
for i, file := range files {
|
||||||
if v.ctx.Err() != nil {
|
if v.ctx.Err() != nil {
|
||||||
@ -427,7 +427,9 @@ func (v *Vaultik) restoreRegularFile(
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("downloading blob %s: %w", blobHashStr[:16], err)
|
return fmt.Errorf("downloading blob %s: %w", blobHashStr[:16], err)
|
||||||
}
|
}
|
||||||
if putErr := blobCache.Put(blobHashStr, blobData); putErr != nil { log.Debug("Failed to cache blob on disk", "hash", blobHashStr[:16], "error", putErr) }
|
if putErr := blobCache.Put(blobHashStr, blobData); putErr != nil {
|
||||||
|
log.Debug("Failed to cache blob on disk", "hash", blobHashStr[:16], "error", putErr)
|
||||||
|
}
|
||||||
result.BlobsDownloaded++
|
result.BlobsDownloaded++
|
||||||
result.BytesDownloaded += blob.CompressedSize
|
result.BytesDownloaded += blob.CompressedSize
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"regexp"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
"text/tabwriter"
|
"text/tabwriter"
|
||||||
@ -86,7 +87,7 @@ func (v *Vaultik) CreateSnapshot(opts *SnapshotCreateOptions) error {
|
|||||||
|
|
||||||
// Print overall summary if multiple snapshots
|
// Print overall summary if multiple snapshots
|
||||||
if len(snapshotNames) > 1 {
|
if len(snapshotNames) > 1 {
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "\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))
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@ -99,7 +100,7 @@ func (v *Vaultik) createNamedSnapshot(opts *SnapshotCreateOptions, hostname, sna
|
|||||||
snapConfig := v.Config.Snapshots[snapName]
|
snapConfig := v.Config.Snapshots[snapName]
|
||||||
|
|
||||||
if total > 1 {
|
if total > 1 {
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "\n=== Snapshot %d/%d: %s ===\n", idx, total, snapName)
|
v.printfStdout("\n=== Snapshot %d/%d: %s ===\n", idx, total, snapName)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Resolve source directories to absolute paths
|
// Resolve source directories to absolute paths
|
||||||
@ -152,7 +153,7 @@ func (v *Vaultik) createNamedSnapshot(opts *SnapshotCreateOptions, hostname, sna
|
|||||||
return fmt.Errorf("creating snapshot: %w", err)
|
return fmt.Errorf("creating snapshot: %w", err)
|
||||||
}
|
}
|
||||||
log.Info("Beginning snapshot", "snapshot_id", snapshotID, "name", snapName)
|
log.Info("Beginning snapshot", "snapshot_id", snapshotID, "name", snapName)
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Beginning snapshot: %s\n", snapshotID)
|
v.printfStdout("Beginning snapshot: %s\n", snapshotID)
|
||||||
|
|
||||||
for i, dir := range resolvedDirs {
|
for i, dir := range resolvedDirs {
|
||||||
// Check if context is cancelled
|
// Check if context is cancelled
|
||||||
@ -164,7 +165,7 @@ func (v *Vaultik) createNamedSnapshot(opts *SnapshotCreateOptions, hostname, sna
|
|||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Scanning directory", "path", dir)
|
log.Info("Scanning directory", "path", dir)
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Beginning directory scan (%d/%d): %s\n", i+1, len(resolvedDirs), dir)
|
v.printfStdout("Beginning directory scan (%d/%d): %s\n", i+1, len(resolvedDirs), dir)
|
||||||
result, err := scanner.Scan(v.ctx, dir, snapshotID)
|
result, err := scanner.Scan(v.ctx, dir, snapshotID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to scan %s: %w", dir, err)
|
return fmt.Errorf("failed to scan %s: %w", dir, err)
|
||||||
@ -275,35 +276,35 @@ func (v *Vaultik) createNamedSnapshot(opts *SnapshotCreateOptions, hostname, sna
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Print comprehensive summary
|
// Print comprehensive summary
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "=== Snapshot Complete ===\n")
|
v.printfStdout("=== Snapshot Complete ===\n")
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "ID: %s\n", snapshotID)
|
v.printfStdout("ID: %s\n", snapshotID)
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Files: %s examined, %s to process, %s unchanged",
|
v.printfStdout("Files: %s examined, %s to process, %s unchanged",
|
||||||
formatNumber(totalFiles),
|
formatNumber(totalFiles),
|
||||||
formatNumber(totalFilesChanged),
|
formatNumber(totalFilesChanged),
|
||||||
formatNumber(totalFilesSkipped))
|
formatNumber(totalFilesSkipped))
|
||||||
if totalFilesDeleted > 0 {
|
if totalFilesDeleted > 0 {
|
||||||
_, _ = fmt.Fprintf(v.Stdout, ", %s deleted", formatNumber(totalFilesDeleted))
|
v.printfStdout(", %s deleted", formatNumber(totalFilesDeleted))
|
||||||
}
|
}
|
||||||
_, _ = fmt.Fprintln(v.Stdout)
|
v.printlnStdout()
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Data: %s total (%s to process)",
|
v.printfStdout("Data: %s total (%s to process)",
|
||||||
humanize.Bytes(uint64(totalBytesAll)),
|
humanize.Bytes(uint64(totalBytesAll)),
|
||||||
humanize.Bytes(uint64(totalBytesChanged)))
|
humanize.Bytes(uint64(totalBytesChanged)))
|
||||||
if totalBytesDeleted > 0 {
|
if totalBytesDeleted > 0 {
|
||||||
_, _ = fmt.Fprintf(v.Stdout, ", %s deleted", humanize.Bytes(uint64(totalBytesDeleted)))
|
v.printfStdout(", %s deleted", humanize.Bytes(uint64(totalBytesDeleted)))
|
||||||
}
|
}
|
||||||
_, _ = fmt.Fprintln(v.Stdout)
|
v.printlnStdout()
|
||||||
if totalBlobsUploaded > 0 {
|
if totalBlobsUploaded > 0 {
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Storage: %s compressed from %s (%.2fx)\n",
|
v.printfStdout("Storage: %s compressed from %s (%.2fx)\n",
|
||||||
humanize.Bytes(uint64(totalBlobSizeCompressed)),
|
humanize.Bytes(uint64(totalBlobSizeCompressed)),
|
||||||
humanize.Bytes(uint64(totalBlobSizeUncompressed)),
|
humanize.Bytes(uint64(totalBlobSizeUncompressed)),
|
||||||
compressionRatio)
|
compressionRatio)
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Upload: %d blobs, %s in %s (%s)\n",
|
v.printfStdout("Upload: %d blobs, %s in %s (%s)\n",
|
||||||
totalBlobsUploaded,
|
totalBlobsUploaded,
|
||||||
humanize.Bytes(uint64(totalBytesUploaded)),
|
humanize.Bytes(uint64(totalBytesUploaded)),
|
||||||
formatDuration(uploadDuration),
|
formatDuration(uploadDuration),
|
||||||
avgUploadSpeed)
|
avgUploadSpeed)
|
||||||
}
|
}
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Duration: %s\n", formatDuration(snapshotDuration))
|
v.printfStdout("Duration: %s\n", formatDuration(snapshotDuration))
|
||||||
|
|
||||||
if opts.Prune {
|
if opts.Prune {
|
||||||
log.Info("Pruning enabled - will delete old snapshots after snapshot")
|
log.Info("Pruning enabled - will delete old snapshots after snapshot")
|
||||||
@ -422,13 +423,13 @@ func (v *Vaultik) ListSnapshots(jsonOutput bool) error {
|
|||||||
|
|
||||||
if jsonOutput {
|
if jsonOutput {
|
||||||
// JSON output
|
// JSON output
|
||||||
encoder := json.NewEncoder(os.Stdout)
|
encoder := json.NewEncoder(v.Stdout)
|
||||||
encoder.SetIndent("", " ")
|
encoder.SetIndent("", " ")
|
||||||
return encoder.Encode(snapshots)
|
return encoder.Encode(snapshots)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Table output
|
// Table output
|
||||||
w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
|
w := tabwriter.NewWriter(v.Stdout, 0, 0, 3, ' ', 0)
|
||||||
|
|
||||||
// Show configured snapshots from config file
|
// Show configured snapshots from config file
|
||||||
if _, err := fmt.Fprintln(w, "CONFIGURED SNAPSHOTS:"); err != nil {
|
if _, err := fmt.Fprintln(w, "CONFIGURED SNAPSHOTS:"); err != nil {
|
||||||
@ -527,14 +528,14 @@ func (v *Vaultik) PurgeSnapshots(keepLatest bool, olderThan string, force bool)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(toDelete) == 0 {
|
if len(toDelete) == 0 {
|
||||||
fmt.Println("No snapshots to delete")
|
v.printlnStdout("No snapshots to delete")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show what will be deleted
|
// Show what will be deleted
|
||||||
fmt.Printf("The following snapshots will be deleted:\n\n")
|
v.printfStdout("The following snapshots will be deleted:\n\n")
|
||||||
for _, snap := range toDelete {
|
for _, snap := range toDelete {
|
||||||
fmt.Printf(" %s (%s, %s)\n",
|
v.printfStdout(" %s (%s, %s)\n",
|
||||||
snap.ID,
|
snap.ID,
|
||||||
snap.Timestamp.Format("2006-01-02 15:04:05"),
|
snap.Timestamp.Format("2006-01-02 15:04:05"),
|
||||||
formatBytes(snap.CompressedSize))
|
formatBytes(snap.CompressedSize))
|
||||||
@ -542,19 +543,19 @@ func (v *Vaultik) PurgeSnapshots(keepLatest bool, olderThan string, force bool)
|
|||||||
|
|
||||||
// Confirm unless --force is used
|
// Confirm unless --force is used
|
||||||
if !force {
|
if !force {
|
||||||
fmt.Printf("\nDelete %d snapshot(s)? [y/N] ", len(toDelete))
|
v.printfStdout("\nDelete %d snapshot(s)? [y/N] ", len(toDelete))
|
||||||
var confirm string
|
var confirm string
|
||||||
if _, err := fmt.Scanln(&confirm); err != nil {
|
if _, err := v.scanStdin(&confirm); err != nil {
|
||||||
// Treat EOF or error as "no"
|
// Treat EOF or error as "no"
|
||||||
fmt.Println("Cancelled")
|
v.printlnStdout("Cancelled")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if strings.ToLower(confirm) != "y" {
|
if strings.ToLower(confirm) != "y" {
|
||||||
fmt.Println("Cancelled")
|
v.printlnStdout("Cancelled")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
fmt.Printf("\nDeleting %d snapshot(s) (--force specified)\n", len(toDelete))
|
v.printfStdout("\nDeleting %d snapshot(s) (--force specified)\n", len(toDelete))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete snapshots (both local and remote)
|
// Delete snapshots (both local and remote)
|
||||||
@ -569,10 +570,10 @@ func (v *Vaultik) PurgeSnapshots(keepLatest bool, olderThan string, force bool)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("Deleted %d snapshot(s)\n", len(toDelete))
|
v.printfStdout("Deleted %d snapshot(s)\n", len(toDelete))
|
||||||
|
|
||||||
// Note: Run 'vaultik prune' separately to clean up unreferenced blobs
|
// Note: Run 'vaultik prune' separately to clean up unreferenced blobs
|
||||||
fmt.Println("\nNote: Run 'vaultik prune' to clean up unreferenced blobs.")
|
v.printlnStdout("\nNote: Run 'vaultik prune' to clean up unreferenced blobs.")
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -613,11 +614,11 @@ func (v *Vaultik) VerifySnapshotWithOptions(snapshotID string, opts *VerifyOptio
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
fmt.Printf("Verifying snapshot %s\n", snapshotID)
|
v.printfStdout("Verifying snapshot %s\n", snapshotID)
|
||||||
if !snapshotTime.IsZero() {
|
if !snapshotTime.IsZero() {
|
||||||
fmt.Printf("Snapshot time: %s\n", snapshotTime.Format("2006-01-02 15:04:05 MST"))
|
v.printfStdout("Snapshot time: %s\n", snapshotTime.Format("2006-01-02 15:04:05 MST"))
|
||||||
}
|
}
|
||||||
fmt.Println()
|
v.printlnStdout()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Download and parse manifest
|
// Download and parse manifest
|
||||||
@ -635,18 +636,18 @@ func (v *Vaultik) VerifySnapshotWithOptions(snapshotID string, opts *VerifyOptio
|
|||||||
result.TotalSize = manifest.TotalCompressedSize
|
result.TotalSize = manifest.TotalCompressedSize
|
||||||
|
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
fmt.Printf("Snapshot information:\n")
|
v.printfStdout("Snapshot information:\n")
|
||||||
fmt.Printf(" Blob count: %d\n", manifest.BlobCount)
|
v.printfStdout(" Blob count: %d\n", manifest.BlobCount)
|
||||||
fmt.Printf(" Total size: %s\n", humanize.Bytes(uint64(manifest.TotalCompressedSize)))
|
v.printfStdout(" Total size: %s\n", humanize.Bytes(uint64(manifest.TotalCompressedSize)))
|
||||||
if manifest.Timestamp != "" {
|
if manifest.Timestamp != "" {
|
||||||
if t, err := time.Parse(time.RFC3339, manifest.Timestamp); err == nil {
|
if t, err := time.Parse(time.RFC3339, manifest.Timestamp); err == nil {
|
||||||
fmt.Printf(" Created: %s\n", t.Format("2006-01-02 15:04:05 MST"))
|
v.printfStdout(" Created: %s\n", t.Format("2006-01-02 15:04:05 MST"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fmt.Println()
|
v.printlnStdout()
|
||||||
|
|
||||||
// Check each blob exists
|
// Check each blob exists
|
||||||
fmt.Printf("Checking blob existence...\n")
|
v.printfStdout("Checking blob existence...\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
missing := 0
|
missing := 0
|
||||||
@ -660,7 +661,7 @@ func (v *Vaultik) VerifySnapshotWithOptions(snapshotID string, opts *VerifyOptio
|
|||||||
_, err := v.Storage.Stat(v.ctx, blobPath)
|
_, err := v.Storage.Stat(v.ctx, blobPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
fmt.Printf(" Missing: %s (%s)\n", blob.Hash, humanize.Bytes(uint64(blob.CompressedSize)))
|
v.printfStdout(" Missing: %s (%s)\n", blob.Hash, humanize.Bytes(uint64(blob.CompressedSize)))
|
||||||
}
|
}
|
||||||
missing++
|
missing++
|
||||||
missingSize += blob.CompressedSize
|
missingSize += blob.CompressedSize
|
||||||
@ -683,20 +684,20 @@ func (v *Vaultik) VerifySnapshotWithOptions(snapshotID string, opts *VerifyOptio
|
|||||||
return v.outputVerifyJSON(result)
|
return v.outputVerifyJSON(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("\nVerification complete:\n")
|
v.printfStdout("\nVerification complete:\n")
|
||||||
fmt.Printf(" Verified: %d blobs (%s)\n", verified,
|
v.printfStdout(" Verified: %d blobs (%s)\n", verified,
|
||||||
humanize.Bytes(uint64(manifest.TotalCompressedSize-missingSize)))
|
humanize.Bytes(uint64(manifest.TotalCompressedSize-missingSize)))
|
||||||
if missing > 0 {
|
if missing > 0 {
|
||||||
fmt.Printf(" Missing: %d blobs (%s)\n", missing, humanize.Bytes(uint64(missingSize)))
|
v.printfStdout(" Missing: %d blobs (%s)\n", missing, humanize.Bytes(uint64(missingSize)))
|
||||||
} else {
|
} else {
|
||||||
fmt.Printf(" Missing: 0 blobs\n")
|
v.printfStdout(" Missing: 0 blobs\n")
|
||||||
}
|
}
|
||||||
fmt.Printf(" Status: ")
|
v.printfStdout(" Status: ")
|
||||||
if missing > 0 {
|
if missing > 0 {
|
||||||
fmt.Printf("FAILED - %d blobs are missing\n", missing)
|
v.printfStdout("FAILED - %d blobs are missing\n", missing)
|
||||||
return fmt.Errorf("%d blobs are missing", missing)
|
return fmt.Errorf("%d blobs are missing", missing)
|
||||||
} else {
|
} else {
|
||||||
fmt.Printf("OK - All blobs verified\n")
|
v.printfStdout("OK - All blobs verified\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@ -704,7 +705,7 @@ func (v *Vaultik) VerifySnapshotWithOptions(snapshotID string, opts *VerifyOptio
|
|||||||
|
|
||||||
// outputVerifyJSON outputs the verification result as JSON
|
// outputVerifyJSON outputs the verification result as JSON
|
||||||
func (v *Vaultik) outputVerifyJSON(result *VerifyResult) error {
|
func (v *Vaultik) outputVerifyJSON(result *VerifyResult) error {
|
||||||
encoder := json.NewEncoder(os.Stdout)
|
encoder := json.NewEncoder(v.Stdout)
|
||||||
encoder.SetIndent("", " ")
|
encoder.SetIndent("", " ")
|
||||||
if err := encoder.Encode(result); err != nil {
|
if err := encoder.Encode(result); err != nil {
|
||||||
return fmt.Errorf("encoding JSON: %w", err)
|
return fmt.Errorf("encoding JSON: %w", err)
|
||||||
@ -830,11 +831,11 @@ func (v *Vaultik) RemoveSnapshot(snapshotID string, opts *RemoveOptions) (*Remov
|
|||||||
if opts.DryRun {
|
if opts.DryRun {
|
||||||
result.DryRun = true
|
result.DryRun = true
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Would remove snapshot: %s\n", snapshotID)
|
v.printfStdout("Would remove snapshot: %s\n", snapshotID)
|
||||||
if opts.Remote {
|
if opts.Remote {
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "Would also remove from remote storage")
|
v.printlnStdout("Would also remove from remote storage")
|
||||||
}
|
}
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "[Dry run - no changes made]")
|
v.printlnStdout("[Dry run - no changes made]")
|
||||||
}
|
}
|
||||||
if opts.JSON {
|
if opts.JSON {
|
||||||
return result, v.outputRemoveJSON(result)
|
return result, v.outputRemoveJSON(result)
|
||||||
@ -845,17 +846,17 @@ func (v *Vaultik) RemoveSnapshot(snapshotID string, opts *RemoveOptions) (*Remov
|
|||||||
// Confirm unless --force is used (skip in JSON mode - require --force)
|
// Confirm unless --force is used (skip in JSON mode - require --force)
|
||||||
if !opts.Force && !opts.JSON {
|
if !opts.Force && !opts.JSON {
|
||||||
if opts.Remote {
|
if opts.Remote {
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Remove snapshot '%s' from local database and remote storage? [y/N] ", snapshotID)
|
v.printfStdout("Remove snapshot '%s' from local database and remote storage? [y/N] ", snapshotID)
|
||||||
} else {
|
} else {
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Remove snapshot '%s' from local database? [y/N] ", snapshotID)
|
v.printfStdout("Remove snapshot '%s' from local database? [y/N] ", snapshotID)
|
||||||
}
|
}
|
||||||
var confirm string
|
var confirm string
|
||||||
if _, err := fmt.Fscanln(v.Stdin, &confirm); err != nil {
|
if _, err := v.scanStdin(&confirm); err != nil {
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "Cancelled")
|
v.printlnStdout("Cancelled")
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
if strings.ToLower(confirm) != "y" {
|
if strings.ToLower(confirm) != "y" {
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "Cancelled")
|
v.printlnStdout("Cancelled")
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -882,10 +883,10 @@ func (v *Vaultik) RemoveSnapshot(snapshotID string, opts *RemoveOptions) (*Remov
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Print summary
|
// Print summary
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Removed snapshot '%s' from local database\n", snapshotID)
|
v.printfStdout("Removed snapshot '%s' from local database\n", snapshotID)
|
||||||
if opts.Remote {
|
if opts.Remote {
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "Removed snapshot metadata from remote storage")
|
v.printlnStdout("Removed snapshot metadata from remote storage")
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "\nNote: Blobs were not removed. Run 'vaultik prune' to remove orphaned blobs.")
|
v.printlnStdout("\nNote: Blobs were not removed. Run 'vaultik prune' to remove orphaned blobs.")
|
||||||
}
|
}
|
||||||
|
|
||||||
return result, nil
|
return result, nil
|
||||||
@ -929,7 +930,7 @@ func (v *Vaultik) RemoveAllSnapshots(opts *RemoveOptions) (*RemoveResult, error)
|
|||||||
|
|
||||||
if len(snapshotIDs) == 0 {
|
if len(snapshotIDs) == 0 {
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "No snapshots found")
|
v.printlnStdout("No snapshots found")
|
||||||
}
|
}
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
@ -938,14 +939,14 @@ func (v *Vaultik) RemoveAllSnapshots(opts *RemoveOptions) (*RemoveResult, error)
|
|||||||
result.DryRun = true
|
result.DryRun = true
|
||||||
result.SnapshotsRemoved = snapshotIDs
|
result.SnapshotsRemoved = snapshotIDs
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Would remove %d snapshot(s):\n", len(snapshotIDs))
|
v.printfStdout("Would remove %d snapshot(s):\n", len(snapshotIDs))
|
||||||
for _, id := range snapshotIDs {
|
for _, id := range snapshotIDs {
|
||||||
_, _ = fmt.Fprintf(v.Stdout, " %s\n", id)
|
v.printfStdout(" %s\n", id)
|
||||||
}
|
}
|
||||||
if opts.Remote {
|
if opts.Remote {
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "Would also remove from remote storage")
|
v.printlnStdout("Would also remove from remote storage")
|
||||||
}
|
}
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "[Dry run - no changes made]")
|
v.printlnStdout("[Dry run - no changes made]")
|
||||||
}
|
}
|
||||||
if opts.JSON {
|
if opts.JSON {
|
||||||
return result, v.outputRemoveJSON(result)
|
return result, v.outputRemoveJSON(result)
|
||||||
@ -986,10 +987,10 @@ func (v *Vaultik) RemoveAllSnapshots(opts *RemoveOptions) (*RemoveResult, error)
|
|||||||
return result, v.outputRemoveJSON(result)
|
return result, v.outputRemoveJSON(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Removed %d snapshot(s)\n", len(result.SnapshotsRemoved))
|
v.printfStdout("Removed %d snapshot(s)\n", len(result.SnapshotsRemoved))
|
||||||
if opts.Remote {
|
if opts.Remote {
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "Removed snapshot metadata from remote storage")
|
v.printlnStdout("Removed snapshot metadata from remote storage")
|
||||||
_, _ = fmt.Fprintln(v.Stdout, "\nNote: Blobs were not removed. Run 'vaultik prune' to remove orphaned blobs.")
|
v.printlnStdout("\nNote: Blobs were not removed. Run 'vaultik prune' to remove orphaned blobs.")
|
||||||
}
|
}
|
||||||
|
|
||||||
return result, nil
|
return result, nil
|
||||||
@ -1043,7 +1044,7 @@ func (v *Vaultik) deleteSnapshotFromRemote(snapshotID string) error {
|
|||||||
|
|
||||||
// outputRemoveJSON outputs the removal result as JSON
|
// outputRemoveJSON outputs the removal result as JSON
|
||||||
func (v *Vaultik) outputRemoveJSON(result *RemoveResult) error {
|
func (v *Vaultik) outputRemoveJSON(result *RemoveResult) error {
|
||||||
encoder := json.NewEncoder(os.Stdout)
|
encoder := json.NewEncoder(v.Stdout)
|
||||||
encoder.SetIndent("", " ")
|
encoder.SetIndent("", " ")
|
||||||
return encoder.Encode(result)
|
return encoder.Encode(result)
|
||||||
}
|
}
|
||||||
@ -1117,21 +1118,29 @@ func (v *Vaultik) PruneDatabase() (*PruneResult, error) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
// Print summary
|
// Print summary
|
||||||
_, _ = fmt.Fprintf(v.Stdout, "Local database prune complete:\n")
|
v.printfStdout("Local database prune complete:\n")
|
||||||
_, _ = fmt.Fprintf(v.Stdout, " Incomplete snapshots removed: %d\n", result.SnapshotsDeleted)
|
v.printfStdout(" Incomplete snapshots removed: %d\n", result.SnapshotsDeleted)
|
||||||
_, _ = fmt.Fprintf(v.Stdout, " Orphaned files removed: %d\n", result.FilesDeleted)
|
v.printfStdout(" Orphaned files removed: %d\n", result.FilesDeleted)
|
||||||
_, _ = fmt.Fprintf(v.Stdout, " Orphaned chunks removed: %d\n", result.ChunksDeleted)
|
v.printfStdout(" Orphaned chunks removed: %d\n", result.ChunksDeleted)
|
||||||
_, _ = fmt.Fprintf(v.Stdout, " Orphaned blobs removed: %d\n", result.BlobsDeleted)
|
v.printfStdout(" Orphaned blobs removed: %d\n", result.BlobsDeleted)
|
||||||
|
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// getTableCount returns the count of rows in a table
|
// validTableNameRe matches table names containing only lowercase alphanumeric characters and underscores.
|
||||||
|
var validTableNameRe = regexp.MustCompile(`^[a-z0-9_]+$`)
|
||||||
|
|
||||||
|
// getTableCount returns the count of rows in a table.
|
||||||
|
// The tableName is sanitized to only allow [a-z0-9_] characters to prevent SQL injection.
|
||||||
func (v *Vaultik) getTableCount(tableName string) (int64, error) {
|
func (v *Vaultik) getTableCount(tableName string) (int64, error) {
|
||||||
if v.DB == nil {
|
if v.DB == nil {
|
||||||
return 0, nil
|
return 0, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !validTableNameRe.MatchString(tableName) {
|
||||||
|
return 0, fmt.Errorf("invalid table name: %q", tableName)
|
||||||
|
}
|
||||||
|
|
||||||
var count int64
|
var count int64
|
||||||
query := fmt.Sprintf("SELECT COUNT(*) FROM %s", tableName)
|
query := fmt.Sprintf("SELECT COUNT(*) FROM %s", tableName)
|
||||||
err := v.DB.Conn().QueryRowContext(v.ctx, query).Scan(&count)
|
err := v.DB.Conn().QueryRowContext(v.ctx, query).Scan(&count)
|
||||||
|
|||||||
@ -129,12 +129,26 @@ func (v *Vaultik) GetFilesystem() afero.Fs {
|
|||||||
return v.Fs
|
return v.Fs
|
||||||
}
|
}
|
||||||
|
|
||||||
// Outputf writes formatted output to stdout for user-facing messages.
|
// printfStdout writes formatted output to stdout.
|
||||||
// This should be used for all non-log user output.
|
func (v *Vaultik) printfStdout(format string, args ...any) {
|
||||||
func (v *Vaultik) Outputf(format string, args ...any) {
|
|
||||||
_, _ = fmt.Fprintf(v.Stdout, format, args...)
|
_, _ = fmt.Fprintf(v.Stdout, format, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// printlnStdout writes a line to stdout.
|
||||||
|
func (v *Vaultik) printlnStdout(args ...any) {
|
||||||
|
_, _ = fmt.Fprintln(v.Stdout, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// printfStderr writes formatted output to stderr.
|
||||||
|
func (v *Vaultik) printfStderr(format string, args ...any) {
|
||||||
|
_, _ = fmt.Fprintf(v.Stderr, format, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// scanStdin reads a line of input from stdin.
|
||||||
|
func (v *Vaultik) scanStdin(a ...any) (int, error) {
|
||||||
|
return fmt.Fscanln(v.Stdin, a...)
|
||||||
|
}
|
||||||
|
|
||||||
// TestVaultik wraps a Vaultik with captured stdout/stderr for testing
|
// TestVaultik wraps a Vaultik with captured stdout/stderr for testing
|
||||||
type TestVaultik struct {
|
type TestVaultik struct {
|
||||||
*Vaultik
|
*Vaultik
|
||||||
|
|||||||
@ -58,14 +58,14 @@ func (v *Vaultik) RunDeepVerify(snapshotID string, opts *VerifyOptions) error {
|
|||||||
)
|
)
|
||||||
|
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
v.Outputf("Deep verification of snapshot: %s\n\n", snapshotID)
|
v.printfStdout("Deep verification of snapshot: %s\n\n", snapshotID)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Step 1: Download manifest
|
// Step 1: Download manifest
|
||||||
manifestPath := fmt.Sprintf("metadata/%s/manifest.json.zst", snapshotID)
|
manifestPath := fmt.Sprintf("metadata/%s/manifest.json.zst", snapshotID)
|
||||||
log.Info("Downloading manifest", "path", manifestPath)
|
log.Info("Downloading manifest", "path", manifestPath)
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
v.Outputf("Downloading manifest...\n")
|
v.printfStdout("Downloading manifest...\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
manifestReader, err := v.Storage.Get(v.ctx, manifestPath)
|
manifestReader, err := v.Storage.Get(v.ctx, manifestPath)
|
||||||
@ -95,14 +95,14 @@ func (v *Vaultik) RunDeepVerify(snapshotID string, opts *VerifyOptions) error {
|
|||||||
"manifest_total_size", humanize.Bytes(uint64(manifest.TotalCompressedSize)),
|
"manifest_total_size", humanize.Bytes(uint64(manifest.TotalCompressedSize)),
|
||||||
)
|
)
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
v.Outputf("Manifest loaded: %d blobs (%s)\n", manifest.BlobCount, humanize.Bytes(uint64(manifest.TotalCompressedSize)))
|
v.printfStdout("Manifest loaded: %d blobs (%s)\n", manifest.BlobCount, humanize.Bytes(uint64(manifest.TotalCompressedSize)))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Step 2: Download and decrypt database (authoritative source)
|
// Step 2: Download and decrypt database (authoritative source)
|
||||||
dbPath := fmt.Sprintf("metadata/%s/db.zst.age", snapshotID)
|
dbPath := fmt.Sprintf("metadata/%s/db.zst.age", snapshotID)
|
||||||
log.Info("Downloading encrypted database", "path", dbPath)
|
log.Info("Downloading encrypted database", "path", dbPath)
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
v.Outputf("Downloading and decrypting database...\n")
|
v.printfStdout("Downloading and decrypting database...\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
dbReader, err := v.Storage.Get(v.ctx, dbPath)
|
dbReader, err := v.Storage.Get(v.ctx, dbPath)
|
||||||
@ -155,8 +155,8 @@ func (v *Vaultik) RunDeepVerify(snapshotID string, opts *VerifyOptions) error {
|
|||||||
"db_total_size", humanize.Bytes(uint64(totalSize)),
|
"db_total_size", humanize.Bytes(uint64(totalSize)),
|
||||||
)
|
)
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
v.Outputf("Database loaded: %d blobs (%s)\n", len(dbBlobs), humanize.Bytes(uint64(totalSize)))
|
v.printfStdout("Database loaded: %d blobs (%s)\n", len(dbBlobs), humanize.Bytes(uint64(totalSize)))
|
||||||
v.Outputf("Verifying manifest against database...\n")
|
v.printfStdout("Verifying manifest against database...\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Step 4: Verify manifest matches database
|
// Step 4: Verify manifest matches database
|
||||||
@ -171,8 +171,8 @@ func (v *Vaultik) RunDeepVerify(snapshotID string, opts *VerifyOptions) error {
|
|||||||
|
|
||||||
// Step 5: Verify all blobs exist in S3 (using database as source)
|
// Step 5: Verify all blobs exist in S3 (using database as source)
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
v.Outputf("Manifest verified.\n")
|
v.printfStdout("Manifest verified.\n")
|
||||||
v.Outputf("Checking blob existence in remote storage...\n")
|
v.printfStdout("Checking blob existence in remote storage...\n")
|
||||||
}
|
}
|
||||||
if err := v.verifyBlobExistenceFromDB(dbBlobs); err != nil {
|
if err := v.verifyBlobExistenceFromDB(dbBlobs); err != nil {
|
||||||
result.Status = "failed"
|
result.Status = "failed"
|
||||||
@ -185,8 +185,8 @@ func (v *Vaultik) RunDeepVerify(snapshotID string, opts *VerifyOptions) error {
|
|||||||
|
|
||||||
// Step 6: Deep verification - download and verify blob contents
|
// Step 6: Deep verification - download and verify blob contents
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
v.Outputf("All blobs exist.\n")
|
v.printfStdout("All blobs exist.\n")
|
||||||
v.Outputf("Downloading and verifying blob contents (%d blobs, %s)...\n", len(dbBlobs), humanize.Bytes(uint64(totalSize)))
|
v.printfStdout("Downloading and verifying blob contents (%d blobs, %s)...\n", len(dbBlobs), humanize.Bytes(uint64(totalSize)))
|
||||||
}
|
}
|
||||||
if err := v.performDeepVerificationFromDB(dbBlobs, tempDB.DB, opts); err != nil {
|
if err := v.performDeepVerificationFromDB(dbBlobs, tempDB.DB, opts); err != nil {
|
||||||
result.Status = "failed"
|
result.Status = "failed"
|
||||||
@ -211,10 +211,10 @@ func (v *Vaultik) RunDeepVerify(snapshotID string, opts *VerifyOptions) error {
|
|||||||
"blobs_verified", len(dbBlobs),
|
"blobs_verified", len(dbBlobs),
|
||||||
)
|
)
|
||||||
|
|
||||||
v.Outputf("\n✓ Verification completed successfully\n")
|
v.printfStdout("\n✓ Verification completed successfully\n")
|
||||||
v.Outputf(" Snapshot: %s\n", snapshotID)
|
v.printfStdout(" Snapshot: %s\n", snapshotID)
|
||||||
v.Outputf(" Blobs verified: %d\n", len(dbBlobs))
|
v.printfStdout(" Blobs verified: %d\n", len(dbBlobs))
|
||||||
v.Outputf(" Total size: %s\n", humanize.Bytes(uint64(totalSize)))
|
v.printfStdout(" Total size: %s\n", humanize.Bytes(uint64(totalSize)))
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -569,7 +569,7 @@ func (v *Vaultik) performDeepVerificationFromDB(blobs []snapshot.BlobInfo, db *s
|
|||||||
)
|
)
|
||||||
|
|
||||||
if !opts.JSON {
|
if !opts.JSON {
|
||||||
v.Outputf(" Verified %d/%d blobs (%d remaining) - %s/%s - elapsed %s, eta %s\n",
|
v.printfStdout(" Verified %d/%d blobs (%d remaining) - %s/%s - elapsed %s, eta %s\n",
|
||||||
i+1, len(blobs), remaining,
|
i+1, len(blobs), remaining,
|
||||||
humanize.Bytes(uint64(bytesProcessed)),
|
humanize.Bytes(uint64(bytesProcessed)),
|
||||||
humanize.Bytes(uint64(totalBytesExpected)),
|
humanize.Bytes(uint64(totalBytesExpected)),
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user