compose delete

Author: Sadzeih

pkg/koyeb/compose.go

@@ -59,6 +59,7 @@ func NewComposeCmd() *cobra.Command {
 	cmd.Flags().BoolP("verbose", "v", false, "Tails service logs to have more information about your deployment.")
 
 	cmd.AddCommand(NewComposeLogsCmd())
+	cmd.AddCommand(NewComposeDeleteCmd())
 
 	return cmd
 }
@@ -128,12 +129,25 @@ func (h *KoyebComposeHandler) Compose(ctx *CLIContext, koyebCompose *KoyebCompos
 		}
 	}
 
-	log.Infof("\nYour app %v has been succesfully deployed 🚀", appName)
+	log.Infof("Your app %v has been succesfully deployed 🚀", appName)
 
 	return nil
 }
 
-func (h *KoyebComposeHandler) isMonitoringEndState(status koyeb.DeploymentStatus) bool {
+func isAppMonitoringEndState(status koyeb.AppStatus) bool {
+	endStates := []koyeb.AppStatus{
+		koyeb.APPSTATUS_DELETED,
+	}
+
+	for _, endState := range endStates {
+		if status == endState {
+			return true
+		}
+	}
+	return false
+}
+
+func (h *KoyebComposeHandler) isDeploymentMonitoringEndState(status koyeb.DeploymentStatus) bool {
 	endStates := []koyeb.DeploymentStatus{
 		koyeb.DEPLOYMENTSTATUS_HEALTHY,
 		koyeb.DEPLOYMENTSTATUS_DEGRADED,
@@ -238,13 +252,14 @@ func (h *KoyebComposeHandler) MonitorService(ctx *CLIContext, deploymentId, serv
 			}
 		}
 
-		if h.isMonitoringEndState(currentStatus) {
+		if h.isDeploymentMonitoringEndState(currentStatus) {
 			break
 		}
 
 		time.Sleep(5 * time.Second)
 	}
 
+	fmt.Printf("\n")
 	if previousStatus == koyeb.DEPLOYMENTSTATUS_HEALTHY {
 		log.Infof("Succcessfully deployed %v ✅", serviceName)
 	} else {

pkg/koyeb/compose_delete.go

@@ -0,0 +1,83 @@
+package koyeb
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/briandowns/spinner"
+	"github.com/koyeb/koyeb-api-client-go/api/v1/koyeb"
+	"github.com/koyeb/koyeb-cli/pkg/koyeb/errors"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+func NewComposeDeleteCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "delete",
+		Short: "d",
+		Args:  cobra.ExactArgs(1),
+		RunE: WithCLIContext(func(ctx *CLIContext, cmd *cobra.Command, args []string) error {
+			composeFile, err := parseComposeFile(args[0])
+			if err != nil {
+				return err
+			}
+
+			if composeFile == nil {
+				return nil
+			}
+
+			appList, _, err := ctx.Client.AppsApi.ListApps(ctx.Context).Name(*composeFile.Name).Execute()
+			if err != nil {
+				return err
+			}
+			if !appList.HasApps() || len(appList.Apps) == 0 {
+				return nil
+			}
+
+			if _, _, err := ctx.Client.AppsApi.DeleteApp(ctx.Context, appList.Apps[0].GetId()).Execute(); err != nil {
+				return err
+			}
+
+			return monitorAppDelete(ctx, appList.Apps[0].GetId())
+		}),
+	}
+
+	return cmd
+}
+
+func monitorAppDelete(ctx *CLIContext, appId string) error {
+	s := spinner.New(spinner.CharSets[21], 100*time.Millisecond, spinner.WithColor("red"))
+	s.Start()
+	defer s.Stop()
+
+	previousStatus := koyeb.AppStatus("")
+	for {
+		resApp, resp, err := ctx.Client.AppsApi.GetApp(ctx.Context, appId).Execute()
+		if err != nil {
+			return errors.NewCLIErrorFromAPIError(
+				"Error while fetching deployment status",
+				err,
+				resp,
+			)
+		}
+
+		currentStatus := resApp.App.GetStatus()
+		if previousStatus != currentStatus {
+			previousStatus = currentStatus
+			s.Suffix = fmt.Sprintf(" Deleting app %s: %s", *resApp.App.Name, currentStatus)
+		}
+
+		if isAppMonitoringEndState(currentStatus) {
+			break
+		}
+
+		time.Sleep(5 * time.Second)
+	}
+
+	fmt.Printf("\n")
+	if previousStatus == koyeb.APPSTATUS_DELETED {
+		log.Infof("Succcessfully deleted ✅♻️")
+	}
+
+	return nil
+}