Merge branch 'develop' into 'master'

Release new changes See merge request open-source/docker-machine-driver-bytemark!9
BytemarkHosting · Jan 21, 2019 · 9b7d3ba · 9b7d3ba
2 parents 27650ac + 0b88560
commit 9b7d3ba
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [0.2]
+### Added
+* Added `bytemark-cluster` flag to set the API endpoint to use.
+* Supplying the `debug` flag now causes bytemark-client's debug output to be output too.
+
 ## [0.1]
 ### Added
 

diff --git a/driver/bytemark.go b/driver/bytemark.go
@@ -72,7 +72,13 @@ func (d *Driver) getClient() (lib.Client, error) {
 	if err != nil {
 		return nil, fmt.Errorf("Could not find a token: %s. Please set BYTEMARK_AUTH_TOKEN environment variable", err)
 	}
-	client, err := lib.New()
+	if d.ClusterURL == "" {
+		d.ClusterURL = lib.DefaultURLs().Brain
+	}
+	urls := lib.EndpointURLs{
+		Brain: d.ClusterURL,
+	}
+	client, err := lib.NewWithURLs(urls)
 	if err != nil {
 		return nil, fmt.Errorf("Could not create client: %s", err)
 	}

diff --git a/driver/driver.go b/driver/driver.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/BytemarkHosting/bytemark-client/lib"
 	"github.com/BytemarkHosting/bytemark-client/lib/brain"
+	bmlog "github.com/BytemarkHosting/bytemark-client/util/log"
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/state"
 )
@@ -18,7 +19,8 @@ type Driver struct {
 
 	spec brain.VirtualMachineSpec
 
-	Token string
+	ClusterURL string
+	Token      string
 
 	client       lib.Client
 	vmCached     *brain.VirtualMachine
@@ -27,6 +29,7 @@ type Driver struct {
 
 // NewDriver creates a Driver with the specified storePath.
 func NewDriver(machineName string, storePath string) *Driver {
+	bmlog.DebugLevel = 5
 	defaultDiscs := brain.Discs{
 		brain.Disc{
 			Label:        "disk-1",

diff --git a/driver/flags.go b/driver/flags.go
@@ -10,6 +10,12 @@ import (
 // "docker hosts create"
 func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 	return []mcnflag.Flag{
+		mcnflag.StringFlag{
+			Name:   "bytemark-cluster",
+			Usage:  "HTTP(S) root URL of cluster endpoint",
+			Value:  "https://uk0.bigv.io",
+			EnvVar: "BYTEMARK_CLUSTER_URL",
+		},
 		mcnflag.StringFlag{
 			Name:   "bytemark-zone",
 			Usage:  "Zone",
@@ -68,6 +74,7 @@ func (d *Driver) setServerSpecFromFlags(flags drivers.DriverOptions) {
 
 // SetConfigFromFlags initializes the driver based on the command line flags.
 func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) (err error) {
+	d.ClusterURL = flags.String("bytemark-cluster")
 	d.setServerSpecFromFlags(flags)
 	d.Token = flags.String("bytemark-token")