Support of scw stop -w, --wait option

Author: moul

README.md

@@ -954,6 +954,7 @@ Same as Hack, without step 5
 
 * `scw {create,run}`, prefixing root-volume with the server hostname ([#63](https://github.com/scaleway/scaleway-cli/issues/63))
 * `scw {create,run} IMAGE`, *IMAGE* can be a snapshot ([#19](https://github.com/scaleway/scaleway-cli/issues/19))
+* Support of `scw stop -w, --wait` option
 
 #### Fixes
 

api/helpers.go

@@ -331,6 +331,15 @@ func WaitForServerReady(api *ScalewayAPI, serverID string) (*ScalewayServer, err
 	return server, nil
 }
 
+// WaitForServerStopped wait for a server state to be stopped
+func WaitForServerStopped(api *ScalewayAPI, serverID string) (*ScalewayServer, error) {
+	server, err := WaitForServerState(api, serverID, "stopped")
+	if err != nil {
+		return nil, err
+	}
+	return server, nil
+}
+
 // ByCreationDate sorts images by CreationDate field
 type ByCreationDate []ScalewayImageInterface
 

commands/stop.go

@@ -7,9 +7,11 @@ package commands
 import (
 	"fmt"
 	"os"
+	"time"
 
 	log "github.com/Sirupsen/logrus"
 
+	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
 )
 
@@ -23,18 +25,23 @@ var cmdStop = &types.Command{
     $ scw stop -t my-running-server my-second-running-server
     $ scw stop $(scw ps -q)
     $ scw stop $(scw ps | grep mysql | awk '{print $1}')
+    $ scw stop server && stop wait server
+    $ scw stop -w server
 `,
 }
 
 func init() {
 	cmdStop.Flag.BoolVar(&stopT, []string{"t", "-terminate"}, false, "Stop and trash a server with its volumes")
 	cmdStop.Flag.BoolVar(&stopHelp, []string{"h", "-help"}, false, "Print usage")
+	cmdStop.Flag.BoolVar(&stopW, []string{"w", "-wait"}, false, "Synchronous stop. Wait for SSH to be ready")
 }
 
 // Flags
 var stopT bool    // -t flag
 var stopHelp bool // -h, --help flag
+var stopW bool    // -w, --wait flat
 
+// FIXME: parallelize stop when stopping multiple servers
 func runStop(cmd *types.Command, args []string) {
 	if stopHelp {
 		cmd.PrintUsage()
@@ -45,21 +52,31 @@ func runStop(cmd *types.Command, args []string) {
 
 	hasError := false
 	for _, needle := range args {
-		server := cmd.API.GetServerID(needle)
+		serverID := cmd.API.GetServerID(needle)
 		action := "poweroff"
 		if stopT {
 			action = "terminate"
 		}
-		err := cmd.API.PostServerAction(server, action)
+		err := cmd.API.PostServerAction(serverID, action)
 		if err != nil {
 			if err.Error() != "server should be running" && err.Error() != "server is being stopped or rebooted" {
-				log.Warningf("failed to stop server %s: %s", server, err)
+				log.Warningf("failed to stop server %s: %s", serverID, err)
 				hasError = true
 			}
 		} else {
+			if stopW {
+				// We wait for 10 seconds which is the minimal amount of time needed for a server to stop
+				time.Sleep(10 * time.Second)
+				_, err = api.WaitForServerStopped(cmd.API, serverID)
+				if err != nil {
+					log.Errorf("failed to wait for server %s: %v", serverID, err)
+					hasError = true
+				}
+			}
 			fmt.Println(needle)
 		}
 	}
+
 	if hasError {
 		os.Exit(1)
 	}

commands/wait.go

@@ -6,10 +6,10 @@ package commands
 
 import (
 	"os"
-	"time"
 
 	log "github.com/Sirupsen/logrus"
 
+	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
 )
 
@@ -38,19 +38,14 @@ func runWait(cmd *types.Command, args []string) {
 	hasError := false
 	for _, needle := range args {
 		serverIdentifier := cmd.API.GetServerID(needle)
-		for {
-			server, err := cmd.API.GetServer(serverIdentifier)
-			if err != nil {
-				log.Errorf("failed to retrieve information from server %s: %s", serverIdentifier, err)
-				hasError = true
-				break
-			}
-			if server.State == "stopped" {
-				break
-			}
-			time.Sleep(1 * time.Second)
+
+		_, err := api.WaitForServerStopped(cmd.API, serverIdentifier)
+		if err != nil {
+			log.Errorf("failed to wait for server %s: %v", serverIdentifier, err)
+			hasError = true
 		}
 	}
+
 	if hasError {
 		os.Exit(1)
 	}