Files
unkinben 123faf8bbf
ci/woodpecker/pr/build Pipeline was successful
ci/woodpecker/pr/test Pipeline failed
ci/woodpecker/pr/pre-commit Pipeline was successful
Add vctl and vctx Vault token CLIs
Introduces the vault-tools monorepo: two Go CLIs that share a config file
(~/.config/vault) and token cache (~/.cache/vault) for working with multiple
Vault instances (contexts).

- add shared/ library: config parsing (vctl.yaml/config.yaml, per-context
  overrides, slash contexts), token cache (0600/0700, atomic writes, path-
  traversal guards), and a small hand-rolled Vault HTTP client (login/renew)
- add vctl: login/renew (single or --all), list, --method/--user overrides,
  no-echo password/token prompts, dynamic context completion
- add vctx: resolve a context, set VAULT_ADDR/VAULT_TOKEN/VAULT_NAMESPACE and
  exec the vault CLI, passing remaining args through untouched
- add unit tests across shared/, vctl and vctx command layers (config
  resolution, cache paths, vault client, --all iteration + error aggregation,
  vctx arg pass-through and env construction via fakeable exec/prompt seams)
- add Makefile (build/test/completions/rpm, patch|minor|major version bumps),
  nfpm RPM packaging bundling bash/zsh/fish completions for both binaries
- add Woodpecker pipelines: build/test/pre-commit on PRs, and a tag release
  that cross-compiles, builds+uploads the RPM to artifactapi, and cuts a Gitea
  release (serviceAccountName default, k8s resources on every step)
- add README, per-command docs (docs/vctl.md, docs/vctx.md), AGENTS.md and an
  example config

Claude-Session: https://claude.ai/code/session_015ur3i7D2azsMAWTSVABApv
2026-07-26 23:28:05 +10:00

144 lines
4.5 KiB
Go

// Command vctx is a thin, context-aware wrapper around the real `vault` CLI.
//
// It resolves a context (via the same config + token cache as vctl), sets
// VAULT_ADDR / VAULT_TOKEN / VAULT_NAMESPACE for that single invocation, and
// execs `vault` with the remaining arguments:
//
// vctx --context sydney kv put kv/foo/bar secret=baz
// vctx --context staging/sydney token lookup
package main
import (
"fmt"
"os"
"os/exec"
"syscall"
"git.unkin.net/unkin/vault-tools/shared"
"github.com/spf13/cobra"
)
var version = "dev"
// execVault replaces the current process with the vault binary. It is a package
// variable so tests can substitute a fake in place of syscall.Exec.
var execVault = syscall.Exec
func main() {
if err := newRootCmd().Execute(); err != nil {
os.Exit(1)
}
}
func newRootCmd() *cobra.Command {
var context string
root := &cobra.Command{
Use: "vctx --context <context> <vault args...>",
Short: "Run the vault CLI against a named context.",
Long: "vctx resolves a context from ~/.config/vault (shared with vctl), loads its\n" +
"cached token from ~/.cache/vault/<context>, sets VAULT_ADDR, VAULT_TOKEN and\n" +
"VAULT_NAMESPACE for this invocation only, and execs `vault` with the\n" +
"remaining arguments.\n\n" +
"Example: vctx --context sydney kv put kv/foo/bar secret=baz",
// Everything from the first non-flag argument on is the vault command
// line; SetInterspersed(false) below stops flag parsing there so flags
// meant for vault (e.g. `kv get -field=foo`) are passed through untouched.
Args: cobra.ArbitraryArgs,
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) error {
return runVctx(context, args)
},
}
// Do not treat vault flags interspersed with args as vctx flags: only the
// leading --context is ours; everything from the first positional on is the
// vault command line.
root.Flags().SetInterspersed(false)
root.Flags().StringVar(&context, "context", "", "Vault context to target (required)")
_ = root.RegisterFlagCompletionFunc("context", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
cfg, err := shared.Load()
if err != nil {
return nil, cobra.ShellCompDirectiveNoFileComp
}
return cfg.ContextNames(), cobra.ShellCompDirectiveNoFileComp
})
root.AddCommand(&cobra.Command{
Use: "version",
Short: "Print the version",
Args: cobra.NoArgs,
Run: func(cmd *cobra.Command, args []string) { fmt.Println(version) },
SilenceUsage: true,
})
return root
}
// runVctx validates inputs, builds the vault invocation for the context, and
// execs it (replacing this process).
func runVctx(context string, args []string) error {
if context == "" {
return fmt.Errorf("--context is required")
}
if len(args) == 0 {
return fmt.Errorf("no vault arguments given (e.g. vctx --context %s kv list kv/)", context)
}
bin, argv, env, err := buildInvocation(context, args, os.Environ())
if err != nil {
return err
}
// Replace this process with vault so its exit status, signals and TTY
// behaviour pass straight through.
if err := execVault(bin, argv, env); err != nil {
return fmt.Errorf("exec vault: %w", err)
}
return nil
}
// buildInvocation resolves the context and its cached token, locates the vault
// binary, and returns the binary path, argv (vault + args) and the environment
// to exec with. baseEnv is the starting environment (normally os.Environ());
// the Vault settings are appended so they override any ambient values (exec
// semantics: the last assignment of a variable wins).
func buildInvocation(context string, args, baseEnv []string) (bin string, argv []string, env []string, err error) {
cfg, err := shared.Load()
if err != nil {
return "", nil, nil, err
}
rc, err := cfg.Resolve(context)
if err != nil {
return "", nil, nil, err
}
tok, err := shared.LoadToken(context)
if err != nil {
return "", nil, nil, err
}
vaultBin, err := exec.LookPath("vault")
if err != nil {
return "", nil, nil, fmt.Errorf("vault CLI not found in PATH: %w", err)
}
env = make([]string, len(baseEnv), len(baseEnv)+3)
copy(env, baseEnv)
env = append(env,
"VAULT_ADDR="+rc.Address,
"VAULT_TOKEN="+tok.Token,
)
// Namespace comes from the context, falling back to what the token was
// issued under; only set when non-empty.
ns := rc.Namespace
if ns == "" {
ns = tok.Namespace
}
if ns != "" {
env = append(env, "VAULT_NAMESPACE="+ns)
}
argv = append([]string{vaultBin}, args...)
return vaultBin, argv, env, nil
}