Refactored 'rename' command (scaleway#80)

Author: moul

pkg/cli/rename.go

@@ -5,9 +5,9 @@
 package cli
 
 import (
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 
-	"github.com/scaleway/scaleway-cli/pkg/api"
+	"github.com/scaleway/scaleway-cli/pkg/commands"
 )
 
 var cmdRename = &Command{
@@ -24,23 +24,21 @@ func init() {
 // Flags
 var renameHelp bool // -h, --help flag
 
-func runRename(cmd *Command, args []string) {
+func runRename(cmd *Command, rawArgs []string) {
 	if renameHelp {
 		cmd.PrintUsage()
 	}
-	if len(args) != 2 {
+	if len(rawArgs) != 2 {
 		cmd.PrintShortUsage()
 	}
 
-	serverID := cmd.API.GetServerID(args[0])
-
-	var server api.ScalewayServerPatchDefinition
-	server.Name = &args[1]
-
-	err := cmd.API.PatchServer(serverID, server)
+	args := commands.RenameArgs{
+		Server:  rawArgs[0],
+		NewName: rawArgs[1],
+	}
+	ctx := cmd.GetContext(rawArgs)
+	err := commands.RunRename(ctx, args)
 	if err != nil {
-		log.Fatalf("Cannot rename server: %v", err)
-	} else {
-		cmd.API.Cache.InsertServer(serverID, *server.Name)
+		logrus.Fatalf("Cannot execute 'rename': %v", err)
 	}
 }

pkg/commands/rename.go

@@ -0,0 +1,33 @@
+// Copyright (C) 2015 Scaleway. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE.md file.
+
+package commands
+
+import (
+	"log"
+
+	"github.com/scaleway/scaleway-cli/pkg/api"
+)
+
+// RenameArgs are flags for the `RunRename` function
+type RenameArgs struct {
+	Server  string
+	NewName string
+}
+
+// RunRename is the handler for 'scw rename'
+func RunRename(ctx CommandContext, args RenameArgs) error {
+	serverID := ctx.API.GetServerID(args.Server)
+
+	var server api.ScalewayServerPatchDefinition
+	server.Name = &args.NewName
+
+	err := ctx.API.PatchServer(serverID, server)
+	if err != nil {
+		log.Fatalf("Cannot rename server: %v", err)
+	} else {
+		ctx.API.Cache.InsertServer(serverID, *server.Name)
+	}
+	return nil
+}