Merge pull request #25 from scaleway/scaleway-debug

Scaleway debug

Author: Quentin Perez

README.md

@@ -51,6 +51,7 @@ Options:
    --engine-registry-mirror [--engine-registry-mirror option --engine-registry-mirror option]        Specify registry mirrors to use [$ENGINE_REGISTRY_MIRROR]
    --engine-storage-driver                                                                           Specify a storage driver to use with the engine
    --scaleway-commercial-type "VC1S"                                                                 Specifies the commercial type [$SCALEWAY_COMMERCIAL_TYPE]
+   --scaleway-debug                                                                                  Enables Scaleway client debugging [$SCALEWAY_DEBUG]
    --scaleway-image "ubuntu-trusty"                                                                  Specifies the image [$SCALEWAY_IMAGE]
    --scaleway-name                                                                                   Assign a name [$SCALEWAY_NAME]
    --scaleway-organization                                                                           Scaleway organization [$SCALEWAY_ORGANIZATION]
@@ -117,12 +118,14 @@ $> curl --silent http://212.47.248.251 | head -n1 # you can also open your brows
 
 ## Options
 
-|Option Name                                                     |Description        |Default Value|required|
-|----------------------------------------------------------------|-------------------|-------------|--------|
-|``--scaleway-organization`` or ``$SCALEWAY_ORGANIZATION``       |Organization UUID  |none         |yes     |
-|``--scaleway-token`` or ``$SCALEWAY_TOKEN``                     |Token UUID         |none         |yes     |
-|``--scaleway-name`` or ``$SCALEWAY_NAME``                       |Server name        |none         |no      |
-|``--scaleway-commercial-type`` or ``$SCALEWAY_COMMERCIAL_TYPE`` |Commercial type    |VC1S         |no      |
+|Option Name                                                     |Description        |Default Value |required|
+|----------------------------------------------------------------|-------------------|--------------|--------|
+|``--scaleway-organization`` or ``$SCALEWAY_ORGANIZATION``       |Organization UUID  |none          |yes     |
+|``--scaleway-token`` or ``$SCALEWAY_TOKEN``                     |Token UUID         |none          |yes     |
+|``--scaleway-name`` or ``$SCALEWAY_NAME``                       |Server name        |none          |no      |
+|``--scaleway-commercial-type`` or ``$SCALEWAY_COMMERCIAL_TYPE`` |Commercial type    |VC1S          |no      |
+|``--scaleway-image`` or ``$SCALEWAY_IMAGE``                     |Server image       |ubuntu-trusty |no      |
+|``--scaleway-debug`` or ``$SCALEWAY_DEBUG``                     |Toggle debugging   |false         |no      |
 
 ---
 
@@ -131,6 +134,7 @@ $> curl --silent http://212.47.248.251 | head -n1 # you can also open your brows
 ### master (unreleased)
 
 * Add `--scaleway-image` ([#22](https://github.com/scaleway/docker-machine-driver-scaleway/issues/22))
+* Add `--scaleway-debug`
 
 View full [commits list](https://github.com/scaleway/docker-machine-driver-scaleway/compare/v1.0.2...master)
 
@@ -163,6 +167,12 @@ View full [commits list](https://github.com/scaleway/docker-machine-driver-scale
 
 ---
 
+## Debugging
+
+```console
+$ SCALEWAY_DEBUG=1 MACHINE_DEBUG=1 docker-machine ...
+```
+
 ## Development
 
 Feel free to contribute :smiley::beers:

driver/scaleway.go

@@ -5,9 +5,11 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net"
+	"os"
 	"strings"
 	"time"
 
+	"github.com/Sirupsen/logrus"
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/mcnflag"
@@ -57,6 +59,11 @@ func (d *Driver) getClient() (cl *api.ScalewayAPI, err error) {
 
 // SetConfigFromFlags sets the flags
 func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) (err error) {
+	if flags.Bool("scaleway-debug") {
+		logrus.SetOutput(os.Stderr)
+		logrus.SetLevel(logrus.DebugLevel)
+	}
+
 	d.Token, d.Organization = flags.String("scaleway-token"), flags.String("scaleway-organization")
 	if d.Token == "" || d.Organization == "" {
 		config, cfgErr := config.GetConfig()
@@ -114,6 +121,11 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			Usage:  "Specifies the image",
 			Value:  defaultImage,
 		},
+		mcnflag.BoolFlag{
+			EnvVar: "SCALEWAY_DEBUG",
+			Name:   "scaleway-debug",
+			Usage:  "Enables Scaleway client debugging",
+		},
 		// mcnflag.StringFlag{
 		//     EnvVar: "SCALEWAY_USERDATA",
 		//     Name:   "scaleway-userdata",