refactor(loadbalancer): use WaitForLoadBalancerDeletion from Go SDK (#472)

Author: kangasta

internal/commands/loadbalancer/delete.go

@@ -1,17 +1,13 @@
 package loadbalancer
 
 import (
-	"errors"
 	"fmt"
-	"net/http"
-	"time"
 
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/completion"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/config"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/output"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver"
-	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
 	"github.com/spf13/pflag"
 )
@@ -60,7 +56,9 @@ func Delete(exec commands.Executor, uuid string, wait bool) (output.Output, erro
 
 	if wait {
 		exec.PushProgressUpdateMessage(msg, fmt.Sprintf("Waiting for load balancer %s to be deleted", uuid))
-		err = waitUntilLoadBalancerDeleted(exec, uuid)
+		err = svc.WaitForLoadBalancerDeletion(exec.Context(), &request.WaitForLoadBalancerDeletionRequest{
+			UUID: uuid,
+		})
 		if err != nil {
 			return commands.HandleError(exec, msg, err)
 		}
@@ -80,30 +78,3 @@ func (s *deleteCommand) Execute(exec commands.Executor, arg string) (output.Outp
 
 	return Delete(exec, arg, s.wait.Value())
 }
-
-func waitUntilLoadBalancerDeleted(exec commands.Executor, uuid string) error {
-	ticker := time.NewTicker(5 * time.Second)
-	defer ticker.Stop()
-
-	ctx := exec.Context()
-	svc := exec.All()
-
-	for i := 0; ; i++ {
-		select {
-		case <-ticker.C:
-			_, err := svc.GetLoadBalancer(exec.Context(), &request.GetLoadBalancerRequest{
-				UUID: uuid,
-			})
-			if err != nil {
-				var ucErr *upcloud.Problem
-				if errors.As(err, &ucErr) && ucErr.Status == http.StatusNotFound {
-					return nil
-				}
-
-				return err
-			}
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-	}
-}