From 2e962a79c911e5d9b06429e9a8f580af709907ab Mon Sep 17 00:00:00 2001 From: sneak Date: Thu, 19 Nov 2026 06:49:15 +0000 Subject: [PATCH] Add vaultik --version, printing the version command's report (closes #432) The flag is defined on the root command rather than enabled through cobra's Version field: cobra's flag prints a one-line template, not the full report that `vaultik version` prints. Model: opus-5-5 --- README.md | 1 + internal/cli/root.go | 22 ++++++++++++++++++---- internal/cli/version_test.go | 24 ++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d6d7601..06d59b3 100644 --- a/README.md +++ b/README.md @@ -183,6 +183,7 @@ vaultik [--config ] remote nuke --force vaultik [--config ] database delete [--force] vaultik completion vaultik version +vaultik --version ``` ### global flags diff --git a/internal/cli/root.go b/internal/cli/root.go index ba1fcbc..af74b35 100644 --- a/internal/cli/root.go +++ b/internal/cli/root.go @@ -32,6 +32,8 @@ var rootFlags RootFlags // 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 { + var showVersion bool + cmd := &cobra.Command{ Use: "vaultik", Short: "Secure incremental backup tool with asymmetric encryption", @@ -39,15 +41,27 @@ func NewRootCommand() *cobra.Command { 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. + // Bare 'vaultik' (no subcommand): print help, or with --version + // the report of the version command. 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) { + if showVersion { + writeVersion(commandUI(cmd)) + + return + } + _ = cmd.Help() }, } + // cobra's own --version prints a template, not the version report, + // so vaultik defines the flag itself. + cmd.Flags().BoolVar(&showVersion, "version", false, + "Print version information (same as 'vaultik version')") + // Add global flags cmd.PersistentFlags().StringVar(&rootFlags.ConfigPath, "config", "", "Path to config file (default: $VAULTIK_CONFIG or platform config dir)") diff --git a/internal/cli/version_test.go b/internal/cli/version_test.go index 3215029..f2107bf 100644 --- a/internal/cli/version_test.go +++ b/internal/cli/version_test.go @@ -86,6 +86,30 @@ func TestVersionCommandReportLines(t *testing.T) { } } +// TestVersionFlagPrintsVersionReport checks that `vaultik --version` +// prints exactly the report of `vaultik version`. +// +//nolint:paralleltest // executes commands that read the global rootFlags +func TestVersionFlagPrintsVersionReport(t *testing.T) { + cmd := cli.NewRootCommand() + + var out bytes.Buffer + + cmd.SetOut(&out) + cmd.SetErr(&out) + cmd.SetArgs([]string{"--version"}) + + err := cmd.Execute() + if err != nil { + t.Fatalf("vaultik --version failed: %v", err) + } + + want := runVersionCommand(t) + if out.String() != want { + t.Errorf("vaultik --version printed:\n%s\nwant:\n%s", out.String(), want) + } +} + // TestVersionCommandFlagsDevelopmentBuild is the regression test for // the thing this command exists to prevent: a build that is not a // release must say so. The notice used to be gated on the version -- 2.54.0