Changed the style of os.Stat error checking

kubetest2-gce/deployer/deployer.go

@@ -101,10 +101,12 @@ func (d *deployer) IsUp() (up bool, err error) {
 
 func (d *deployer) Kubeconfig() (string, error) {
 	_, err := os.Stat(d.kubeconfigPath)
-	if err == nil {
-		return d.kubeconfigPath, nil
-	} else if os.IsNotExist(err) {
+	if os.IsNotExist(err) {
 		return "", fmt.Errorf("kubeconfig does not exist at: %s", d.kubeconfigPath)
 	}
-	return "", fmt.Errorf("unknown error when checking for kubeconfig at %s: %s", d.kubeconfigPath, err)
+	if err != nil {
+		return "", fmt.Errorf("unknown error when checking for kubeconfig at %s: %s", d.kubeconfigPath, err)
+	}
+
+	return d.kubeconfigPath, nil
 }

kubetest2-gce/deployer/dumplogs.go

@@ -54,29 +54,32 @@ func (d *deployer) DumpClusterLogs() error {
 func (d *deployer) makeLogsDir() error {
 	_, err := os.Stat(d.logsDir)
 
-	if err == nil {
-		if d.OverwriteLogsDir {
-			if err := os.RemoveAll(d.logsDir); err != nil {
-				return fmt.Errorf("failed to delete existing logs directory: %s", err)
-			}
-
-			err := os.Mkdir(d.logsDir, os.ModePerm)
-			if err != nil {
-				return fmt.Errorf("failed to create %s: %s", d.logsDir, err)
-			}
-			return nil
+	if os.IsNotExist(err) {
+		err := os.Mkdir(d.logsDir, os.ModePerm)
+		if err != nil {
+			return fmt.Errorf("failed to create %s: %s", d.logsDir, err)
 		}
-		return fmt.Errorf("cluster logs directory %s already exists, please clean up manually before continuing", d.logsDir)
+		return nil
 	}
-	if os.IsNotExist(err) {
+	if err != nil {
+		return fmt.Errorf("unexpected exception when making cluster logs directory: %s", err)
+	}
+
+	// file definitely exists, overwrite if requested
+
+	if d.OverwriteLogsDir {
+		if err := os.RemoveAll(d.logsDir); err != nil {
+			return fmt.Errorf("failed to delete existing logs directory: %s", err)
+		}
+
 		err := os.Mkdir(d.logsDir, os.ModePerm)
 		if err != nil {
 			return fmt.Errorf("failed to create %s: %s", d.logsDir, err)
 		}
 		return nil
 	}
 
-	return fmt.Errorf("unexpected exception when making cluster logs directory: %s", err)
+	return fmt.Errorf("cluster logs directory %s already exists, please clean up manually or use the overwrite flag before continuing", d.logsDir)
 }
 
 func (d *deployer) sshDump() error {