feat(filestorage): add initial file-storage support (#681)

Author: kangasta

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Add commands for attaching, detaching, and listing policies attached to a user in managed object storage service.
+- Add command for listing and deleting file-storage instances.
 
 ## [3.29.0] - 2026-02-06
 

internal/commands/all/list_test.go

@@ -25,6 +25,7 @@ func mockListResponses(mService *smock.Service) {
 	mService.On("GetTags").Return(&upcloud.Tags{}, nil)
 	mService.On("GetKubernetesClusters", mock.Anything).Return(nil, nil)
 	mService.On("GetLoadBalancers", mock.Anything).Return(nil, nil)
+	mService.On("GetFileStorages", mock.Anything).Return(nil, nil)
 }
 
 var networks = &upcloud.Networks{Networks: []upcloud.Network{

internal/commands/all/resource.go

@@ -13,6 +13,7 @@ import (
 	"github.com/UpCloudLtd/progress/messages"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/database"
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/filestorage"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/kubernetes"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/loadbalancer"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/network"
@@ -31,6 +32,7 @@ const (
 	includeHelp = "Include resources matching the given name. If defined multiple times, resource is included if it matches any of the given names. `*` matches all resources."
 	excludeHelp = "Exclude resources matching the given name. If defined multiple times, resource is included if it matches any of the given names."
 
+	typeFileStorage       = "file-storage"
 	typeKubernetes        = "kubernetes-cluster"
 	typeLoadBalancer      = "load-balancer"
 	typeCertificateBundle = "certificate-bundle"
@@ -147,7 +149,7 @@ func findResources[T any](exec commands.Executor, wg *sync.WaitGroup, returnChan
 
 func ListResources(exec commands.Executor, include, exclude []string) ([]Resource, error) {
 	var resources []Resource
-	returnChan := make(chan findResult, 12)
+	returnChan := make(chan findResult, 13)
 
 	var wg sync.WaitGroup
 
@@ -163,7 +165,7 @@ func ListResources(exec commands.Executor, include, exclude []string) ([]Resourc
 	findResources(exec, &wg, returnChan, &resolver.CachingStorage{Access: "private"}, include, exclude)
 	findResources(exec, &wg, returnChan, &cachingTag{}, include, exclude)
 	findResources(exec, &wg, returnChan, &cachingCertificateBundle{}, include, exclude)
-
+	findResources(exec, &wg, returnChan, &resolver.CachingFileStorage{}, include, exclude)
 	wg.Wait()
 	close(returnChan)
 
@@ -187,6 +189,12 @@ func ListResources(exec commands.Executor, include, exclude []string) ([]Resourc
 
 func getResource(val any) (Resource, error) {
 	switch v := val.(type) {
+	case upcloud.FileStorage:
+		return Resource{
+			Name: v.Name,
+			Type: typeFileStorage,
+			UUID: v.UUID,
+		}, nil
 	case upcloud.LoadBalancer:
 		return Resource{
 			Name: v.Name,
@@ -265,6 +273,8 @@ func getResource(val any) (Resource, error) {
 
 func deleteResource(exec commands.Executor, resource Resource) (err error) {
 	switch resource.Type {
+	case typeFileStorage:
+		_, err = filestorage.Delete(exec, resource.UUID, true)
 	case typeKubernetes:
 		_, err = kubernetes.Delete(exec, resource.UUID, true)
 	case typeLoadBalancer:

internal/commands/base/base.go

@@ -11,6 +11,7 @@ import (
 	databaseindex "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/database/index"
 	databaseproperties "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/database/properties"
 	databasesession "github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/database/session"
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/filestorage"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/gateway"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/host"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/ipaddress"
@@ -188,6 +189,11 @@ func BuildCommands(rootCmd *cobra.Command, conf *config.Config) {
 	commands.BuildCommand(databaseindex.DeleteCommand(), indexCommand.Cobra(), conf)
 	commands.BuildCommand(databaseindex.ListCommand(), indexCommand.Cobra(), conf)
 
+	// FileStorage
+	filestorageCommand := commands.BuildCommand(filestorage.BaseFileStorageCommand(), rootCmd, conf)
+	commands.BuildCommand(filestorage.ListCommand(), filestorageCommand.Cobra(), conf)
+	commands.BuildCommand(filestorage.DeleteCommand(), filestorageCommand.Cobra(), conf)
+
 	// LoadBalancers
 	loadbalancerCommand := commands.BuildCommand(loadbalancer.BaseLoadBalancerCommand(), rootCmd, conf)
 	commands.BuildCommand(loadbalancer.ListCommand(), loadbalancerCommand.Cobra(), conf)

internal/commands/filestorage/delete.go

@@ -0,0 +1,71 @@
+package filestorage
+
+import (
+	"fmt"
+
+	"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/spf13/pflag"
+
+	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
+)
+
+// DeleteCommand creates the "file-storage delete" command
+func DeleteCommand() commands.Command {
+	return &deleteCommand{
+		BaseCommand: commands.New(
+			"delete",
+			"Delete a file storage service",
+			"upctl file-storage delete 55199a44-4751-4e27-9394-7c7661910be8",
+		),
+	}
+}
+
+type deleteCommand struct {
+	*commands.BaseCommand
+	resolver.CachingFileStorage
+	completion.FileStorage
+
+	wait config.OptionalBoolean
+}
+
+// InitCommand implements Command.InitCommand
+func (c *deleteCommand) InitCommand() {
+	flags := &pflag.FlagSet{}
+	config.AddToggleFlag(flags, &c.wait, "wait", false, "Wait until the file storage instance has been deleted before returning.")
+	c.AddFlags(flags)
+}
+
+func Delete(exec commands.Executor, uuid string, wait bool) (output.Output, error) {
+	svc := exec.All()
+	msg := fmt.Sprintf("Deleting file storage service %v", uuid)
+	exec.PushProgressStarted(msg)
+
+	err := svc.DeleteFileStorage(exec.Context(), &request.DeleteFileStorageRequest{
+		UUID: uuid,
+	})
+	if err != nil {
+		return commands.HandleError(exec, msg, err)
+	}
+
+	if wait {
+		exec.PushProgressUpdateMessage(msg, fmt.Sprintf("Waiting for file storage service %s to be deleted", uuid))
+		err = svc.WaitForFileStorageDeletion(exec.Context(), &request.WaitForFileStorageDeletionRequest{UUID: uuid})
+		if err != nil {
+			return commands.HandleError(exec, msg, err)
+		}
+		exec.PushProgressUpdateMessage(msg, msg)
+	}
+
+	exec.PushProgressSuccess(msg)
+
+	return output.None{}, nil
+}
+
+// Execute implements commands.MultipleArgumentCommand
+func (c *deleteCommand) Execute(exec commands.Executor, arg string) (output.Output, error) {
+	return Delete(exec, arg, c.wait.Value())
+}

internal/commands/filestorage/filestorage.go

@@ -0,0 +1,23 @@
+package filestorage
+
+import (
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands"
+)
+
+// BaseFileStorageCommand creates the base "file-storage" command
+func BaseFileStorageCommand() commands.Command {
+	baseCmd := commands.New("file-storage", "Manage file storage services")
+
+	return &filestorageCommand{
+		BaseCommand: baseCmd,
+	}
+}
+
+type filestorageCommand struct {
+	*commands.BaseCommand
+}
+
+// InitCommand implements Command.InitCommand
+func (c *filestorageCommand) InitCommand() {
+	c.Cobra().Aliases = []string{"nfs", "filestorage"}
+}

internal/commands/filestorage/list.go

@@ -0,0 +1,65 @@
+package filestorage
+
+import (
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands"
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/output"
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/paging"
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/ui"
+	"github.com/spf13/pflag"
+
+	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
+)
+
+// ListCommand creates the "objectstorage list" command
+func ListCommand() commands.Command {
+	return &listCommand{
+		BaseCommand: commands.New("list", "List file storage services", "upctl file-storage list"),
+	}
+}
+
+type listCommand struct {
+	*commands.BaseCommand
+	paging.PageParameters
+}
+
+func (c *listCommand) InitCommand() {
+	fs := &pflag.FlagSet{}
+	c.ConfigureFlags(fs)
+	c.AddFlags(fs)
+}
+
+// ExecuteWithoutArguments implements commands.NoArgumentCommand
+func (c *listCommand) ExecuteWithoutArguments(exec commands.Executor) (output.Output, error) {
+	svc := exec.All()
+	filestorages, err := svc.GetFileStorages(exec.Context(), &request.GetFileStoragesRequest{
+		Page: c.Page(),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	rows := []output.TableRow{}
+	for _, filestorage := range filestorages {
+		rows = append(rows, output.TableRow{
+			filestorage.UUID,
+			filestorage.Name,
+			filestorage.Zone,
+			filestorage.OperationalState,
+			filestorage.SizeGiB,
+		})
+	}
+
+	return output.MarshaledWithHumanOutput{
+		Value: filestorages,
+		Output: output.Table{
+			Columns: []output.TableColumn{
+				{Key: "uuid", Header: "UUID", Colour: ui.DefaultUUUIDColours},
+				{Key: "name", Header: "Name"},
+				{Key: "zone", Header: "Zone"},
+				{Key: "operational_state", Header: "Operational state"},
+				{Key: "size_gib", Header: "Size (GiB)"},
+			},
+			Rows: rows,
+		},
+	}, nil
+}

internal/completion/filestorage.go

@@ -0,0 +1,29 @@
+package completion
+
+import (
+	"context"
+
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
+	"github.com/spf13/cobra"
+)
+
+// FileStorage implements argument completion for filestorages, by uuid or name.
+type FileStorage struct{}
+
+// make sure FileStorage implements the interface
+var _ Provider = FileStorage{}
+
+// CompleteArgument implements completion.Provider
+func (s FileStorage) CompleteArgument(ctx context.Context, svc service.AllServices, toComplete string) ([]string, cobra.ShellCompDirective) {
+	filestorages, err := svc.GetFileStorages(ctx, &request.GetFileStoragesRequest{})
+	if err != nil {
+		return None(toComplete)
+	}
+	var vals []string
+	for _, filesto := range filestorages {
+		vals = append(vals, filesto.UUID, filesto.Name)
+	}
+
+	return MatchStringPrefix(vals, toComplete, true), cobra.ShellCompDirectiveNoFileComp
+}