refactor(server): use cobra to validate required flags

Author: kangasta

internal/commands/server/create.go

@@ -283,13 +283,13 @@ func (s *createCommand) InitCommand() {
 	// fs.BoolVar(&s.params.metadata, "metadata", def.metadata, "Enable metadata service.")
 	// fs.BoolVar(&s.params.remoteAccess, "remote-access-enabled", def.remoteAccess, "Enables or disables the remote access.")
 	s.AddFlags(fs)
+
+	s.Cobra().MarkFlagRequired("hostname") //nolint:errcheck
+	s.Cobra().MarkFlagRequired("zone")     //nolint:errcheck
 }
 
 // ExecuteWithoutArguments implements commands.NoArgumentCommand
 func (s *createCommand) ExecuteWithoutArguments(exec commands.Executor) (output.Output, error) {
-	if s.params.Hostname == "" || s.params.Zone == "" {
-		return nil, fmt.Errorf("hostname, zone and some password delivery method are required")
-	}
 	if s.params.os == defaultCreateParams.os && s.params.PasswordDelivery == "none" && s.params.sshKeys == nil {
 		return nil, fmt.Errorf("a password-delivery method, ssh-keys or a custom image must be specified")
 	}

internal/commands/server/create_test.go

@@ -8,11 +8,11 @@ import (
 	"github.com/UpCloudLtd/upcloud-cli/internal/commands/storage"
 	"github.com/UpCloudLtd/upcloud-cli/internal/config"
 	smock "github.com/UpCloudLtd/upcloud-cli/internal/mock"
+	"github.com/UpCloudLtd/upcloud-cli/internal/mockexecute"
 	internal "github.com/UpCloudLtd/upcloud-cli/internal/service"
 
 	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
 	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/request"
-	"github.com/gemalto/flume"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
@@ -376,15 +376,15 @@ func TestCreateServer(t *testing.T) {
 				"--title", "title",
 				"--zone", "zone",
 			},
-			error: "hostname, zone and some password delivery method are required",
+			error: `required flag(s) "hostname" not set`,
 		},
 		{
 			name: "zone is missing",
 			args: []string{
 				"--title", "title",
 				"--hostname", "hostname",
 			},
-			error: "hostname, zone and some password delivery method are required",
+			error: `required flag(s) "zone" not set`,
 		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
@@ -399,10 +399,9 @@ func TestCreateServer(t *testing.T) {
 			mService.On("GetStorages", mock.Anything).Return(storages, nil)
 
 			c := commands.BuildCommand(testCmd, nil, conf)
-			err := c.Cobra().Flags().Parse(test.args)
-			assert.NoError(t, err)
 
-			_, err = c.(commands.NoArgumentCommand).ExecuteWithoutArguments(commands.NewExecutor(conf, mService, flume.New("test")))
+			c.Cobra().SetArgs(test.args)
+			_, err := mockexecute.MockExecute(c, mService, conf)
 
 			if test.error != "" {
 				if err == nil {

internal/commands/server/load.go

@@ -47,16 +47,14 @@ func (s *loadCommand) InitCommand() {
 	flagSet.StringVar(&s.params.StorageUUID, "storage", defaultLoadParams.StorageUUID, "The UUID of the storage to be loaded in the CD-ROM device.")
 
 	s.AddFlags(flagSet)
+
+	s.Cobra().MarkFlagRequired("storage") //nolint:errcheck
 }
 
 // Execute implements commands.MultipleArgumentCommand
 func (s *loadCommand) Execute(exec commands.Executor, uuid string) (output.Output, error) {
 	svc := exec.Storage()
 
-	if s.params.StorageUUID == "" {
-		return nil, fmt.Errorf("storage is required")
-	}
-
 	strg, err := storage.SearchSingleStorage(s.params.StorageUUID, svc)
 	if err != nil {
 		return nil, err

internal/commands/server/load_test.go

@@ -6,11 +6,11 @@ import (
 	"github.com/UpCloudLtd/upcloud-cli/internal/commands"
 	"github.com/UpCloudLtd/upcloud-cli/internal/config"
 	smock "github.com/UpCloudLtd/upcloud-cli/internal/mock"
+	"github.com/UpCloudLtd/upcloud-cli/internal/mockexecute"
 	internal "github.com/UpCloudLtd/upcloud-cli/internal/service"
 
 	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
 	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/request"
-	"github.com/gemalto/flume"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
@@ -66,7 +66,7 @@ func TestLoadCDROMCommand(t *testing.T) {
 		{
 			name:  "storage is missing",
 			args:  []string{},
-			error: "storage is required",
+			error: `required flag(s) "storage" not set`,
 		},
 		{
 			name: "storage is provided",
@@ -89,13 +89,9 @@ func TestLoadCDROMCommand(t *testing.T) {
 			mService.On(targetMethod, &test.loadReq).Return(&details, nil)
 
 			c := commands.BuildCommand(testCmd, nil, conf)
-			err := c.Cobra().Flags().Parse(test.args)
-			assert.NoError(t, err)
 
-			_, err = c.(commands.MultipleArgumentCommand).Execute(
-				commands.NewExecutor(conf, mService, flume.New("test")),
-				Server1.UUID,
-			)
+			c.Cobra().SetArgs(append(test.args, Server1.UUID))
+			_, err := mockexecute.MockExecute(c, mService, conf)
 
 			if test.error != "" {
 				if err == nil {