Merge pull request #556 from nanobox-io/bugfix/554

Improve pre-validation for virtualbox

Author: glinton

main.go

@@ -87,10 +87,12 @@ func main() {
 
 	// make sure nanobox has all the necessry parts
 	if !strings.Contains(command, " config") && !strings.Contains(command, " server") {
-		valid, missingParts := provider.Valid()
-		if !valid {
-
-			display.MissingDependencies(providerName, missingParts)
+		err, missingParts := provider.Valid()
+		if err != nil {
+			fmt.Printf("Failed to validate provider - %s\n", err.Error())
+			if len(missingParts) > 0 {
+				display.MissingDependencies(providerName, missingParts)
+			}
 			os.Exit(1)
 		}
 	}

util/provider/dockermachine.go

@@ -34,39 +34,55 @@ func init() {
 }
 
 // Valid ensures docker-machine is installed and available
-func (machine DockerMachine) Valid() (bool, []string) {
+func (machine DockerMachine) Valid() (error, []string) {
+	var masterErr error // will hold a collection of any errors hit
 
 	missingParts := []string{}
 
 	// we install our own docker-machine so we dont need to check
 
 	// do you have vbox manage?
-	if err := exec.Command(vboxManageCmd, "-v").Run(); err != nil {
+	out, err := exec.Command(vboxManageCmd, "-v").CombinedOutput()
+	if err != nil {
+		// append rather than return here so that we can check everything before erroring.
+		// otherwise a user could error multiple times, learning about one problem at a time.
 		missingParts = append(missingParts, "vboxmanage")
+		masterErr = fmt.Errorf("missing vboxmanage - %q", err.Error())
+	}
+	// check output for errors/instruction
+	if bytes.Contains(out, []byte("WARNING")) {
+		if masterErr == nil {
+			masterErr = fmt.Errorf("vboxmanage gave warning - \n%s", out)
+		} else {
+			masterErr = fmt.Errorf("%s - vboxmanage gave warning - \n%s", masterErr.Error(), out)
+		}
 	}
 
 	// return early if we are running native mounts
 	config, _ := models.LoadConfig()
 
 	if config.MountType == "native" {
-		return len(missingParts) == 0, missingParts
-	}
-
-	unixCheck := func() {
-		// check to see if i am listening on the netfs port
-		out, err := exec.Command("netstat", "-ln").CombinedOutput()
-		if err != nil || !bytes.Contains(out, []byte("2049")) {
-			missingParts = append(missingParts, "netfs")
+		if len(missingParts) == 0 && masterErr == nil {
+			return nil, missingParts
 		}
-
+		return masterErr, missingParts
 	}
 
 	// net share checking
 	switch runtime.GOOS {
 	case "linux":
-		unixCheck()
+		out, err := exec.Command("netstat", "-tln").CombinedOutput()
+		if err != nil {
+			missingParts = append(missingParts, "netfs")
+			masterErr = fmt.Errorf("%s - failed to check for netfs - %q", masterErr.Error(), err.Error())
+		} else if !bytes.Contains(out, []byte("2049")) {
+			missingParts = append(missingParts, "netfs")
+			masterErr = fmt.Errorf("%s - missing or not running netfs - %q", masterErr.Error(), err.Error())
+		}
+
 		if err := exec.Command("exportfs").Run(); err != nil {
 			missingParts = append(missingParts, "exportfs")
+			masterErr = fmt.Errorf("%s - missing exportfs - %q", masterErr.Error(), err.Error())
 		}
 
 	case "darwin":
@@ -79,7 +95,7 @@ func (machine DockerMachine) Valid() (bool, []string) {
 
 	}
 
-	return len(missingParts) == 0, missingParts
+	return masterErr, missingParts
 }
 
 func (machine DockerMachine) Status() string {

util/provider/native.go

@@ -25,15 +25,12 @@ func init() {
 }
 
 // Valid ensures docker-machine is installed and available
-func (native Native) Valid() (bool, []string) {
-	cmd := exec.Command("docker", "ps")
-
-	//
-	if _, err := cmd.CombinedOutput(); err != nil {
-		return false, []string{"docker"}
+func (native Native) Valid() (error, []string) {
+	if err := exec.Command("docker", "ps").Run(); err != nil {
+		return fmt.Errorf("missing docker - %s", err.Error()), []string{"docker"}
 	}
 
-	return true, nil
+	return nil, nil
 }
 
 func (native Native) Status() string {

util/provider/provider.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/nanobox-io/nanobox/models"
 )
@@ -15,7 +16,7 @@ type Provider interface {
 	HostMntDir() string
 	HostIP() (string, error)
 	ReservedIPs() []string
-	Valid() (bool, []string)
+	Valid() (error, []string)
 	Create() error
 	Reboot() error
 	Stop() error
@@ -53,11 +54,11 @@ func Display(verb bool) {
 }
 
 // Valid ...
-func Valid() (bool, []string) {
+func Valid() (error, []string) {
 
 	p, err := fetchProvider()
 	if err != nil {
-		return false, []string{"invalid provider"}
+		return fmt.Errorf("invalid provider - %s", err.Error()), []string{"invalid provider"}
 	}
 
 	return p.Valid()

vendor/github.com/docker/machine/libmachine/mcnutils/b2d.go

@@ -221,20 +221,26 @@
 		{
 			"checksumSHA1": "pfZB2heUOImpxC+LS/xFSFDd2J8=",
 			"path": "github.com/docker/machine/libmachine/log",
-			"revision": "85bef344b7be221c79a1e0173acf44715075f0f9",
-			"revisionTime": "2016-09-08T18:02:50Z"
+			"revision": "937160559e02cc430fe176991beb9a6ffbfe3de0",
+			"revisionTime": "2017-07-12T23:53:51Z",
+			"version": "v0.12.2",
+			"versionExact": "v0.12.2"
 		},
 		{
-			"checksumSHA1": "QG310EdbozuJynkrfT3wvVm29FY=",
+			"checksumSHA1": "WZq3NS1/0CN7IyeZqH+AugPzm7k=",
 			"path": "github.com/docker/machine/libmachine/mcnutils",
-			"revision": "85bef344b7be221c79a1e0173acf44715075f0f9",
-			"revisionTime": "2016-09-08T18:02:50Z"
+			"revision": "937160559e02cc430fe176991beb9a6ffbfe3de0",
+			"revisionTime": "2017-07-12T23:53:51Z",
+			"version": "v0.12.2",
+			"versionExact": "v0.12.2"
 		},
 		{
-			"checksumSHA1": "MotUnJVkO3Cg501ZASzbnwb+Um4=",
+			"checksumSHA1": "Fn8hXKmkAUxnXi5RrIexvW9BnI8=",
 			"path": "github.com/docker/machine/version",
-			"revision": "85bef344b7be221c79a1e0173acf44715075f0f9",
-			"revisionTime": "2016-09-08T18:02:50Z"
+			"revision": "937160559e02cc430fe176991beb9a6ffbfe3de0",
+			"revisionTime": "2017-07-12T23:53:51Z",
+			"version": "v0.12.2",
+			"versionExact": "v0.12.2"
 		},
 		{
 			"checksumSHA1": "xgjI2W3RGiQwNlxsOW2V9fJ9kaM=",