More useful help / documentation for auto-generated SSH keys.

Author: tintoy

CHANGES.md

@@ -1,12 +1,19 @@
 # Changes
 
+## v0.9
+
+New features:
+
+* More useful help / documentation for auto-generated SSH keys.
+
 ## v0.8
 
 New features:
 
 * The driver can now use the new `--ddcloud-mcp-endpoint` command-line argument (environment: `MCP_ENDPOINT`) to designate a custom end-point URI for the CloudControl API.
 * The driver will now generate a new SSH keypair if one was not already configured via command-line arguments.
 
+
 Breaking changes:
 
 * The following command-line arguments have changed to be consistent with their corresponding environment variables:

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.7
+VERSION = 0.9
 
 default: fmt build test
 

client_public_ip.go

@@ -4,15 +4,16 @@ package main
  * Detect the client machine's external IPv4 address
  * -------------------------------------------------
  *
- * Uses http://ifconfig.co/json
+ * Uses https://v4.ifconfig.co/json
  */
 
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/docker/machine/libmachine/log"
 	"io/ioutil"
 	"net/http"
+
+	"github.com/docker/machine/libmachine/log"
 )
 
 // A subset of the IP address information returned by ifconfig.co.
@@ -24,7 +25,7 @@ type ipInfo struct {
 func getClientPublicIPv4Address() (string, error) {
 	log.Infof("Auto-detecting client's public (external) IP address...")
 
-	response, err := http.Get("https://ifconfig.co/json")
+	response, err := http.Get("https://v4.ifconfig.co/json")
 	if err != nil {
 		return "", fmt.Errorf("Unable to connect to ifconfig.co to determine your IP address: %s", err.Error())
 	}

driver.go

@@ -8,13 +8,14 @@ package main
 import (
 	"errors"
 	"fmt"
+	"net"
+	"os"
+
 	"github.com/DimensionDataResearch/go-dd-cloud-compute/compute"
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/mcnflag"
 	"github.com/docker/machine/libmachine/state"
-	"net"
-	"os"
 )
 
 // DefaultImageName is the name of the default OS image used to create machines.
@@ -150,7 +151,7 @@ func (driver *Driver) GetCreateFlags() []mcnflag.Flag {
 		mcnflag.StringFlag{
 			EnvVar: "MCP_SSH_KEY",
 			Name:   "ddcloud-ssh-key",
-			Usage:  "The SSH key file to use",
+			Usage:  "The SSH key file to use (if not specified, then a new key will be generated)",
 			Value:  "",
 		},
 		mcnflag.IntFlag{