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>
145 lines
4.4 KiB
Go
145 lines
4.4 KiB
Go
package cli
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/adrg/xdg"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
// errConfigNotFound is wrapped by all config-resolution failures.
|
|
var errConfigNotFound = errors.New("config file not found")
|
|
|
|
// RootFlags holds global flags that apply to all commands.
|
|
// These flags are defined on the root command and inherited by all subcommands.
|
|
type RootFlags struct {
|
|
ConfigPath string
|
|
Verbose bool
|
|
Debug bool
|
|
Quiet bool
|
|
SkipErrors bool
|
|
}
|
|
|
|
//nolint:gochecknoglobals // cobra persistent flags bind to package state
|
|
var rootFlags RootFlags
|
|
|
|
// NewRootCommand creates the root cobra command for the vaultik CLI.
|
|
// It sets up the command structure, global flags, and adds all subcommands.
|
|
// This is the main entry point for the CLI command hierarchy.
|
|
func NewRootCommand() *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "vaultik",
|
|
Short: "Secure incremental backup tool with asymmetric encryption",
|
|
Long: `vaultik is a secure incremental backup tool that encrypts data using age
|
|
public keys and uploads to S3-compatible storage. No private keys are needed
|
|
on the source system.`,
|
|
SilenceUsage: true,
|
|
// Bare 'vaultik' (no subcommand): print help. The banner is
|
|
// printed once at process startup by Entry, before cobra
|
|
// parses arguments, so it appears even when cobra rejects
|
|
// args (e.g. "requires at least 2 arg(s)") and on --help.
|
|
Run: func(cmd *cobra.Command, _ []string) {
|
|
_ = cmd.Help()
|
|
},
|
|
}
|
|
|
|
// Add global flags
|
|
cmd.PersistentFlags().StringVar(&rootFlags.ConfigPath, "config", "",
|
|
"Path to config file (default: $VAULTIK_CONFIG or platform config dir)")
|
|
cmd.PersistentFlags().BoolVarP(&rootFlags.Verbose, "verbose", "v", false,
|
|
"Enable verbose output")
|
|
cmd.PersistentFlags().BoolVar(&rootFlags.Debug, "debug", false,
|
|
"Enable debug output")
|
|
cmd.PersistentFlags().BoolVarP(&rootFlags.Quiet, "quiet", "q", false,
|
|
"Suppress non-error output")
|
|
cmd.PersistentFlags().BoolVar(&rootFlags.SkipErrors, "skip-errors", false,
|
|
"Continue past per-file errors instead of aborting "+
|
|
"(applies to snapshot create and restore)")
|
|
|
|
// Add subcommands
|
|
cmd.AddCommand(
|
|
NewConfigCommand(),
|
|
NewPruneCommand(),
|
|
NewSnapshotCommand(),
|
|
NewInfoCommand(),
|
|
NewVersionCommand(),
|
|
NewRemoteCommand(),
|
|
NewDatabaseCommand(),
|
|
)
|
|
|
|
return cmd
|
|
}
|
|
|
|
// GetRootFlags returns the global flags that were parsed from the command line.
|
|
// This allows subcommands to access global flag values like verbosity and config path.
|
|
func GetRootFlags() RootFlags {
|
|
return rootFlags
|
|
}
|
|
|
|
// ResolveConfigPath resolves the config file path from flags, environment, or default.
|
|
// Search order: --config flag, VAULTIK_CONFIG env, XDG config dir,
|
|
// /etc/vaultik/config.yml.
|
|
// Explicit paths from --config and $VAULTIK_CONFIG are checked for existence
|
|
// so the user gets a clear error instead of a downstream YAML parser failure.
|
|
func ResolveConfigPath() (string, error) {
|
|
if path := rootFlags.ConfigPath; path != "" {
|
|
_, err := os.Stat(path)
|
|
if err != nil {
|
|
return "", fmt.Errorf(
|
|
"%w: from --config: %s (run 'vaultik config init --config %s' to create it)",
|
|
errConfigNotFound, path, path)
|
|
}
|
|
|
|
return path, nil
|
|
}
|
|
|
|
if path := os.Getenv("VAULTIK_CONFIG"); path != "" {
|
|
_, err := os.Stat(path) //nolint:gosec // G703: path is operator-supplied by design
|
|
if err != nil {
|
|
return "", fmt.Errorf(
|
|
"%w: from $VAULTIK_CONFIG: %s (unset VAULTIK_CONFIG, point it at "+
|
|
"an existing file, or run 'vaultik config init')",
|
|
errConfigNotFound, path)
|
|
}
|
|
|
|
return path, nil
|
|
}
|
|
|
|
for _, path := range defaultConfigPaths() {
|
|
_, err := os.Stat(path)
|
|
if err == nil {
|
|
return path, nil
|
|
}
|
|
}
|
|
|
|
return "", fmt.Errorf(
|
|
"%w: searched %s (run 'vaultik config init' to create the default "+
|
|
"config, or pass --config <path>)",
|
|
errConfigNotFound, strings.Join(defaultConfigPaths(), " or "))
|
|
}
|
|
|
|
// defaultConfigPaths returns the ordered list of config paths to search.
|
|
// On macOS: ~/Library/Application Support/vaultik/config.yml
|
|
// On Linux: ~/.config/vaultik/config.yml
|
|
// Fallback: /etc/vaultik/config.yml
|
|
func defaultConfigPaths() []string {
|
|
return []string{
|
|
filepath.Join(xdg.ConfigHome, "vaultik", "config.yml"),
|
|
"/etc/vaultik/config.yml",
|
|
}
|
|
}
|
|
|
|
// DefaultConfigPath returns the platform-appropriate default config path.
|
|
// Used by the init command and in help text.
|
|
func DefaultConfigPath() string {
|
|
if os.Getuid() == 0 {
|
|
return "/etc/vaultik/config.yml"
|
|
}
|
|
|
|
return filepath.Join(xdg.ConfigHome, "vaultik", "config.yml")
|
|
}
|