Skip to content

Commit

Permalink
Fix unnecessary slash path joining that doesn't work on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
wongma7 committed Mar 9, 2021
1 parent fa6632d commit 9cfb523
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions pkg/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import (
"fmt"
"net/url"
"os"
"path"
"path/filepath"
"strings"

csi "github.com/container-storage-interface/spec/lib/go/csi"
Expand Down Expand Up @@ -59,13 +57,13 @@ func ParseEndpoint(endpoint string) (string, string, error) {
return "", "", fmt.Errorf("could not parse endpoint: %v", err)
}

addr := path.Join(u.Host, filepath.FromSlash(u.Path))
addr := u.Path

scheme := strings.ToLower(u.Scheme)
switch scheme {
case "tcp":
addr = u.Host
case "unix":
addr = path.Join("/", addr)
if err := os.Remove(addr); err != nil && !os.IsNotExist(err) {
return "", "", fmt.Errorf("could not remove unix domain socket %q: %v", addr, err)
}
Expand Down

0 comments on commit 9cfb523

Please sign in to comment.