Merge pull request #54 from davidz627/fix/urlLib

Use net/url library for UDS parsing, now uses more standardized form

Author: davidz627

cmd/main.go

@@ -30,7 +30,7 @@ func init() {
 }
 
 var (
-	endpoint      = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
+	endpoint      = flag.String("endpoint", "unix:/tmp/csi.sock", "CSI endpoint")
 	driverName    = flag.String("drivername", "com.google.csi.gcepd", "name of the driver")
 	nodeID        = flag.String("nodeid", "", "node id")
 	vendorVersion string

deploy/kubernetes/controller.yaml

@@ -49,7 +49,7 @@ spec:
             - "--nodeid=$(KUBE_NODE_NAME)"
           env:
             - name: CSI_ENDPOINT
-              value: unix:///csi/csi.sock
+              value: unix:/csi/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:

deploy/kubernetes/demo-pod.yaml

@@ -8,7 +8,7 @@ spec:
   storageClassName: csi-gce-pd
   resources:
     requests:
-      storage: 1Mi
+      storage: 6Gi
 
 ---
 

deploy/kubernetes/node.yaml

@@ -43,7 +43,7 @@ spec:
             - "--nodeid=$(KUBE_NODE_NAME)"
           env:
             - name: CSI_ENDPOINT
-              value: unix:///csi/csi.sock
+              value: unix:/csi/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:

pkg/gce-pd-csi-driver/server.go

@@ -16,6 +16,7 @@ package gceGCEDriver
 
 import (
 	"net"
+	"net/url"
 	"os"
 	"sync"
 
@@ -70,19 +71,24 @@ func (s *nonBlockingGRPCServer) ForceStop() {
 
 func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, cs csi.ControllerServer, ns csi.NodeServer) {
 
-	proto, addr, err := ParseEndpoint(endpoint)
+	u, err := url.Parse(endpoint)
+
 	if err != nil {
 		glog.Fatal(err.Error())
 	}
 
-	if proto == "unix" {
-		addr = "/" + addr
+	var addr string
+	if u.Scheme == "unix" {
+		addr = u.Path
 		if err := os.Remove(addr); err != nil && !os.IsNotExist(err) {
 			glog.Fatalf("Failed to remove %s, error: %s", addr, err.Error())
 		}
+	} else {
+		glog.Fatalf("%v endpoint scheme not supported", u.Scheme)
 	}
 
-	listener, err := net.Listen(proto, addr)
+	glog.Infof("Start listening with scheme %v, addr %v", u.Scheme, addr)
+	listener, err := net.Listen(u.Scheme, addr)
 	if err != nil {
 		glog.Fatalf("Failed to listen: %v", err)
 	}

pkg/gce-pd-csi-driver/utils.go

@@ -17,25 +17,12 @@ limitations under the License.
 package gceGCEDriver
 
 import (
-	"fmt"
-	"strings"
-
 	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
 	"github.com/golang/glog"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 
-func ParseEndpoint(ep string) (string, string, error) {
-	if strings.HasPrefix(strings.ToLower(ep), "unix://") || strings.HasPrefix(strings.ToLower(ep), "tcp://") {
-		s := strings.SplitN(ep, "://", 2)
-		if s[1] != "" {
-			return s[0], s[1], nil
-		}
-	}
-	return "", "", fmt.Errorf("Invalid endpoint: %v", ep)
-}
-
 func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability_AccessMode {
 	return &csi.VolumeCapability_AccessMode{Mode: mode}
 }

pkg/gce-pd-csi-driver/utils_test.go

@@ -16,62 +16,3 @@ limitations under the License.
 */
 
 package gceGCEDriver
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestParseEndpoint(t *testing.T) {
-
-	//Valid unix domain socket endpoint
-	sockType, addr, err := ParseEndpoint("unix://fake.sock")
-	assert.NoError(t, err)
-	assert.Equal(t, sockType, "unix")
-	assert.Equal(t, addr, "fake.sock")
-
-	sockType, addr, err = ParseEndpoint("unix:///fakedir/fakedir/fake.sock")
-	assert.NoError(t, err)
-	assert.Equal(t, sockType, "unix")
-	assert.Equal(t, addr, "/fakedir/fakedir/fake.sock")
-
-	//Valid unix domain socket with uppercase
-	sockType, addr, err = ParseEndpoint("UNIX://fake.sock")
-	assert.NoError(t, err)
-	assert.Equal(t, sockType, "UNIX")
-	assert.Equal(t, addr, "fake.sock")
-
-	//Valid TCP endpoint with ip
-	sockType, addr, err = ParseEndpoint("tcp://127.0.0.1:80")
-	assert.NoError(t, err)
-	assert.Equal(t, sockType, "tcp")
-	assert.Equal(t, addr, "127.0.0.1:80")
-
-	//Valid TCP endpoint with uppercase
-	sockType, addr, err = ParseEndpoint("TCP://127.0.0.1:80")
-	assert.NoError(t, err)
-	assert.Equal(t, sockType, "TCP")
-	assert.Equal(t, addr, "127.0.0.1:80")
-
-	//Valid TCP endpoint with hostname
-	sockType, addr, err = ParseEndpoint("tcp://fakehost:80")
-	assert.NoError(t, err)
-	assert.Equal(t, sockType, "tcp")
-	assert.Equal(t, addr, "fakehost:80")
-
-	_, _, err = ParseEndpoint("unix:/fake.sock/")
-	assert.NotNil(t, err)
-
-	_, _, err = ParseEndpoint("fake.sock")
-	assert.NotNil(t, err)
-
-	_, _, err = ParseEndpoint("unix://")
-	assert.NotNil(t, err)
-
-	_, _, err = ParseEndpoint("://")
-	assert.NotNil(t, err)
-
-	_, _, err = ParseEndpoint("")
-	assert.NotNil(t, err)
-}

test/e2e/gce_pd_e2e_test.go

@@ -39,7 +39,7 @@ import (
 )
 
 const (
-	endpoint       = "unix://tmp/csi.sock"
+	endpoint       = "unix:/tmp/csi.sock"
 	addr           = "/tmp/csi.sock"
 	network        = "unix"
 	testNamePrefix = "gcepd-csi-e2e-"

test/sanity/sanity_test.go

@@ -32,9 +32,7 @@ func TestSanity(t *testing.T) {
 	project := "test-project"
 	zone := "test-zone"
 	vendorVersion := "test-version"
-	// TODO(dyzz): Only one of these can be correct, the way endpoint is defined in GCE driver is INCORRECT
-	endpoint := "unix://tmp/csi.sock"
-	csiSanityEndpoint := "unix:/tmp/csi.sock"
+	endpoint := "unix:/tmp/csi.sock"
 	mountPath := "/tmp/csi/mount"
 	stagePath := "/tmp/csi/stage"
 	// Set up driver and env
@@ -70,7 +68,7 @@ func TestSanity(t *testing.T) {
 	config := &sanity.Config{
 		TargetPath:  mountPath,
 		StagingPath: stagePath,
-		Address:     csiSanityEndpoint,
+		Address:     endpoint,
 	}
 	sanity.Test(t, config)