From 1d555084ac3f8ded202c75ded942e917feaf55dc Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Tue, 27 Oct 2026 02:40:41 +1100 Subject: [PATCH] fix(archied): refuse an unknown subcommand instead of starting a second daemon --- cmd/archied/main.go | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/cmd/archied/main.go b/cmd/archied/main.go index 6c6e190d3..66f66cb0e 100644 --- a/cmd/archied/main.go +++ b/cmd/archied/main.go @@ -2,32 +2,47 @@ package main import ( + "fmt" "os" + "strings" "github.com/samcharles93/archie-core/internal/app/archied" "github.com/samcharles93/archie-core/internal/app/archieplaybooks" "github.com/samcharles93/archie-core/internal/app/prbench" ) +const commandUsage = "usage: archied [flags] # run the daemon; archied -h lists the flags\n" + + "subcommands: setup, update, status, prbench, playbooks" + func main() { - args := os.Args[1:] + os.Exit(run(os.Args[1:])) +} + +func run(args []string) int { // The setup generator is dispatched before the daemon's flags are // parsed: it writes a first-run config.toml and must not touch the // store, NATS, or the running daemon's configuration. if archied.IsSetupArgs(args) { - os.Exit(archied.RunSetup(args[1:], os.Stdin, os.Stdout, os.Stderr)) + return archied.RunSetup(args[1:], os.Stdin, os.Stdout, os.Stderr) } - if len(args) > 0 && args[0] == "update" { - os.Exit(archied.RunUpdate(args[1:], os.Stdout, os.Stderr)) + if len(args) > 0 { + switch args[0] { + case "update": + return archied.RunUpdate(args[1:], os.Stdout, os.Stderr) + case "status": + return archied.RunStatus(args[1:], os.Stdout, os.Stderr) + case "prbench": + return prbench.Main(args[1:], os.Stdout, os.Stderr) + case "playbooks": + return archieplaybooks.Run(args[1:], os.Stderr) + } + // A word that is not a subcommand is refused rather than ignored: a + // stale `archied update-topology` would otherwise start a second + // daemon under the running one's feet. + if !strings.HasPrefix(args[0], "-") { + fmt.Fprintf(os.Stderr, "archied: unknown command %q\n%s\n", args[0], commandUsage) + return 2 + } } - if len(args) > 0 && args[0] == "status" { - os.Exit(archied.RunStatus(args[1:], os.Stdout, os.Stderr)) - } - if len(args) > 0 && args[0] == "prbench" { - os.Exit(prbench.Main(args[1:], os.Stdout, os.Stderr)) - } - if len(args) > 0 && args[0] == "playbooks" { - os.Exit(archieplaybooks.Run(args[1:], os.Stderr)) - } - os.Exit(archied.Run()) + return archied.Run() }