feat(objsto): add --force flag to delete command (#678)

Author: kangasta

.github/workflows/examples.yml

@@ -62,5 +62,5 @@ jobs:
         timeout-minutes: 5
         run: upctl all purge --include example-upctl-*
       - name: List remaining resources
-        run: upctl all list --include *tf-acc-test* --exclude *persistent*
+        run: upctl all list --include example-upctl-*
         if: ${{ failure() }}

CHANGELOG.md

@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Unconditionally enable colors if the [FORCE_COLOR](https://force-color.org) environment variable is set to a non-empty value.
+- Add `--force` flag to `object-storage delete` command.
+
+### Changed
+
+- Use `--force` flag in `all purge` command when deleting object storage instances instead of deleting sub-resources one-by-one.
 
 ## [3.28.0] - 2026-01-14
 

examples/use_object_storage.md

@@ -41,8 +41,8 @@ Once not needed anymore, delete the user:
 upctl object-storage user delete ${prefix}service --username ${prefix}user
 ```
 
-Delete also the managed object storage service along with its buckets:
+Delete also the managed object storage service along with all its sub-resources such as buckets and users:
 
 ```sh
-upctl object-storage delete ${prefix}service --delete-buckets
+upctl object-storage delete ${prefix}service --force
 ```

go.mod

@@ -6,7 +6,7 @@ require (
 	dario.cat/mergo v1.0.2
 	github.com/UpCloudLtd/progress v1.1.0
 	github.com/UpCloudLtd/upcloud-go-api/credentials v0.1.1
-	github.com/UpCloudLtd/upcloud-go-api/v8 v8.34.0
+	github.com/UpCloudLtd/upcloud-go-api/v8 v8.34.3
 	github.com/adrg/xdg v0.5.3
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
 	github.com/jedib0t/go-pretty/v6 v6.7.8

go.sum

@@ -28,8 +28,8 @@ github.com/UpCloudLtd/progress v1.1.0 h1:RT2DNMlvJy1R8WZr2dKdDgR+xD1+3+UdZauIfWr
 github.com/UpCloudLtd/progress v1.1.0/go.mod h1:iGxOnb9HvHW0yrLGUjHr0lxHhn7TehgWwh7a8NqK6iQ=
 github.com/UpCloudLtd/upcloud-go-api/credentials v0.1.1 h1:eTfQsv58ufALOk9BZ7WbS/i7pMUD11RnYYpRPsz0LdI=
 github.com/UpCloudLtd/upcloud-go-api/credentials v0.1.1/go.mod h1:7OtVs2UqtfvjkC1HfE+Oud0MnbMv7qUWnbEgxnTAqts=
-github.com/UpCloudLtd/upcloud-go-api/v8 v8.34.0 h1:MCrAV9HwUFOzFJ0OEKIlgXefaZVXo23PuAC/ctZwfFo=
-github.com/UpCloudLtd/upcloud-go-api/v8 v8.34.0/go.mod h1:NBh1d/ip1bhdAIhuPWbyPme7tbLzDTV7dhutUmU1vg8=
+github.com/UpCloudLtd/upcloud-go-api/v8 v8.34.3 h1:7ba03u4L5LafZPVO2k6B0/f114k5dFF3GtAN7FEKfno=
+github.com/UpCloudLtd/upcloud-go-api/v8 v8.34.3/go.mod h1:NBh1d/ip1bhdAIhuPWbyPme7tbLzDTV7dhutUmU1vg8=
 github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78=
 github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=

internal/commands/all/purge_test.go

@@ -24,7 +24,8 @@ func TestPurgeCommand(t *testing.T) {
 			args: []string{"--include", "*tf-acc-test*", "--exclude", "*persistent*"},
 			called: [][]any{
 				{"DeleteManagedObjectStorage", &request.DeleteManagedObjectStorageRequest{
-					UUID: objectStorages[0].UUID,
+					UUID:  objectStorages[0].UUID,
+					Force: true,
 				}},
 				{"DeleteNetwork", &request.DeleteNetworkRequest{
 					UUID: networks.Networks[0].UUID,

internal/commands/all/resource.go

@@ -276,7 +276,7 @@ func deleteResource(exec commands.Executor, resource Resource) (err error) {
 	case typeRouter:
 		_, err = router.Delete(exec, resource.UUID)
 	case typeObjectStorage:
-		_, err = objectstorage.Delete(exec, resource.UUID, true, true, true, true)
+		_, err = objectstorage.Delete(exec, resource.UUID, false, false, false, true, true)
 	case typeDatabase:
 		_, err = database.Delete(exec, resource.UUID, true, true)
 	case typeServer:

internal/commands/objectstorage/delete.go

@@ -33,6 +33,7 @@ type deleteCommand struct {
 	deleteUsers    config.OptionalBoolean
 	deletePolicies config.OptionalBoolean
 	deleteBuckets  config.OptionalBoolean
+	force          config.OptionalBoolean
 	wait           config.OptionalBoolean
 }
 
@@ -42,6 +43,7 @@ func (c *deleteCommand) InitCommand() {
 	config.AddToggleFlag(flags, &c.deleteUsers, "delete-users", false, "Delete all users from the service before deleting the object storage instance.")
 	config.AddToggleFlag(flags, &c.deletePolicies, "delete-policies", false, "Delete all policies from the service before deleting the object storage instance.")
 	config.AddToggleFlag(flags, &c.deleteBuckets, "delete-buckets", false, "Delete all buckets from the service before deleting the object storage instance.")
+	config.AddToggleFlag(flags, &c.force, "force", false, "Delete the object storage instance even if there are buckets or other sub-resources that would normally block the deletion.")
 	config.AddToggleFlag(flags, &c.wait, "wait", false, "Wait until the object storage instance has been deleted before returning.")
 	c.AddFlags(flags)
 
@@ -50,7 +52,7 @@ func (c *deleteCommand) InitCommand() {
 	commands.SetSubcommandDeprecationHelp(c, []string{"objectstorage", "objsto"})
 }
 
-func Delete(exec commands.Executor, uuid string, deleteUsers, deletePolicies, deleteBuckets, wait bool) (output.Output, error) {
+func Delete(exec commands.Executor, uuid string, deleteUsers, deletePolicies, deleteBuckets, force, wait bool) (output.Output, error) {
 	svc := exec.All()
 	msg := fmt.Sprintf("Deleting object storage service %v", uuid)
 	exec.PushProgressStarted(msg)
@@ -124,7 +126,8 @@ func Delete(exec commands.Executor, uuid string, deleteUsers, deletePolicies, de
 
 	exec.PushProgressUpdateMessage(msg, msg)
 	err := svc.DeleteManagedObjectStorage(exec.Context(), &request.DeleteManagedObjectStorageRequest{
-		UUID: uuid,
+		UUID:  uuid,
+		Force: force,
 	})
 	if err != nil {
 		return commands.HandleError(exec, msg, err)
@@ -150,7 +153,7 @@ func (c *deleteCommand) Execute(exec commands.Executor, arg string) (output.Outp
 	// TODO: Remove this in the future
 	commands.SetSubcommandExecutionDeprecationMessage(c, []string{"objectstorage", "objsto"}, "object-storage")
 
-	return Delete(exec, arg, c.deleteUsers.Value(), c.deletePolicies.Value(), c.deleteBuckets.Value(), c.wait.Value())
+	return Delete(exec, arg, c.deleteUsers.Value(), c.deletePolicies.Value(), c.deleteBuckets.Value(), c.force.Value(), c.wait.Value())
 }
 
 func waitUntilBucketsHaveBeenDeleted(exec commands.Executor, serviceUUID string) error {

internal/commands/objectstorage/delete_test.go

@@ -55,6 +55,15 @@ func TestDeleteCommand(t *testing.T) {
 			flags: []string{"--delete-users", "--delete-policies"},
 			req:   request.DeleteManagedObjectStorageRequest{UUID: objectstorage.UUID},
 		},
+		{
+			name:  "delete with UUID using force",
+			arg:   objectstorage.UUID,
+			flags: []string{"--force"},
+			req: request.DeleteManagedObjectStorageRequest{
+				UUID:  objectstorage.UUID,
+				Force: true,
+			},
+		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			mService := smock.Service{}

internal/commands/stack/stackops.go

@@ -333,7 +333,7 @@ func DestroyStack(exec commands.Executor, name, zone string, deleteStorage, dele
 			}
 
 			if deleteObjectStorage {
-				_, err = objectstorage.Delete(exec, storageUUID, true, true, true, true)
+				_, err = objectstorage.Delete(exec, storageUUID, false, false, false, true, true)
 				if err != nil {
 					return fmt.Errorf("failed to delete object storage: %w", err)
 				}