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>
		
			
				
	
	
		
			48 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			48 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
/*
 | 
						|
   Copyright The containerd Authors.
 | 
						|
 | 
						|
   Licensed under the Apache License, Version 2.0 (the "License");
 | 
						|
   you may not use this file except in compliance with the License.
 | 
						|
   You may obtain a copy of the License at
 | 
						|
 | 
						|
       http://www.apache.org/licenses/LICENSE-2.0
 | 
						|
 | 
						|
   Unless required by applicable law or agreed to in writing, software
 | 
						|
   distributed under the License is distributed on an "AS IS" BASIS,
 | 
						|
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
						|
   See the License for the specific language governing permissions and
 | 
						|
   limitations under the License.
 | 
						|
*/
 | 
						|
 | 
						|
package dialer
 | 
						|
 | 
						|
import (
 | 
						|
	"fmt"
 | 
						|
	"net"
 | 
						|
	"os"
 | 
						|
	"path/filepath"
 | 
						|
	"strings"
 | 
						|
	"time"
 | 
						|
 | 
						|
	winio "github.com/Microsoft/go-winio"
 | 
						|
)
 | 
						|
 | 
						|
func isNoent(err error) bool {
 | 
						|
	return os.IsNotExist(err)
 | 
						|
}
 | 
						|
 | 
						|
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 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
 | 
						|
}
 |