fix(all): assume resource was deleted on HTTP 404 response (#565)

Author: kangasta

CHANGELOG.md

@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - stack destroy command for supabase, dokku and starter-kit
 - Add devices list to `server show` output.
 
+### Fixed
+
+- In `upctl all purge`, if resource deletion fails with HTTP 404 status, consider the resource deleted.
+
 ## [3.24.1] - 2025-10-14
 
 ### Changed

internal/commands/all/resource.go

@@ -23,6 +23,7 @@ import (
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/servergroup"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/storage"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver"
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/utils"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
 )
 
@@ -344,8 +345,9 @@ func DeleteResources(exec commands.Executor, resources []Resource, workerCount i
 				}
 			}(i)
 		case res := <-returnChan:
-			// Requeue failed deletes after 5 seconds
-			if res.Error != nil {
+			// Requeue failed deletes after 5 seconds.
+			// Assume resource has been deleted, if delete failed with HTTP 404 status.
+			if res.Error != nil && !utils.IsNotFoundError(res.Error) {
 				exec.PushProgressUpdate(messages.Update{
 					Key:     res.Resource.Key(),
 					Message: fmt.Sprintf("Waiting 5 seconds before retrying to delete %s %s", res.Resource.Type, res.Resource.Name),

internal/commands/database/delete.go

@@ -1,17 +1,15 @@
 package database
 
 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-cli/v3/internal/utils"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
 	"github.com/spf13/pflag"
 )
@@ -99,8 +97,7 @@ func waitUntilDatabaseDeleted(exec commands.Executor, uuid string) error {
 				UUID: uuid,
 			})
 			if err != nil {
-				var ucErr *upcloud.Problem
-				if errors.As(err, &ucErr) && ucErr.Status == http.StatusNotFound {
+				if utils.IsNotFoundError(err) {
 					return nil
 				}
 

internal/commands/error.go

@@ -24,6 +24,10 @@ func (h handledError) Error() string {
 	return h.err.Error()
 }
 
+func (h handledError) Unwrap() error {
+	return h.err
+}
+
 // outputError outputs given error to progress log, if the error has not been already handled by HandleError
 func outputError(arg string, err error, exec Executor) {
 	if err == nil {

internal/commands/kubernetes/delete.go

@@ -1,19 +1,17 @@
 package kubernetes
 
 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-cli/v3/internal/utils"
 	"github.com/spf13/pflag"
 
-	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
 )
 
@@ -96,8 +94,7 @@ func waitUntilClusterDeleted(exec commands.Executor, uuid string) error {
 				UUID: uuid,
 			})
 			if err != nil {
-				var ucErr *upcloud.Problem
-				if errors.As(err, &ucErr) && ucErr.Status == http.StatusNotFound {
+				if utils.IsNotFoundError(err) {
 					return nil
 				}
 

internal/utils/errors.go

@@ -0,0 +1,17 @@
+package utils
+
+import (
+	"errors"
+	"net/http"
+
+	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
+)
+
+func IsNotFoundError(err error) bool {
+	var ucErr *upcloud.Problem
+	if errors.As(err, &ucErr) && ucErr.Status == http.StatusNotFound {
+		return true
+	}
+
+	return false
+}