filter inactive

appgate · Jul 2, 2024 · 8e656b5 · 8e656b5
1 parent 936dbfb
commit 8e656b5
Show file tree

Hide file tree

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

diff --git a/pkg/appliance/functions.go b/pkg/appliance/functions.go
@@ -148,6 +148,19 @@ func FilterAvailable(appliances []openapi.Appliance, stats []openapi.StatsApplia
 	return result, offline, err
 }
 
+func FilterActivated(appliances []openapi.Appliance) (active []openapi.Appliance, inactive []openapi.Appliance) {
+	inactive = []openapi.Appliance{}
+	active = []openapi.Appliance{}
+	for _, a := range appliances {
+		if a.GetActivated() {
+			active = append(active, a)
+			continue
+		}
+		inactive = append(inactive, a)
+	}
+	return
+}
+
 func GetApplianceVersion(appliance openapi.Appliance, stats openapi.StatsAppliancesList) (*version.Version, error) {
 	for _, s := range stats.GetData() {
 		if s.GetId() == appliance.GetId() {