Merge branch 'fix-ssh-exit-code' into 'main'

Propagate the exit code to the caller

See merge request bootc-org/podman-bootc-cli!63

Author: ckyrouac

cmd/root.go

@@ -10,12 +10,16 @@ import (
 )
 
 // RootCmd represents the base command when called without any subcommands
-var RootCmd = &cobra.Command{
-	Use:               "podman-bootc",
-	Short:             "Run bootable containers as a virtual machine",
-	Long:              "Run bootable containers as a virtual machine",
-	PersistentPreRunE: preExec,
-}
+var (
+	RootCmd = &cobra.Command{
+		Use:               "podman-bootc",
+		Short:             "Run bootable containers as a virtual machine",
+		Long:              "Run bootable containers as a virtual machine",
+		PersistentPreRunE: preExec,
+		SilenceUsage:      true,
+	}
+	ExitCode int
+)
 
 var rootLogLevel string
 

cmd/run.go

@@ -177,7 +177,7 @@ func doRun(flags *cobra.Command, args []string) error {
 		}
 
 		// ssh into the VM
-		err = bootcVM.RunSSH(cmd)
+		ExitCode, err = utils.WithExitCode(bootcVM.RunSSH(cmd))
 		if err != nil {
 			return fmt.Errorf("ssh: %w", err)
 		}

cmd/ssh.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"gitlab.com/bootc-org/podman-bootc/pkg/config"
 	"gitlab.com/bootc-org/podman-bootc/pkg/user"
+	"gitlab.com/bootc-org/podman-bootc/pkg/utils"
 	"gitlab.com/bootc-org/podman-bootc/pkg/vm"
 
 	"github.com/spf13/cobra"
@@ -51,5 +52,7 @@ func doSsh(_ *cobra.Command, args []string) error {
 	if len(args) > 1 {
 		cmd = args[1:]
 	}
-	return vm.RunSSH(cmd)
+
+	ExitCode, err = utils.WithExitCode(vm.RunSSH(cmd))
+	return err
 }

pkg/utils/errors.go

@@ -1,5 +1,10 @@
 package utils
 
+import (
+	"errors"
+	"os/exec"
+)
+
 const (
 	PodmanMachineErrorMessage = `
 ******************************************************************
@@ -8,3 +13,17 @@ const (
 `
 	// PodmanMachineErrorMessage = "\n**** A rootful Podman machine is required to run podman-bootc ****\n"
 )
+
+// SetExitCode set the exit code for exec.ExitError errors, and no
+// error is returned
+func WithExitCode(err error) (int, error) {
+	if err == nil {
+		return 0, nil
+	}
+
+	var exitError *exec.ExitError
+	if errors.As(err, &exitError) {
+		return exitError.ExitCode(), nil
+	}
+	return 1, err
+}

podman-bootc.go

@@ -74,4 +74,5 @@ func main() {
 	}()
 
 	cmd.Execute()
+	os.Exit(cmd.ExitCode)
 }