Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e962a79c9 |
No files matched your search
@@ -127,11 +127,6 @@ vaultik config set s3.secret_access_key "..."
|
||||
vaultik snapshot list
|
||||
```
|
||||
|
||||
For an rclone destination, the storage credentials are in rclone's config file
|
||||
instead. Copy that file to the new host, or recreate it with `rclone config`,
|
||||
and set `storage_url` to the original `rclone://remote/path`. See
|
||||
[storage backends](#storage-backends).
|
||||
|
||||
`snapshot list` reads the destination store without the private key. A snapshot
|
||||
that is not in this host's (empty) local index is shown as remote-only: its row
|
||||
is identified by `<remote only:...>` rather than by a `hostname_name_timestamp`
|
||||
@@ -188,6 +183,7 @@ vaultik [--config <path>] remote nuke --force
|
||||
vaultik [--config <path>] database delete [--force]
|
||||
vaultik completion <bash|zsh|fish|powershell>
|
||||
vaultik version
|
||||
vaultik --version
|
||||
```
|
||||
|
||||
### global flags
|
||||
@@ -286,8 +282,6 @@ work as written.
|
||||
the key is not typed into your shell history.
|
||||
- `VAULTIK_CONFIG`: Path to config file (overridden by `--config`)
|
||||
- `VAULTIK_INDEX_PATH`: Override local SQLite index path
|
||||
- `RCLONE_CONFIG`: Path to the rclone config file used by an `rclone://`
|
||||
destination (default `~/.config/rclone/rclone.conf`)
|
||||
- `VAULTIK_CPUPROFILE`: Write a CPU profile to this path for the duration of the
|
||||
run (development/debugging)
|
||||
- `VAULTIK_MEMPROFILE`: Write a heap profile to this path when the run exits
|
||||
@@ -609,11 +603,7 @@ only `vaultik-destination.txt` stops such a backup, and only while the local
|
||||
index holds snapshots.
|
||||
|
||||
**Rclone** (`rclone://remote/path`): Uses rclone's 70+ supported cloud
|
||||
providers. `remote` is the name of a remote in rclone's config file, which holds
|
||||
that remote's credentials. vaultik reads the same file the `rclone` tool reads,
|
||||
by default `~/.config/rclone/rclone.conf`. Create it with `rclone config`, or
|
||||
copy it from another machine; vaultik does not need the `rclone` tool once the
|
||||
file exists. The `RCLONE_CONFIG` environment variable names a different file.
|
||||
providers. Requires rclone to be configured separately (`rclone config`).
|
||||
|
||||
An upload cut off part-way leaves nothing under the object's name on S3, which
|
||||
shows an object only once its upload has completed, and on the local filesystem
|
||||
|
||||
+18
-4
@@ -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)")
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user