fetch upgrade status per appliance

appgate · Jun 26, 2024 · ab03245 · ab03245
1 parent 5137767
commit ab03245
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/cmd/appliance/upgrade/complete.go b/cmd/appliance/upgrade/complete.go
@@ -198,7 +198,7 @@ func upgradeCompleteRun(cmd *cobra.Command, args []string, opts *upgradeComplete
 	if err != nil {
 		return err
 	}
-	plan, err := appliancepkg.NewUpgradePlan(rawAppliances, *initialStats, controlHost, filter, orderBy, descending)
+	plan, err := appliancepkg.NewUpgradePlan(a, rawAppliances, *initialStats, controlHost, filter, orderBy, descending)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/appliance/upgrade.go b/pkg/appliance/upgrade.go
@@ -2,6 +2,7 @@ package appliance
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -49,7 +50,7 @@ type UpgradePlan struct {
 	adminHostname           string
 }
 
-func NewUpgradePlan(appliances []openapi.Appliance, stats openapi.StatsAppliancesList, adminHostname string, filter map[string]map[string]string, orderBy []string, descending bool) (*UpgradePlan, error) {
+func NewUpgradePlan(api *Appliance, appliances []openapi.Appliance, stats openapi.StatsAppliancesList, adminHostname string, filter map[string]map[string]string, orderBy []string, descending bool) (*UpgradePlan, error) {
 	plan := UpgradePlan{
 		adminHostname: adminHostname,
 		stats:         stats,
@@ -123,7 +124,14 @@ func NewUpgradePlan(appliances []openapi.Appliance, stats openapi.StatsAppliance
 		}
 
 		// Get upgrade status and target version
-		upgradeStatus := stats.GetUpgrade()
+		upgradeStatus, err := api.UpgradeStatus(context.Background(), a.GetId())
+		if err != nil {
+			plan.Skipping = append(plan.Skipping, SkipUpgrade{
+				Appliance: a,
+				Reason:    ErrNoApplianceStats,
+			})
+			continue
+		}
 		if status := upgradeStatus.GetStatus(); status != UpgradeStatusReady {
 			plan.Skipping = append(plan.Skipping, SkipUpgrade{
 				Appliance: a,