boot: getPath() should take care of simple directory exports. (#3122)

fixes #3120

cmd/object-common.go

@@ -165,12 +165,16 @@ func getPath(ep *url.URL) string {
 	var diskPath string
 	// For windows ep.Path is usually empty
 	if runtime.GOOS == "windows" {
-		// For full URLs windows drive is part of URL path.
+		switch ep.Scheme {
-		// Eg: http://ip:port/C:\mydrive
+		case "":
-		if ep.Scheme == "http" || ep.Scheme == "https" {
+			// Eg. "minio server .\export"
+			diskPath = ep.Path
+		case "http", "https":
+			// For full URLs windows drive is part of URL path.
+			// Eg: http://ip:port/C:\mydrive
 			// For windows trim off the preceding "/".
 			diskPath = ep.Path[1:]
-		} else {
+		default:
 			// For the rest url splits drive letter into
 			// Scheme contruct the disk path back.
 			diskPath = ep.Scheme + ":" + ep.Opaque

cmd/object-common_test.go

@@ -17,7 +17,6 @@
 package cmd
 
 import (
-	"net/url"
 	"runtime"
 	"sync"
 	"testing"
@@ -100,51 +99,51 @@ func TestHouseKeeping(t *testing.T) {
 	}
 }
 
-// Test constructing the final path.
+// Test getPath() - the path that needs to be passed to newPosix()
 func TestGetPath(t *testing.T) {
 	var testCases []struct {
-		ep   *url.URL
+		epStr string
-		path string
+		path  string
 	}
-	if runtime.GOOS != "windows" {
+	if runtime.GOOS == "windows" {
 		testCases = []struct {
-			ep   *url.URL
+			epStr string
-			path string
+			path  string
 		}{
-			{
+			{"\\export", "\\export"},
-				ep:   nil,
+			{"D:\\export", "d:\\export"},
-				path: "",
+			{"D:\\", "d:\\"},
-			},
+			{"D:", "d:"},
-			{
+			{"\\", "\\"},
-				ep:   &url.URL{Path: "/test1"},
+			{"http://localhost/d:/export", "d:/export"},
-				path: "/test1",
+			{"https://localhost/d:/export", "d:/export"},
-			},
 		}
 	} else {
 		testCases = []struct {
-			ep   *url.URL
+			epStr string
-			path string
+			path  string
 		}{
-			{
+			{"/export", "/export"},
-				ep:   nil,
+			{"http://localhost/export", "/export"},
-				path: "",
+			{"https://localhost/export", "/export"},
-			},
-			{
-				ep:   &url.URL{Opaque: "\\test1", Scheme: "C"},
-				path: "C:\\test1",
-			},
-			{
-				ep:   &url.URL{Scheme: "http", Path: "/C:\\test1"},
-				path: "C:\\test1",
-			},
 		}
 	}
-
+	testCasesCommon := []struct {
-	// Validate all the test cases.
+		epStr string
-	for i, testCase := range testCases {
+		path  string
-		path := getPath(testCase.ep)
+	}{
-		if path != testCase.path {
+		{"export", "export"},
-			t.Fatalf("Test: %d Expected path %s, got %s", i+1, testCase.path, path)
+	}
+	testCases = append(testCases, testCasesCommon...)
+	for i, test := range testCases {
+		eps, err := parseStorageEndpoints([]string{test.epStr})
+		if err != nil {
+			t.Errorf("Test %d: %s - %s", i+1, test.epStr, err)
+			continue
+		}
+		path := getPath(eps[0])
+		if path != test.path {
+			t.Errorf("Test %d: For endpoing %s, getPath() failed, got: %s, expected: %s,", i+1, test.epStr, path, test.path)
 		}
 	}
 }