fix: clean and debug the provider (#107)

Author: Quentin Brosse

.gitignore

@@ -3,6 +3,9 @@
 *.a
 *.so
 
+# Editors
+.idea
+
 # Folders
 # _obj
 # _test

.travis.yml

@@ -2,20 +2,13 @@ language: go
 
 sudo: false
 
-env:
-  global:
-   - GO15VENDOREXPERIMENT=1
-
 go:
-  - 1.5.3
-  - 1.6.1
-  - 1.x
+  - 1.11
+  - 1.12
+  - 1.13
 
 before_install:
-    - mkdir -p $GOPATH/bin
-    - curl -L https://github.com/docker/machine/releases/download/v0.7.0/docker-machine-`uname -s`-`uname -m` > $GOPATH/bin/docker-machine && chmod +x $GOPATH/bin/docker-machine
-    - go get github.com/Azure/go-ansiterm/winterm || true
-    - go get github.com/docker/go-units || true
+    - curl -L https://github.com/docker/machine/releases/download/v0.16.2/docker-machine-`uname -s`-`uname -m` > $GOPATH/bin/docker-machine && chmod +x $GOPATH/bin/docker-machine
 
 install:
     - go install

Gopkg.lock

@@ -9,23 +9,24 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/mcnflag"
 	"github.com/docker/machine/libmachine/ssh"
 	"github.com/docker/machine/libmachine/state"
-	"github.com/moul/anonuuid"
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/clilogger"
 	"github.com/scaleway/scaleway-cli/pkg/config"
+	"github.com/sirupsen/logrus"
+	"moul.io/anonuuid"
 )
 
 const (
 	// VERSION represents the semver version of the package
-	VERSION           = "v1.6"
-	defaultImage      = "265b32a3"
-	defaultBootscript = ""
+	VERSION = "v1.6"
+
+	// ubuntu_bionic will rase a 'too many candidates error'
+	defaultImage = "ubuntu-bionic"
 )
 
 var scwAPI *api.ScalewayAPI
@@ -79,7 +80,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) (err error) {
 
 	d.Token, d.Organization = flags.String("scaleway-token"), flags.String("scaleway-organization")
 	if d.Token == "" || d.Organization == "" {
-		config, cfgErr := config.GetConfig()
+		config, cfgErr := config.GetConfig("")
 		if cfgErr == nil {
 			if d.Token == "" {
 				d.Token = config.Token
@@ -151,7 +152,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			EnvVar: "SCALEWAY_BOOTSCRIPT",
 			Name:   "scaleway-bootscript",
 			Usage:  "Specifies the bootscript",
-			Value:  defaultBootscript,
+			Value:  "",
 		},
 		mcnflag.StringFlag{
 			EnvVar: "SCALEWAY_IP",
@@ -255,6 +256,7 @@ func (d *Driver) Create() (err error) {
 	if err != nil {
 		return
 	}
+
 	log.Infof("Creating server...")
 	cl, err = d.getClient(d.Region)
 	if err != nil {
@@ -263,23 +265,50 @@ func (d *Driver) Create() (err error) {
 	if err = d.resolveIP(cl); err != nil {
 		return
 	}
-	d.ServerID, err = api.CreateServer(cl, &api.ConfigCreateServer{
+
+	config := &api.ConfigCreateServer{
 		ImageName:         d.image,
 		CommercialType:    d.CommercialType,
 		Name:              d.name,
 		Bootscript:        d.bootscript,
+		BootType:          "bootscript",
 		AdditionalVolumes: d.volumes,
 		IP:                d.IPID,
 		EnableIPV6:        d.ipv6,
 		Env: strings.Join([]string{"AUTHORIZED_KEY",
 			strings.Replace(string(publicKey[:len(publicKey)-1]), " ", "_", -1)}, "="),
-	})
+	}
+	if d.bootscript == "" {
+		config.BootType = "local"
+	}
+	d.ServerID, err = api.CreateServer(cl, config)
+	if err != nil {
+		return
+	}
+
+	log.Infof("Setting cloud-init config...")
+	cloudInitConfig := fmt.Sprintf(`#cloud-config
+
+# Some images do not have sudo installed by default.
+packages:
+    - sudo
+
+# Add root to sudoers.
+users:
+  - name: root
+    ssh-authorized-keys: [%s]
+    sudo: ['ALL=(ALL) NOPASSWD:ALL']
+    groups: sudo
+`, publicKey)
+	err = cl.PatchUserdata(d.ServerID, "cloud-init", []byte(cloudInitConfig), false)
 	if err != nil {
 		return
 	}
+
 	log.Infof("Starting server...")
 	err = api.StartServer(cl, d.ServerID, false)
 	d.created = true
+
 	return
 }
 

Gopkg.toml

@@ -0,0 +1,35 @@
+module github.com/scaleway/docker-machine-driver-scaleway
+
+replace (
+	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.2
+	github.com/docker/docker => github.com/docker/engine v1.4.2-0.20190822205725-ed20165a37b4
+	github.com/renstrom/fuzzysearch v1.1.0 => github.com/lithammer/fuzzysearch v1.1.0
+)
+
+go 1.11
+
+require (
+	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
+	github.com/creack/goselect v0.1.1 // indirect
+	github.com/docker/docker v1.13.2-0.20170601211448-f5ec1e2936dc // indirect
+	github.com/docker/go-units v0.4.0 // indirect
+	github.com/docker/machine v0.16.2
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/google/go-cmp v0.3.1 // indirect
+	github.com/gorilla/websocket v1.4.1 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/mattn/go-isatty v0.0.11 // indirect
+	github.com/moul/gotty-client v1.7.0 // indirect
+	github.com/moul/http2curl v1.0.0 // indirect
+	github.com/pkg/errors v0.8.1 // indirect
+	github.com/renstrom/fuzzysearch v1.1.0 // indirect
+	github.com/samalba/dockerclient v0.0.0-20160531175551-a30362618471 // indirect
+	github.com/scaleway/scaleway-cli v1.10.2-0.20190910170054-f0ff7c3359bb
+	github.com/sirupsen/logrus v1.4.2
+	github.com/smartystreets/goconvey v1.6.4 // indirect
+	golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 // indirect
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
+	golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 // indirect
+	gotest.tools v2.2.0+incompatible // indirect
+	moul.io/anonuuid v1.2.1
+)