Use new environment variables format in Docker-Machine (#13)

* Use new environment variables format in Docker-Machine
* Locally build H1-CLI

Author: ad-m

.travis.yml

@@ -18,4 +18,6 @@ jobs:
     - stage: build & test
       script:
       - docker build . -f e2e/Dockerfile -t machine-e2e
-      - docker run -e HYPERONE_PROJECT="any" -e HYPERONE_TOKEN="$H1_TOKEN" -e H1_TOKEN="$H1_TOKEN" machine-e2e bats e2e/lifecycle.bats
+      # HYPERONE_PROJECT and HYPERONE_ACCESS_TOKEN_SECRET required by Docker-Machine
+      # HYPERONE_ACCESS_TOKEN_SECRET required by H1-CLI
+      - docker run -e HYPERONE_PROJECT="any" -e HYPERONE_ACCESS_TOKEN_SECRET="$H1_TOKEN" machine-e2e bats e2e/lifecycle.bats

README.md

@@ -43,7 +43,7 @@ Official documentation for Docker Machine is available on [website](https://docs
 To create a HyperOne Virtual Machine for Docker purposes just run this command:
 
 ```shell
-$ docker-machine create --driver hyperone --hyperone-token TOKEN --hyperone-project PROJECT vm
+$ docker-machine create --driver hyperone --hyperone-access-token-secret TOKEN --hyperone-project PROJECT vm
 Running pre-create checks...
 Creating machine...
 (vm) Creating HyperOne VM...
@@ -63,7 +63,6 @@ To see how to connect your Docker Client to the Docker Engine running on this vi
 Available options:
 
 ```shell
-$ docker-machine create -d hyperone -h
 Usage: docker-machine create [OPTIONS] [arg...]
 
 Create a machine
@@ -81,13 +80,13 @@ Options:
    --engine-opt [--engine-opt option --engine-opt option]						Specify arbitrary flags to include with the created engine in the form flag=value
    --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
-   --hyperone-disk-name "os-disk"									HyperOne VM OS Disk Name [$HYPERONE_DIKE_NAME]
-   --hyperone-disk-size "20"										HyperOne VM OS Disk Size [$HYPERONE_DIKE_SIZE]
-   --hyperone-disk-type "ssd"										HyperOne VM OS Disk Type [$HYPERONE_DIKE_TYPE]
+   --hyperone-access-token-secret 									HyperOne Access Token Secret [$HYPERONE_ACCESS_TOKEN_SECRET]
+   --hyperone-disk-name "os-disk"									HyperOne VM OS Disk Name [$HYPERONE_DISK_NAME]
+   --hyperone-disk-size "20"										HyperOne VM OS Disk Size [$HYPERONE_DISK_SIZE]
+   --hyperone-disk-type "ssd"										HyperOne VM OS Disk Type [$HYPERONE_DISK_TYPE]
    --hyperone-image "debian"										HyperOne Image [$HYPERONE_IMAGE]
    --hyperone-project 											HyperOne Project [$HYPERONE_PROJECT]
    --hyperone-ssh-user "guru"										SSH Username [$HYPERONE_SSH_USER]
-   --hyperone-token 											HyperOne Token [$HYPERONE_TOKEN]
    --hyperone-type "a1.micro"										HyperOne VM Type [$HYPERONE_TYPE]
    --swarm												Configure Machine to join a Swarm cluster
    --swarm-addr 											addr to advertise for Swarm (default: detect and use the machine IP)
@@ -125,4 +124,4 @@ After the build is complete, ```docker-machine-driver-hyperone``` binary will be
 
 ### Running tests
 
-For details how to run tests read the contents of the ```.travis.yml``` file.
+For details how to run tests read the contents of the ```.travis.yml``` file.

driver/hyperone.go

@@ -43,9 +43,9 @@ type Driver struct {
 func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 	return []mcnflag.Flag{
 		mcnflag.StringFlag{
-			EnvVar: "HYPERONE_TOKEN",
-			Name:   "hyperone-token",
-			Usage:  "HyperOne Token",
+			EnvVar: "HYPERONE_ACCESS_TOKEN_SECRET",
+			Name:   "hyperone-access-token-secret",
+			Usage:  "HyperOne Access Token Secret",
 		},
 		mcnflag.StringFlag{
 			EnvVar: "HYPERONE_PROJECT",
@@ -71,19 +71,19 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			Value:  defaultType,
 		},
 		mcnflag.StringFlag{
-			EnvVar: "HYPERONE_DIKE_NAME",
+			EnvVar: "HYPERONE_DISK_NAME",
 			Name:   "hyperone-disk-name",
 			Usage:  "HyperOne VM OS Disk Name",
 			Value:  defaultDiskName,
 		},
 		mcnflag.StringFlag{
-			EnvVar: "HYPERONE_DIKE_TYPE",
+			EnvVar: "HYPERONE_DISK_TYPE",
 			Name:   "hyperone-disk-type",
 			Usage:  "HyperOne VM OS Disk Type",
 			Value:  defaultDiskType,
 		},
 		mcnflag.IntFlag{
-			EnvVar: "HYPERONE_DIKE_SIZE",
+			EnvVar: "HYPERONE_DISK_SIZE",
 			Name:   "hyperone-disk-size",
 			Usage:  "HyperOne VM OS Disk Size",
 			Value:  defaultDiskSize,
@@ -97,7 +97,7 @@ func (d *Driver) DriverName() string {
 }
 
 func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
-	d.Token = flags.String("hyperone-token")
+	d.Token = flags.String("hyperone-access-token-secret")
 	d.Project = flags.String("hyperone-project")
 	d.Image = flags.String("hyperone-image")
 	d.Type = flags.String("hyperone-type")
@@ -107,7 +107,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 	d.SSHUser = flags.String("hyperone-ssh-user")
 
 	if d.Token == "" {
-		return fmt.Errorf("hyperone driver requires the --hyperone-token option")
+		return fmt.Errorf("hyperone driver requires the --hyperone-access-token-secret option")
 	}
 
 	if d.Project == "" {

e2e/Dockerfile

@@ -1,11 +1,18 @@
+FROM node:alpine as cli_builder
+RUN apk add --no-cache libstdc++
+RUN wget https://github.com/hyperonecom/h1-cli/archive/develop.tar.gz
+RUN tar xvzf develop.tar.gz
+WORKDIR /h1-cli-develop
+RUN npm install .
+RUN npx pkg -c package.json -t "node12-alpine" -o "./dist/h1" "./bin/h1"
+
 FROM golang:alpine
 # Setup
-RUN apk add curl bats git make gcc musl-dev findutils grep docker
+COPY --from=cli_builder /h1-cli-develop/dist/h1 /bin/h1
+RUN apk add --no-cache libstdc++ curl bats git make gcc musl-dev findutils grep docker
 RUN base="https://github.com/docker/machine/releases/latest/download" \
 && curl -L $base/docker-machine-$(uname -s)-$(uname -m) >/usr/local/bin/docker-machine \
 && chmod +x /usr/local/bin/docker-machine
-RUN curl -s -L "https://github.com/hyperonecom/h1-cli/releases/latest/download/h1-alpine" -o /bin/h1 \
-&& chmod +x /bin/h1
 # Build
 WORKDIR /src
 ADD ./ /src/

e2e/lifecycle.bats

@@ -4,15 +4,15 @@
 # delete any VM and disk with the text "machinebats" within the name.
 
 # Required parameters
-: ${HYPERONE_TOKEN:?}
+: ${HYPERONE_ACCESS_TOKEN_SECRET:?}
 : ${HYPERONE_PROJECT:?}
 command -v h1 >/dev/null 2>&1 || {
     echo "'h1' must be installed" >&2
     exit 1
 }
 
 USER_VARS="--hyperone-disk-name machinebats-os-disk"
-USER_VARS="${USER_VARS} --hyperone-token ${HYPERONE_TOKEN}"
+USER_VARS="${USER_VARS} --hyperone-access-token-secret ${HYPERONE_ACCESS_TOKEN_SECRET}"
 USER_VARS="${USER_VARS} --hyperone-project ${HYPERONE_PROJECT}"
 
 hyperone_has_resource() {