Skip to content

Commit

Permalink
fix(pkg/dialer): minor fix on dialer function for windows
Browse files Browse the repository at this point in the history
This commit fixes the dialer function to make sure that
"npipe://" prefix is trimmed, just like the way it is done
in the Unix counterpart, `./dialer_unix.go:50`

This will also unblock some downstream work going on in
buildkit; setting up integration tests to run on Windows.

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
  • Loading branch information
profnandaa committed Dec 11, 2023
1 parent 64b8a81 commit 68d2373
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion pkg/dialer/dialer_windows.go
Expand Up @@ -17,8 +17,11 @@
package dialer

import (
"fmt"
"net"
"os"
"path/filepath"
"strings"
"time"

winio "github.com/Microsoft/go-winio"
Expand All @@ -29,10 +32,16 @@ func isNoent(err error) bool {
}

func dialer(address string, timeout time.Duration) (net.Conn, error) {
address = strings.TrimPrefix(filepath.ToSlash(address), "npipe://")
return winio.DialPipe(address, &timeout)
}

// DialAddress returns the dial address
// DialAddress returns the dial address with npipe:// prepended to the
// provided address
func DialAddress(address string) string {
address = filepath.ToSlash(address)
if !strings.HasPrefix(address, "npipe://") {
address = fmt.Sprintf("npipe://%s", address)
}
return address
}

0 comments on commit 68d2373

Please sign in to comment.