thaloco/banger
1
Fork 0
Code Pull requests Releases Packages Activity Actions

cli: restrict ExitCodeError unwrap to the CLI's own type

Browse source 
main.go previously unwrapped *any* error implementing `ExitCode() int`
into the process exit status, which matched *exec.ExitError too. So
whenever a CLI command ran a subprocess (mkfs.ext4, debugfs, ssh to a
daemon preflight, etc.) and that subprocess failed, the CLI would
silently exit with the subprocess's code — no error message printed.
Surfaced while bringing up `banger internal make-bundle`: mkfs.ext4
was failing on an undersized ext4 and the user saw only `EXIT=1`.

Fix: export the type as `cli.ExitCodeError` and unwrap against the
concrete type in main.go. The `ExitCode()` method is gone — only the
explicit wrap at the `vm run` command-mode call site produces this
error now.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Thales Maciel 2026-04-17 15:37:47 -03:00
parent bb95a0a273
commit a7d1a49aca
No known key found for this signature in database
GPG key ID: 33112E6833C34679
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
internal/cli/banger.go
View file

@ -2810,20 +2810,19 @@ func splitVMRunArgs(cmd *cobra.Command, args []string) (pathArgs, commandArgs []
return args[:dash], args[dash:]
}
// exitCodeError wraps a remote command's exit status so the CLI's main()
// can propagate it verbatim. Setup errors and other failures stay as
// regular errors.
type exitCodeError struct {
// ExitCodeError wraps a remote command's exit status so the CLI's main()
// can propagate it verbatim. Only errors explicitly wrapped in this
// type get forwarded as process exit codes — plain *exec.ExitError
// values (from unrelated subprocesses like mkfs.ext4) must still
// surface as regular errors so the user sees a message.
type ExitCodeError struct {
Code int
}
func (e exitCodeError) Error() string {
func (e ExitCodeError) Error() string {
return fmt.Sprintf("exit status %d", e.Code)
}
// ExitCode exposes the code for callers using errors.As.
func (e exitCodeError) ExitCode() int { return e.Code }
func runVMRun(ctx context.Context, socketPath string, cfg model.DaemonConfig, stdin io.Reader, stdout, stderr io.Writer, params api.VMCreateParams, spec *vmRunRepoSpec, command []string) error {
progress := newVMRunProgressRenderer(stderr)
vm, err := runVMCreate(ctx, socketPath, stderr, params)
@ -2871,7 +2870,7 @@ func runVMRun(ctx context.Context, socketPath string, cfg model.DaemonConfig, st
if err := sshExecFunc(ctx, stdin, stdout, stderr, sshArgs); err != nil {
var exitErr *exec.ExitError
if errors.As(err, &exitErr) {
return exitCodeError{Code: exitErr.ExitCode()}
return ExitCodeError{Code: exitErr.ExitCode()}
}
return err
}

4
internal/cli/cli_test.go
View file

@ -1675,9 +1675,9 @@ func TestRunVMRunCommandModePropagatesExitCode(t *testing.T) {
nil,
[]string{"false"},
)
var exitErr exitCodeError
var exitErr ExitCodeError
if !errors.As(err, &exitErr) || exitErr.Code != 7 {
t.Fatalf("runVMRun error = %v, want exitCodeError{7}", err)
t.Fatalf("runVMRun error = %v, want ExitCodeError{7}", err)
}
if len(sshArgsSeen) == 0 || sshArgsSeen[len(sshArgsSeen)-1] != "false" {
t.Fatalf("sshArgsSeen = %v, want trailing command 'false'", sshArgsSeen)