fix(service): Use correct service status

Author: novln

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/gorilla/websocket v1.4.1
 	github.com/iancoleman/strcase v0.1.3
-	github.com/koyeb/koyeb-api-client-go v0.0.0-20220112085253-fecd904ef385
+	github.com/koyeb/koyeb-api-client-go v0.0.0-20220202142608-40af05d1a354
 	github.com/kr/pretty v0.2.0 // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/manifoldco/promptui v0.7.0

go.sum

@@ -263,8 +263,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/koyeb/koyeb-api-client-go v0.0.0-20220112085253-fecd904ef385 h1:ASLNTq0aWpwvBcuVgjLWmcsezlFng+COs4GlxQvtlLc=
-github.com/koyeb/koyeb-api-client-go v0.0.0-20220112085253-fecd904ef385/go.mod h1:+oQfFj2WL3gi9Pb+UHbob4D7xaT52mPfKyH1UvWa4PQ=
+github.com/koyeb/koyeb-api-client-go v0.0.0-20220202142608-40af05d1a354 h1:I4QkW/+0nxJL1B/9KbugCPPmfu2cb92mx0OqpzK5ack=
+github.com/koyeb/koyeb-api-client-go v0.0.0-20220202142608-40af05d1a354/go.mod h1:+oQfFj2WL3gi9Pb+UHbob4D7xaT52mPfKyH1UvWa4PQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=

pkg/koyeb/apps_delete.go

@@ -3,6 +3,7 @@ package koyeb
 import (
 	"time"
 
+	"github.com/koyeb/koyeb-api-client-go/api/v1/koyeb"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -25,7 +26,7 @@ func (h *AppHandler) Delete(cmd *cobra.Command, args []string) error {
 				break
 			}
 			for _, svc := range res.GetServices() {
-				if svc.State.GetStatus() == "STOPPING" || svc.State.GetStatus() == "STOPPED" {
+				if svc.GetStatus() == koyeb.SERVICESTATUS_DELETING || svc.GetStatus() == koyeb.SERVICESTATUS_DELETED {
 					continue
 				}
 				log.Infof("Deleting service %s", svc.GetName())

pkg/koyeb/services_describe.go

@@ -75,7 +75,7 @@ func (r *DescribeServiceReply) Fields() []map[string]string {
 		"app":        renderer.FormatAppName(r.mapper, item.GetAppId(), r.full),
 		"name":       item.GetName(),
 		"version":    item.GetVersion(),
-		"status":     formatStatus(item.State.GetStatus()),
+		"status":     formatServiceStatus(item.GetStatus()),
 		"created_at": renderer.FormatTime(item.GetCreatedAt()),
 		"updated_at": renderer.FormatTime(item.GetUpdatedAt()),
 	}

pkg/koyeb/services_get.go

@@ -1,8 +1,6 @@
 package koyeb
 
 import (
-	"fmt"
-
 	"github.com/koyeb/koyeb-api-client-go/api/v1/koyeb"
 	"github.com/koyeb/koyeb-cli/pkg/koyeb/idmapper"
 	"github.com/koyeb/koyeb-cli/pkg/koyeb/renderer"
@@ -55,14 +53,14 @@ func (r *GetServiceReply) Fields() []map[string]string {
 		"app":        renderer.FormatAppName(r.mapper, item.GetAppId(), r.full),
 		"name":       item.GetName(),
 		"version":    item.GetVersion(),
-		"status":     formatStatus(item.State.GetStatus()),
+		"status":     formatServiceStatus(item.GetStatus()),
 		"created_at": renderer.FormatTime(item.GetCreatedAt()),
 	}
 
 	resp := []map[string]string{fields}
 	return resp
 }
 
-func formatStatus(status koyeb.ServiceStateStatus) string {
-	return fmt.Sprintf("%s", status)
+func formatServiceStatus(status koyeb.ServiceStatus) string {
+	return string(status)
 }

pkg/koyeb/services_list.go

@@ -81,7 +81,7 @@ func (r *ListServicesReply) Fields() []map[string]string {
 			"id":         renderer.FormatServiceID(r.mapper, item.GetId(), r.full),
 			"app":        renderer.FormatAppName(r.mapper, item.GetAppId(), r.full),
 			"name":       item.GetName(),
-			"status":     formatStatus(item.State.GetStatus()),
+			"status":     formatServiceStatus(item.GetStatus()),
 			"created_at": renderer.FormatTime(item.GetCreatedAt()),
 		}
 		resp = append(resp, fields)