Refactored 'start' command (scaleway#80)

Author: moul

pkg/cli/start.go

@@ -5,13 +5,9 @@
 package cli
 
 import (
-	"fmt"
-	"os"
-	"time"
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 
-	log "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 cmdStart = &Command{
@@ -32,46 +28,22 @@ var startW bool          // -w flag
 var startTimeout float64 // -T flag
 var startHelp bool       // -h, --help flag
 
-func runStart(cmd *Command, args []string) {
+func runStart(cmd *Command, rawArgs []string) {
 	if startHelp {
 		cmd.PrintUsage()
 	}
-	if len(args) < 1 {
+	if len(rawArgs) < 1 {
 		cmd.PrintShortUsage()
 	}
 
-	hasError := false
-	errChan := make(chan error)
-	successChan := make(chan bool)
-	remainingItems := len(args)
-
-	for i := range args {
-		needle := args[i]
-		go api.StartServerOnce(cmd.API, needle, startW, successChan, errChan)
-	}
-
-	if startTimeout > 0 {
-		go func() {
-			time.Sleep(time.Duration(startTimeout*1000) * time.Millisecond)
-			log.Fatalf("Operation timed out")
-		}()
-	}
-
-	for {
-		select {
-		case _ = <-successChan:
-			remainingItems--
-		case err := <-errChan:
-			log.Errorf(fmt.Sprintf("%s", err))
-			remainingItems--
-			hasError = true
-		}
-
-		if remainingItems == 0 {
-			break
-		}
+	args := commands.StartArgs{
+		Servers: rawArgs,
+		Timeout: startTimeout,
+		Wait:    startW,
 	}
-	if hasError {
-		os.Exit(1)
+	ctx := cmd.GetContext(rawArgs)
+	err := commands.RunStart(ctx, args)
+	if err != nil {
+		logrus.Fatalf("Cannot execute 'start': %v", err)
 	}
 }

pkg/commands/start.go

@@ -0,0 +1,59 @@
+// 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"
+	"time"
+
+	"github.com/scaleway/scaleway-cli/pkg/api"
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+)
+
+// StartArgs are flags for the `RunStart` function
+type StartArgs struct {
+	Servers []string
+	Wait    bool
+	Timeout float64
+}
+
+// RunStart is the handler for 'scw start'
+func RunStart(ctx CommandContext, args StartArgs) error {
+	hasError := false
+	errChan := make(chan error)
+	successChan := make(chan bool)
+	remainingItems := len(args.Servers)
+
+	for _, needle := range args.Servers {
+		go api.StartServerOnce(ctx.API, needle, args.Wait, successChan, errChan)
+	}
+
+	if args.Timeout > 0 {
+		go func() {
+			time.Sleep(time.Duration(args.Timeout*1000) * time.Millisecond)
+			// FIXME: avoid use of fatalf
+			logrus.Fatalf("Operation timed out")
+		}()
+	}
+
+	for {
+		select {
+		case _ = <-successChan:
+			remainingItems--
+		case err := <-errChan:
+			logrus.Errorf(fmt.Sprintf("%s", err))
+			remainingItems--
+			hasError = true
+		}
+
+		if remainingItems == 0 {
+			break
+		}
+	}
+	if hasError {
+		return fmt.Errorf("at least 1 server failed to start")
+	}
+	return nil
+}