Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e962a79c9 |
No files matched your search
@@ -183,6 +183,7 @@ vaultik [--config <path>] remote nuke --force
|
|||||||
vaultik [--config <path>] database delete [--force]
|
vaultik [--config <path>] database delete [--force]
|
||||||
vaultik completion <bash|zsh|fish|powershell>
|
vaultik completion <bash|zsh|fish|powershell>
|
||||||
vaultik version
|
vaultik version
|
||||||
|
vaultik --version
|
||||||
```
|
```
|
||||||
|
|
||||||
### global flags
|
### global flags
|
||||||
|
|||||||
+18
-4
@@ -32,6 +32,8 @@ var rootFlags RootFlags
|
|||||||
// It sets up the command structure, global flags, and adds all subcommands.
|
// It sets up the command structure, global flags, and adds all subcommands.
|
||||||
// This is the main entry point for the CLI command hierarchy.
|
// This is the main entry point for the CLI command hierarchy.
|
||||||
func NewRootCommand() *cobra.Command {
|
func NewRootCommand() *cobra.Command {
|
||||||
|
var showVersion bool
|
||||||
|
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: "vaultik",
|
Use: "vaultik",
|
||||||
Short: "Secure incremental backup tool with asymmetric encryption",
|
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
|
public keys and uploads to S3-compatible storage. No private keys are needed
|
||||||
on the source system.`,
|
on the source system.`,
|
||||||
SilenceUsage: true,
|
SilenceUsage: true,
|
||||||
// Bare 'vaultik' (no subcommand): print help. The banner is
|
// Bare 'vaultik' (no subcommand): print help, or with --version
|
||||||
// printed once at process startup by Entry, before cobra
|
// the report of the version command. The banner is printed once
|
||||||
// parses arguments, so it appears even when cobra rejects
|
// at process startup by Entry, before cobra parses arguments, so
|
||||||
// args (e.g. "requires at least 2 arg(s)") and on --help.
|
// it appears even when cobra rejects args (e.g. "requires at
|
||||||
|
// least 2 arg(s)") and on --help.
|
||||||
Run: func(cmd *cobra.Command, _ []string) {
|
Run: func(cmd *cobra.Command, _ []string) {
|
||||||
|
if showVersion {
|
||||||
|
writeVersion(commandUI(cmd))
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
_ = cmd.Help()
|
_ = 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
|
// Add global flags
|
||||||
cmd.PersistentFlags().StringVar(&rootFlags.ConfigPath, "config", "",
|
cmd.PersistentFlags().StringVar(&rootFlags.ConfigPath, "config", "",
|
||||||
"Path to config file (default: $VAULTIK_CONFIG or platform config dir)")
|
"Path to config file (default: $VAULTIK_CONFIG or platform config dir)")
|
||||||
|
|||||||
@@ -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
|
// TestVersionCommandFlagsDevelopmentBuild is the regression test for
|
||||||
// the thing this command exists to prevent: a build that is not a
|
// 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
|
// release must say so. The notice used to be gated on the version
|
||||||
|
|||||||
Reference in new issue
Block a user