include fixes from code review

kubernetes · Oct 22, 2020 · e065c02 · e065c02
1 parent 7f6847b
commit e065c02
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -795,7 +795,7 @@ func validateUser(drvName string) {
 		if !viper.GetBool(interactive) {
 			test := exec.Command("sudo", "-n", "echo", "-n")
 			if err := test.Run(); err != nil {
-				exit.Message(reason.Usage, `sudo requires a password, and --interactive=false`)
+				exit.Message(reason.DrvNeedsRoot, `sudo requires a password, and --interactive=false`)
 			}
 		}
 		return

diff --git a/pkg/minikube/command/exec_runner.go b/pkg/minikube/command/exec_runner.go
@@ -91,15 +91,8 @@ func (e *execRunner) Copy(f assets.CopyableFile) error {
 	dst := path.Join(f.GetTargetDir(), f.GetTargetName())
 	if _, err := os.Stat(dst); err == nil {
 		klog.Infof("found %s, removing ...", dst)
-		switch runtime.GOOS {
-		case "linux":
-			if _, err := e.RunCmd(exec.Command("sudo", "rm", "-f", dst)); err != nil {
-				return errors.Wrapf(err, "error removing file %s", dst)
-			}
-		default:
-			if err := os.Remove(dst); err != nil {
-				return errors.Wrapf(err, "error removing file %s", dst)
-			}
+		if err := e.Remove(f); err != nil {
+			return errors.Wrapf(err, "error removing file %s", dst)
 		}
 	}
 
@@ -147,11 +140,14 @@ func (e *execRunner) Copy(f assets.CopyableFile) error {
 func (e *execRunner) Remove(f assets.CopyableFile) error {
 	dst := filepath.Join(f.GetTargetDir(), f.GetTargetName())
 	klog.Infof("rm: %s", dst)
-	switch runtime.GOOS {
-	case "linux":
-		_, err := e.RunCmd(exec.Command("sudo", "rm", "-f", dst))
-		return err
-	default:
-		return os.Remove(dst)
+	if err := os.Remove(dst); err != nil {
+		if !os.IsPermission(err) {
+			return err
+		}
+		_, err = e.RunCmd(exec.Command("sudo", "rm", "-f", dst))
+		if err != nil {
+			return err
+		}
 	}
+	return nil
 }
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
@@ -143,12 +143,7 @@ func BareMetal(name string) bool {
 
 // NeedsRoot returns true if driver needs to run with root privileges
 func NeedsRoot(name string) bool {
-	switch runtime.GOOS {
-	case "linux":
-		return false
-	default:
-		return name == None
-	}
+	return false
 }
 
 // NeedsPortForward returns true if driver is unable provide direct IP connectivity