Refactored 'restart' command (scaleway#80)

Author: moul

pkg/cli/restart.go

@@ -5,10 +5,8 @@
 package cli
 
 import (
-	"fmt"
-	"os"
-
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/scaleway/scaleway-cli/pkg/commands"
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 )
 
 var cmdRestart = &Command{
@@ -25,28 +23,21 @@ func init() {
 // Flags
 var restartHelp bool // -h, --help flag
 
-func runRestart(cmd *Command, args []string) {
+func runRestart(cmd *Command, rawArgs []string) {
 	if restartHelp {
 		cmd.PrintUsage()
 	}
-	if len(args) < 1 {
+	if len(rawArgs) < 1 {
 		cmd.PrintShortUsage()
 	}
 
-	hasError := false
-	for _, needle := range args {
-		server := cmd.API.GetServerID(needle)
-		err := cmd.API.PostServerAction(server, "reboot")
-		if err != nil {
-			if err.Error() != "server is being stopped or rebooted" {
-				log.Errorf("failed to restart server %s: %s", server, err)
-				hasError = true
-			}
-		} else {
-			fmt.Println(needle)
-		}
-		if hasError {
-			os.Exit(1)
-		}
+	args := commands.RestartArgs{
+		Servers: rawArgs,
+	}
+	ctx := cmd.GetContext(rawArgs)
+	err := commands.RunRestart(ctx, args)
+	if err != nil {
+		logrus.Fatalf("Cannot execute 'restart': %v", err)
 	}
+
 }

pkg/commands/restart.go

@@ -0,0 +1,37 @@
+// 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 (
+	"fmt"
+
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+)
+
+// RestartArgs are flags for the `RunRestart` function
+type RestartArgs struct {
+	Servers []string
+}
+
+// RunRestart is the handler for 'scw restart'
+func RunRestart(ctx CommandContext, args RestartArgs) error {
+	hasError := false
+	for _, needle := range args.Servers {
+		server := ctx.API.GetServerID(needle)
+		err := ctx.API.PostServerAction(server, "reboot")
+		if err != nil {
+			if err.Error() != "server is being stopped or rebooted" {
+				logrus.Errorf("failed to restart server %s: %s", server, err)
+				hasError = true
+			}
+		} else {
+			fmt.Fprintln(ctx.Stdout, needle)
+		}
+		if hasError {
+			return fmt.Errorf("at least 1 server failed to restart")
+		}
+	}
+	return nil
+}