feat: Make differ check non-fatal

Vanilla-OS · Feb 5, 2024 · 6ba9f67 · 6ba9f67
1 parent 3f2f42e
commit 6ba9f67
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 74 deletions.
diff --git a/cmd/upgrade.go b/cmd/upgrade.go
@@ -80,84 +80,12 @@ func upgrade(cmd *cobra.Command, args []string) error {
 	}
 
 	if checkOnly {
-		_, raw := os.LookupEnv("ABROOT_JSON_OUTPUT")
-		if !raw {
-			cmdr.Info.Println(abroot.Trans("upgrade.checkingSystemUpdate"))
-		}
-
-		// Check for image updates
-		newDigest, res := aBsys.CheckUpdate()
-		sysAdded, sysUpgraded, sysDowngraded, sysRemoved := []diff.PackageDiff{}, []diff.PackageDiff{}, []diff.PackageDiff{}, []diff.PackageDiff{}
-		if res {
-			if !raw {
-				cmdr.Info.Println(abroot.Trans("upgrade.systemUpdateAvailable"))
-			}
-
-			sysAdded, sysUpgraded, sysDowngraded, sysRemoved, err = core.BaseImagePackageDiff(aBsys.CurImage.Digest, newDigest)
-			if err != nil {
-				return err
-			}
-			if !raw {
-				err = renderPackageDiff(sysAdded, sysUpgraded, sysDowngraded, sysRemoved)
-				if err != nil {
-					return err
-				}
-			}
-		} else if !raw {
-			cmdr.Info.Println(abroot.Trans("upgrade.noUpdateAvailable"))
-		}
-
-		// Check for package updates
-		if !raw {
-			cmdr.Info.Println(abroot.Trans("upgrade.checkingPackageUpdate"))
-		}
-		ovlAdded, ovlUpgraded, ovlDowngraded, ovlRemoved, err := core.OverlayPackageDiff()
+		hasUpdate, err := upgradeCheck(aBsys)
 		if err != nil {
 			return err
 		}
 
-		sumChanges := len(ovlAdded) + len(ovlUpgraded) + len(ovlDowngraded) + len(ovlRemoved)
-		if sumChanges == 0 && !raw {
-			cmdr.Info.Println(abroot.Trans("upgrade.noUpdateAvailable"))
-		} else if !raw {
-			cmdr.Info.Sprintf(abroot.Trans("upgrade.packageUpdateAvailable"), sumChanges)
-
-			err = renderPackageDiff(ovlAdded, ovlUpgraded, ovlDowngraded, ovlRemoved)
-			if err != nil {
-				return err
-			}
-		}
-
-		if raw {
-			newDigestIfHasUpdate := ""
-			if res {
-				newDigestIfHasUpdate = newDigest
-			}
-
-			out, err := json.Marshal(map[string]any{
-				"hasUpdate": res,
-				"newDigest": newDigestIfHasUpdate,
-				"systemPackageDiff": map[string][]diff.PackageDiff{
-					"added":      sysAdded,
-					"upgraded":   sysUpgraded,
-					"downgraded": sysDowngraded,
-					"removed":    sysRemoved,
-				},
-				"overlayPackageDiff": map[string][]diff.PackageDiff{
-					"added":      ovlAdded,
-					"upgraded":   ovlUpgraded,
-					"downgraded": ovlDowngraded,
-					"removed":    ovlRemoved,
-				},
-			})
-			if err != nil {
-				cmdr.Error.Println(err)
-			}
-
-			fmt.Println(string(out))
-		}
-
-		if !res && sumChanges == 0 {
+		if !hasUpdate {
 			os.Exit(1) // No update available
 		} else {
 			os.Exit(0) // Update available
@@ -205,6 +133,92 @@ func upgrade(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
+func upgradeCheck(aBsys *core.ABSystem) (bool, error) {
+	_, raw := os.LookupEnv("ABROOT_JSON_OUTPUT")
+	if !raw {
+		cmdr.Info.Println(abroot.Trans("upgrade.checkingSystemUpdate"))
+	}
+
+	sysAdded := []diff.PackageDiff{}
+	sysUpgraded := []diff.PackageDiff{}
+	sysDowngraded := []diff.PackageDiff{}
+	sysRemoved := []diff.PackageDiff{}
+	var err error
+
+	// Check for image updates
+	newDigest, res := aBsys.CheckUpdate()
+	if res {
+		if !raw {
+			cmdr.Info.Println(abroot.Trans("upgrade.systemUpdateAvailable"))
+		}
+
+		sysAdded, sysUpgraded, sysDowngraded, sysRemoved, err = core.BaseImagePackageDiff(aBsys.CurImage.Digest, newDigest)
+		if err != nil {
+			cmdr.Warning.Printf(abroot.Trans("upgrade.systemUpdateCheckFailed"), err)
+		} else if !raw {
+			err = renderPackageDiff(sysAdded, sysUpgraded, sysDowngraded, sysRemoved)
+			if err != nil {
+				return false, err
+			}
+		}
+	} else if !raw {
+		cmdr.Info.Println(abroot.Trans("upgrade.noUpdateAvailable"))
+	}
+
+	// Check for package updates
+	sumChanges := 0
+	if !raw {
+		cmdr.Info.Println(abroot.Trans("upgrade.checkingPackageUpdate"))
+	}
+	ovlAdded, ovlUpgraded, ovlDowngraded, ovlRemoved, err := core.OverlayPackageDiff()
+	if err != nil {
+		cmdr.Warning.Printf(abroot.Trans("upgrade.packageUpdateCheckFailed"), err)
+	} else {
+		sumChanges = len(ovlAdded) + len(ovlUpgraded) + len(ovlDowngraded) + len(ovlRemoved)
+		if sumChanges == 0 && !raw {
+			cmdr.Info.Println(abroot.Trans("upgrade.noUpdateAvailable"))
+		} else if !raw {
+			cmdr.Info.Sprintf(abroot.Trans("upgrade.packageUpdateAvailable"), sumChanges)
+
+			err = renderPackageDiff(ovlAdded, ovlUpgraded, ovlDowngraded, ovlRemoved)
+			if err != nil {
+				return false, err
+			}
+		}
+	}
+
+	if raw {
+		newDigestIfHasUpdate := ""
+		if res {
+			newDigestIfHasUpdate = newDigest
+		}
+
+		out, err := json.Marshal(map[string]any{
+			"hasUpdate": res,
+			"newDigest": newDigestIfHasUpdate,
+			"systemPackageDiff": map[string][]diff.PackageDiff{
+				"added":      sysAdded,
+				"upgraded":   sysUpgraded,
+				"downgraded": sysDowngraded,
+				"removed":    sysRemoved,
+			},
+			"overlayPackageDiff": map[string][]diff.PackageDiff{
+				"added":      ovlAdded,
+				"upgraded":   ovlUpgraded,
+				"downgraded": ovlDowngraded,
+				"removed":    ovlRemoved,
+			},
+		})
+		if err != nil {
+			cmdr.Error.Println(err)
+		}
+
+		fmt.Println(string(out))
+	}
+
+	return res || sumChanges > 0, nil
+}
+
 func renderPackageDiff(added, upgraded, downgraded, removed []diff.PackageDiff) error {
 	pkgFmt := "%s  '%s' -> '%s'"
 

diff --git a/locales/en.yml b/locales/en.yml
@@ -97,6 +97,8 @@ upgrade:
   checkingPackageUpdate: "Checking for package updates..."
   systemUpdateAvailable: "There is an update for your system."
   packageUpdateAvailable: "There are %d package updates."
+  systemUpdateCheckFailed: "Failed to check for system updates: %s\n"
+  packageUpdateCheckFailed: "Failed to check for package updates: %s\n"
   noUpdateAvailable: "No update available."
   checkOnlyFlag: "check for updates but do not apply them"
   dryRunFlag: "perform a dry run of the operation"