fix/pr: fixes from pr review

NOTE: all these follow-up commits will be squashed after the review
is done.

What changed in this commit:

- refactor the code to make the dial retry logic be the same across
  platforms.
- a number of code duplication fixes and refactors, raised by @jedevc

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>

client/client_test.go

@@ -224,31 +224,33 @@ func testIntegration(t *testing.T, funcs ...func(t *testing.T, sb integration.Sa
 	tests = append(tests, diffOpTestCases()...)
 	integration.Run(t, tests, mirrors)
 
-	integration.Run(t, integration.TestFuncs(
-		testSecurityMode,
-		testSecurityModeSysfs,
-		testSecurityModeErrors,
-	),
+	integration.Run(
+		t,
+		integration.TestFuncs(
+			testSecurityMode,
+			testSecurityModeSysfs,
+			testSecurityModeErrors,
+		),
 		mirrors,
 		integration.WithMatrix("secmode", map[string]interface{}{
 			"sandbox":  securitySandbox,
 			"insecure": securityInsecure,
 		}),
 	)
 
-	integration.Run(t, integration.TestFuncs(
-		testHostNetworking,
-	),
+	integration.Run(
+		t,
+		integration.TestFuncs(testHostNetworking),
 		mirrors,
 		integration.WithMatrix("netmode", map[string]interface{}{
 			"default": defaultNetwork,
 			"host":    hostNetwork,
 		}),
 	)
 
-	integration.Run(t, integration.TestFuncs(
-		testBridgeNetworkingDNSNoRootless,
-	),
+	integration.Run(
+		t,
+		integration.TestFuncs(testBridgeNetworkingDNSNoRootless),
 		mirrors,
 		integration.WithMatrix("netmode", map[string]interface{}{
 			"dns": bridgeDNSNetwork,

util/testutil/integration/sanbox_windows.go

@@ -0,0 +1,6 @@
+package integration
+
+func RootlessSupported(uid int) bool {
+	// not supported on Windows
+	return false
+}

util/testutil/integration/sandbox.go

@@ -11,7 +11,6 @@ import (
 	"testing"
 
 	"github.com/google/shlex"
-	"github.com/moby/buildkit/util/bklog"
 	"github.com/pkg/errors"
 )
 
@@ -113,16 +112,6 @@ func newSandbox(ctx context.Context, w Worker, mirror string, mv matrixValue) (s
 	}, cl, nil
 }
 
-func RootlessSupported(uid int) bool {
-	cmd := exec.Command("sudo", "-u", fmt.Sprintf("#%d", uid), "-i", "--", "exec", "unshare", "-U", "true") //nolint:gosec // test utility
-	b, err := cmd.CombinedOutput()
-	if err != nil {
-		bklog.L.Warnf("rootless mode is not supported on this host: %v (%s)", err, string(b))
-		return false
-	}
-	return true
-}
-
 func PrintLogs(logs map[string]*bytes.Buffer, f func(args ...interface{})) {
 	for name, l := range logs {
 		f(name)

util/testutil/integration/sandbox_unix.go

@@ -0,0 +1,21 @@
+//go:build !windows
+// +build !windows
+
+package integration
+
+import (
+	"fmt"
+	"os/exec"
+
+	"github.com/moby/buildkit/util/bklog"
+)
+
+func RootlessSupported(uid int) bool {
+	cmd := exec.Command("sudo", "-u", fmt.Sprintf("#%d", uid), "-i", "--", "exec", "unshare", "-U", "true") //nolint:gosec // test utility
+	b, err := cmd.CombinedOutput()
+	if err != nil {
+		bklog.L.Warnf("rootless mode is not supported on this host: %v (%s)", err, string(b))
+		return false
+	}
+	return true
+}

util/testutil/integration/util.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"strings"
 	"sync"
 	"syscall"
 	"testing"
@@ -102,7 +103,25 @@ func StartCmd(cmd *exec.Cmd, logs map[string]*bytes.Buffer) (func() error, error
 // On Linux this socket is typically a Unix socket,
 // while on Windows this will be a named pipe.
 func WaitSocket(address string, d time.Duration, cmd *exec.Cmd) error {
-	return waitSocket(address, d, cmd)
+	address = strings.TrimPrefix(address, socketScheme)
+	step := 50 * time.Millisecond
+	i := 0
+	for {
+		if cmd != nil && cmd.ProcessState != nil {
+			return errors.Errorf("process exited: %s", cmd.String())
+		}
+
+		if conn, err := dialPipe(address); err == nil {
+			conn.Close()
+			break
+		}
+		i++
+		if time.Duration(i)*step > d {
+			return errors.Errorf("failed dialing: %s", address)
+		}
+		time.Sleep(step)
+	}
+	return nil
 }
 
 func LookupBinary(name string) error {

util/testutil/integration/util_unix.go

@@ -5,36 +5,19 @@ package integration
 
 import (
 	"net"
-	"os/exec"
-	"strings"
-	"time"
 
 	"github.com/pkg/errors"
 )
 
-func waitSocket(address string, d time.Duration, cmd *exec.Cmd) error {
-	address = strings.TrimPrefix(address, "unix://")
+var socketScheme = "unix://"
+
+// abstracted function to handle pipe dialing on
+// Some simplification has been made to discard
+// laddr for unix -- left as nil.
+func dialPipe(address string) (net.Conn, error) {
 	addr, err := net.ResolveUnixAddr("unix", address)
 	if err != nil {
-		return errors.Wrapf(err, "failed resolving unix addr: %s", address)
-	}
-
-	step := 50 * time.Millisecond
-	i := 0
-	for {
-		if cmd != nil && cmd.ProcessState != nil {
-			return errors.Errorf("process exited: %s", cmd.String())
-		}
-
-		if conn, err := net.DialUnix("unix", nil, addr); err == nil {
-			conn.Close()
-			break
-		}
-		i++
-		if time.Duration(i)*step > d {
-			return errors.Errorf("failed dialing: %s", address)
-		}
-		time.Sleep(step)
+		return nil, errors.Wrapf(err, "failed resolving unix addr: %s", address)
 	}
-	return nil
+	return net.DialUnix("unix", nil, addr)
 }

util/testutil/integration/util_windows.go

@@ -1,33 +1,15 @@
 package integration
 
 import (
-	"os/exec"
-	"strings"
-	"time"
+	"net"
 
 	"github.com/Microsoft/go-winio"
-	"github.com/pkg/errors"
 )
 
-func waitSocket(address string, d time.Duration, cmd *exec.Cmd) error {
-	address = strings.TrimPrefix(address, "npipe://")
-	step := 50 * time.Millisecond
-	i := 0
+var socketScheme = "npipe://"
 
-	for {
-		if cmd != nil && cmd.ProcessState != nil {
-			return errors.Errorf("process exited: %s", cmd.String())
-		}
-
-		if conn, err := winio.DialPipe(address, nil); err == nil {
-			conn.Close()
-			break
-		}
-		i++
-		if time.Duration(i)*step > d {
-			return errors.Errorf("failed dialing: %s", address)
-		}
-		time.Sleep(step)
-	}
-	return nil
+// abstracted function to handle pipe dialing on
+// Some simplification has been made to discard timeout param
+func dialPipe(address string) (net.Conn, error) {
+	return winio.DialPipe(address, nil)
 }

util/testutil/workers/containerd.go

@@ -108,7 +108,7 @@ func (c *Containerd) New(ctx context.Context, cfg *integration.BackendConfig) (b
 	}()
 
 	rootless := false
-	if runtime.GOOS != "windows" && c.UID != 0 {
+	if c.UID != 0 {
 		if c.GID == 0 {
 			return nil, nil, errors.Errorf("unsupported id pair: uid=%d, gid=%d", c.UID, c.GID)
 		}