Merge pull request #59 from QuentinPerez/add-region

Add region

Author: Quentin Perez

Godeps/Godeps.json

@@ -73,20 +73,23 @@ Options:
    --scaleway-debug                                                                                  Enables Scaleway client debugging [$SCALEWAY_DEBUG]
    --scaleway-image "ubuntu-xenial"                                                                  Specifies the image [$SCALEWAY_IMAGE]
    --scaleway-ip                                                                                     Specifies the IP address [$SCALEWAY_IP]
+   --scaleway-ipv6                                                                                   Enable ipv6 [$SCALEWAY_IPV6]
    --scaleway-name                                                                                   Assign a name [$SCALEWAY_NAME]
    --scaleway-organization                                                                           Scaleway organization [$SCALEWAY_ORGANIZATION]
    --scaleway-port "22"                                                                              Specifies SSH port [$SCALEWAY_PORT]
+   --scaleway-region "par1"                                                                          Specifies the location (par1,ams1) [$SCALEWAY_REGION]
    --scaleway-token                                                                                  Scaleway token [$SCALEWAY_TOKEN]
    --scaleway-user "root"                                                                            Specifies SSH user name [$SCALEWAY_USER]
    --scaleway-volumes                                                                                Attach additional volume (e.g., 50G) [$SCALEWAY_VOLUMES]
-   --swarm                                                                                           Configure Machine with Swarm
+   --swarm                                                                                           Configure Machine to join a Swarm cluster
    --swarm-addr                                                                                      addr to advertise for Swarm (default: detect and use the machine IP)
    --swarm-discovery                                                                                 Discovery service to use with Swarm
    --swarm-experimental                                                                              Enable Swarm experimental features
    --swarm-host "tcp://0.0.0.0:3376"                                                                 ip/socket to listen on for Swarm master
    --swarm-image "swarm:latest"                                                                      Specify Docker image to use for Swarm [$MACHINE_SWARM_IMAGE]
+   --swarm-join-opt [--swarm-join-opt option --swarm-join-opt option]                                Define arbitrary flags for Swarm join
    --swarm-master                                                                                    Configure Machine to be a Swarm master
-   --swarm-opt [--swarm-opt option --swarm-opt option]                                               Define arbitrary flags for swarm
+   --swarm-opt [--swarm-opt option --swarm-opt option]                                               Define arbitrary flags for Swarm master
    --swarm-strategy "spread"                                                                         Define a default scheduling strategy for Swarm
    --tls-san [--tls-san option --tls-san option]                                                     Support extra SANs for TLS certs
 ```
@@ -250,6 +253,8 @@ root@ab197ef8bd3c:/# exit
 
 ### master (unreleased)
 
+* Add `--scaleway-region` to start server on different location e.g. `ams1` (Amsterdam)
+* Fix `user-agent` format
 * Add `--scaleway-ipv6` ([#50](https://github.com/scaleway/docker-machine-driver-scaleway/issues/50))
 * Add `--scaleway-port`
 * Add `--scaleway-user`

README.md

@@ -17,6 +17,7 @@ import (
 	"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"
 )
 
@@ -37,6 +38,7 @@ type Driver struct {
 	IPID           string
 	Token          string
 	CommercialType string
+	Region         string
 	name           string
 	image          string
 	ip             string
@@ -56,9 +58,12 @@ func (d *Driver) DriverName() string {
 	return fmt.Sprintf("scaleway(%v)", d.CommercialType)
 }
 
-func (d *Driver) getClient() (cl *api.ScalewayAPI, err error) {
+func (d *Driver) getClient(region string) (cl *api.ScalewayAPI, err error) {
 	if scwAPI == nil {
-		scwAPI, err = api.NewScalewayAPI(d.Organization, d.Token, "docker-machine-driver-scaleway/"+VERSION)
+		if region == "" {
+			region = "par1"
+		}
+		scwAPI, err = api.NewScalewayAPI(d.Organization, d.Token, "docker-machine-driver-scaleway/"+VERSION, region, clilogger.SetupLogger)
 	}
 	cl = scwAPI
 	return
@@ -86,6 +91,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) (err error) {
 		}
 	}
 	d.CommercialType = flags.String("scaleway-commercial-type")
+	d.Region = flags.String("scaleway-region")
 	d.name = flags.String("scaleway-name")
 	d.image = flags.String("scaleway-image")
 	d.ip = flags.String("scaleway-ip")
@@ -127,6 +133,12 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			Usage:  "Specifies the commercial type",
 			Value:  "VC1S",
 		},
+		mcnflag.StringFlag{
+			EnvVar: "SCALEWAY_REGION",
+			Name:   "scaleway-region",
+			Usage:  "Specifies the location (par1,ams1)",
+			Value:  "par1",
+		},
 		mcnflag.StringFlag{
 			EnvVar: "SCALEWAY_IMAGE",
 			Name:   "scaleway-image",
@@ -236,7 +248,7 @@ func (d *Driver) Create() (err error) {
 		return
 	}
 	log.Infof("Creating server...")
-	cl, err = d.getClient()
+	cl, err = d.getClient(d.Region)
 	if err != nil {
 		return
 	}
@@ -274,7 +286,7 @@ func (d *Driver) GetState() (st state.State, err error) {
 	var cl *api.ScalewayAPI
 
 	st = state.Error
-	cl, err = d.getClient()
+	cl, err = d.getClient(d.Region)
 	if err != nil {
 		return
 	}
@@ -314,7 +326,7 @@ func (d *Driver) GetURL() (string, error) {
 func (d *Driver) postAction(action string) (err error) {
 	var cl *api.ScalewayAPI
 
-	cl, err = d.getClient()
+	cl, err = d.getClient(d.Region)
 	if err != nil {
 		return
 	}
@@ -331,7 +343,7 @@ func (d *Driver) Kill() error {
 func (d *Driver) Remove() (err error) {
 	var cl *api.ScalewayAPI
 
-	cl, err = d.getClient()
+	cl, err = d.getClient(d.Region)
 	if err != nil {
 		return
 	}