Support of 'scw run --attach' (#65)

Author: moul

README.md

@@ -576,6 +576,7 @@ Examples:
     $ scw run ubuntu-trusty
     $ scw run --name=mydocker docker docker run moul/nyancat:armhf
     $ scw run --bootscript=3.2.34 --env="boot=live rescue_image=http://j.mp/scaleway-ubuntu-trusty-tarball" 50GB bash
+    $ scw run attach alpine
 ```
 
 
@@ -1016,6 +1017,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 #### Features
 
+* Support of `scw run --attach` option ([#65](https://github.com/scaleway/scaleway-cli/issues/65))
 * `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

api/helpers.go

@@ -248,6 +248,7 @@ func CreateServer(api *ScalewayAPI, imageName string, name string, bootscript st
 		// FIXME: handle snapshots
 		inheritingVolume = true
 		image := api.GetImageID(imageName, false)
+		log.Debugf("COUCOU: %v", image)
 		if image != "" {
 			server.Image = &image
 		} else {

commands/run.go

@@ -24,6 +24,7 @@ var cmdRun = &types.Command{
     $ scw run ubuntu-trusty
     $ scw run --name=mydocker docker docker run moul/nyancat:armhf
     $ scw run --bootscript=3.2.34 --env="boot=live rescue_image=http://j.mp/scaleway-ubuntu-trusty-tarball" 50GB bash
+    $ scw run attach alpine
 `,
 }
 
@@ -33,6 +34,7 @@ func init() {
 	cmdRun.Flag.StringVar(&runCreateEnv, []string{"e", "-env"}, "", "Provide metadata tags passed to initrd (i.e., boot=resue INITRD_DEBUG=1)")
 	cmdRun.Flag.StringVar(&runCreateVolume, []string{"v", "-volume"}, "", "Attach additional volume (i.e., 50G)")
 	cmdRun.Flag.BoolVar(&runHelpFlag, []string{"h", "-help"}, false, "Print usage")
+	cmdRun.Flag.BoolVar(&runAttachFlag, []string{"a", "-attach"}, false, "Attach to serial console")
 	// FIXME: handle start --timeout
 }
 
@@ -42,6 +44,7 @@ var runCreateBootscript string // --bootscript flag
 var runCreateEnv string        // -e, --env flag
 var runCreateVolume string     // -v, --volume flag
 var runHelpFlag bool           // -h, --help flag
+var runAttachFlag bool         // -a, --attach flag
 
 func runRun(cmd *types.Command, args []string) {
 	if runHelpFlag {
@@ -50,8 +53,9 @@ func runRun(cmd *types.Command, args []string) {
 	if len(args) < 1 {
 		cmd.PrintShortUsage()
 	}
-
-	//image := args[0]
+	if runAttachFlag && len(args) > 1 {
+		log.Fatalf("Cannot use '--attach' and 'COMMAND [ARG...]' at the same time. See 'scw run --help'")
+	}
 
 	// create IMAGE
 	log.Debugf("Creating a new server")
@@ -69,26 +73,35 @@ func runRun(cmd *types.Command, args []string) {
 	}
 	log.Debugf("Server is booting")
 
-	// waiting for server to be ready
-	log.Debugf("Waiting for server to be ready")
-	// We wait for 30 seconds, which is the minimal amount of time needed by a server to boot
-	time.Sleep(30 * time.Second)
-	server, err := api.WaitForServerReady(cmd.API, serverID)
-	if err != nil {
-		log.Fatalf("Cannot get access to server %s: %v", serverID, err)
-	}
-	log.Debugf("Server is ready: %s", server.PublicAddress.IP)
-
-	// exec -w SERVER COMMAND ARGS...
-	log.Debugf("Executing command")
-	if len(args) < 2 {
-		err = utils.SSHExec(server.PublicAddress.IP, []string{"if [ -x /bin/bash ]; then exec /bin/bash; else exec /bin/sh; fi"}, false)
+	if runAttachFlag {
+		// Attach to server serial
+		log.Debugf("Attaching to server console")
+		err = utils.AttachToSerial(serverID, cmd.API.Token)
+		if err != nil {
+			log.Fatalf("Cannot attach to server serial: %v", err)
+		}
 	} else {
-		err = utils.SSHExec(server.PublicAddress.IP, args[1:], false)
-	}
-	if err != nil {
-		log.Debugf("Command execution failed: %v", err)
-		os.Exit(1)
+		// waiting for server to be ready
+		log.Debugf("Waiting for server to be ready")
+		// We wait for 30 seconds, which is the minimal amount of time needed by a server to boot
+		time.Sleep(30 * time.Second)
+		server, err := api.WaitForServerReady(cmd.API, serverID)
+		if err != nil {
+			log.Fatalf("Cannot get access to server %s: %v", serverID, err)
+		}
+		log.Debugf("Server is ready: %s", server.PublicAddress.IP)
+
+		// exec -w SERVER COMMAND ARGS...
+		log.Debugf("Executing command")
+		if len(args) < 2 {
+			err = utils.SSHExec(server.PublicAddress.IP, []string{"if [ -x /bin/bash ]; then exec /bin/bash; else exec /bin/sh; fi"}, false)
+		} else {
+			err = utils.SSHExec(server.PublicAddress.IP, args[1:], false)
+		}
+		if err != nil {
+			log.Debugf("Command execution failed: %v", err)
+			os.Exit(1)
+		}
+		log.Debugf("Command successfuly executed")
 	}
-	log.Debugf("Command successfuly executed")
 }