From 19d1a3e040983eb31b8fdaa296798974390a426e Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Wed, 1 Nov 2023 14:46:44 +0000 Subject: [PATCH] Fix upgrade for single hosts Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- cmd/upgrade.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/cmd/upgrade.go b/cmd/upgrade.go index fcd7753..53fa908 100644 --- a/cmd/upgrade.go +++ b/cmd/upgrade.go @@ -73,9 +73,9 @@ func runUpgradeE(cmd *cobra.Command, args []string) error { return fmt.Errorf("--all or --host is required") } - // if len(owner) == 0 { - // return fmt.Errorf("owner is required") - // } + if !allHosts && len(owner) == 0 { + return fmt.Errorf("owner is required") + } if len(pat) == 0 { return fmt.Errorf("pat is required") @@ -98,23 +98,21 @@ func runUpgradeE(cmd *cobra.Command, args []string) error { if err := json.Unmarshal([]byte(hosts), &hostsList); err != nil { return err } - reachableHosts := []Host{} - for _, h := range hostsList { - reachableHosts = append(reachableHosts, h) - } + if len(hostsList) == 0 { - if len(reachableHosts) == 0 { - return fmt.Errorf("no reachable hosts found") + return fmt.Errorf("no hosts found") } - upgradeHosts = reachableHosts - + upgradeHosts = hostsList } else { + + // AE: TODO call ListRunners to determine the values for: Reachable and Status. upgradeHosts = []Host{ { Name: host, Customer: owner, Reachable: true, + Status: "running", }, } }