fix: rpm-ostree updater segfault, error reporting (#65)

* fix: rpm-ostree updater segfault, error reporting

* chore: implement small suggestions

Author: gerblesh

cmd/update.go

@@ -111,7 +111,7 @@ func Update(cmd *cobra.Command, args []string) {
 
 	mainSystemDriver, mainSystemDriverConfig, _, _ := system.InitializeSystemDriver(*initConfiguration)
 
-	enableUpd, err := false, nil
+	enableUpd, err := true, nil
 	// if there's no force flag, check for updates
 	if !force {
 		enableUpd, err = mainSystemDriver.Check()

drv/rpmostree/rpmostree.go

@@ -57,10 +57,13 @@ func (up RpmOstreeUpdater) Outdated() (bool, error) {
 
 func (up RpmOstreeUpdater) Update() (*[]CommandOutput, error) {
 	var finalOutput = []CommandOutput{}
-	var cmd *exec.Cmd
 	binaryPath := up.BinaryPath
+
 	cli := []string{binaryPath, "upgrade"}
+	up.Config.Logger.Debug("Executing update", slog.Any("cli", cli))
+	cmd := exec.Command(cli[0], cli[1:]...)
 	out, err := session.RunLog(up.Config.Logger, slog.LevelDebug, cmd)
+
 	tmpout := CommandOutput{}.New(out, err)
 	tmpout.Cli = cli
 	tmpout.Failure = err != nil

drv/system/system.go

@@ -73,10 +73,12 @@ func (up SystemUpdater) Update() (*[]CommandOutput, error) {
 	var finalOutput = []CommandOutput{}
 	var cmd *exec.Cmd
 	binaryPath := up.BinaryPath
+
 	cli := []string{binaryPath, "upgrade", "--quiet"}
 	up.Config.Logger.Debug("Executing update", slog.Any("cli", cli))
 	cmd = exec.Command(cli[0], cli[1:]...)
 	out, err := session.RunLog(up.Config.Logger, slog.LevelDebug, cmd)
+
 	tmpout := CommandOutput{}.New(out, err)
 	tmpout.Failure = err != nil
 	tmpout.Context = "System Update"
@@ -121,55 +123,44 @@ func (up SystemUpdater) Check() (bool, error) {
 	return updateNecessary, nil
 }
 
-func BootcCompatible(binaryPath string) (bool, error) {
+func BootcCompatible(binaryPath string) bool {
 	cmd := exec.Command(binaryPath, "status", "--format=json")
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		return false, nil
+		return false
 	}
 	var status bootcStatus
 	err = json.Unmarshal(out, &status)
 	if err != nil {
-		return false, nil
+		return false
 	}
-	return !(status.Status.Booted.Incompatible || status.Status.Staged.Incompatible), nil
+	return !(status.Status.Booted.Incompatible || status.Status.Staged.Incompatible)
 }
 
 func InitializeSystemDriver(initConfiguration UpdaterInitConfiguration) (SystemUpdateDriver, DriverConfiguration, bool, error) {
-	var enableUpd bool = true
 
 	rpmOstreeUpdater, err := rpmostree.RpmOstreeUpdater{}.New(initConfiguration)
-	if err != nil {
-		enableUpd = false
-	}
 
 	systemUpdater, err := SystemUpdater{}.New(initConfiguration)
-	if err != nil {
-		enableUpd = false
-	}
 
-	isBootc, err := BootcCompatible(systemUpdater.BinaryPath)
-	if err != nil {
-		isBootc = false
-	}
+	isBootc := BootcCompatible(systemUpdater.BinaryPath)
 
 	if !isBootc {
 		slog.Debug("Using rpm-ostree fallback as system driver")
 	}
 
 	// The system driver to be applied needs to have the correct "enabled" value since it will NOT update from here onwards.
-	systemUpdater.Config.Enabled = systemUpdater.Config.Enabled && isBootc && enableUpd
-	rpmOstreeUpdater.Config.Enabled = rpmOstreeUpdater.Config.Enabled && !isBootc && enableUpd
+	systemUpdater.Config.Enabled = systemUpdater.Config.Enabled && isBootc
+
+	rpmOstreeUpdater.Config.Enabled = rpmOstreeUpdater.Config.Enabled && !isBootc
 
-	var finalConfig DriverConfiguration
+	// var finalConfig DriverConfiguration
 	var mainSystemDriver SystemUpdateDriver
 	if isBootc {
-		mainSystemDriver = &systemUpdater
-		finalConfig = systemUpdater.Config
-	} else {
-		mainSystemDriver = &rpmOstreeUpdater
-		finalConfig = systemUpdater.Config
+		mainSystemDriver = systemUpdater
+		return mainSystemDriver, systemUpdater.Config, isBootc, err
 	}
+	mainSystemDriver = rpmOstreeUpdater
+	return mainSystemDriver, rpmOstreeUpdater.Config, isBootc, err
 
-	return mainSystemDriver, finalConfig, isBootc, err
 }

pkg/session/session.go

@@ -27,18 +27,21 @@ func RunLog(logger *slog.Logger, level slog.Level, command *exec.Cmd) ([]byte, e
 	stdout, _ := command.StdoutPipe()
 	stderr, _ := command.StderrPipe()
 	multiReader := io.MultiReader(stdout, stderr)
-	actuallogger := slog.Default()
-
-	if err := command.Start(); err != nil {
-		actuallogger.Warn("Error occoured starting external command", slog.Any("error", err))
+	actualLogger := slog.Default()
+	err := command.Start()
+	if err != nil {
+		actualLogger.Warn("Error occurred starting external command", slog.Any("error", err))
+		return []byte{}, err
 	}
 	scanner := bufio.NewScanner(multiReader)
 	scanner.Split(bufio.ScanLines)
 	for scanner.Scan() {
-		actuallogger.Log(context.TODO(), level, scanner.Text())
+		actualLogger.Log(context.TODO(), level, scanner.Text())
 	}
-	if err := command.Wait(); err != nil {
-		actuallogger.Warn("Error occoured while waiting for external command", slog.Any("error", err))
+	err = command.Wait()
+	if err != nil {
+		actualLogger.Warn("Error occurred while waiting for external command", slog.Any("error", err))
+		return []byte{}, err
 	}
 
 	return scanner.Bytes(), scanner.Err()