Merge pull request #10174 from dcantah/simplify-errs

Chore: Simplify some syscall error checks

pkg/dialer/dialer_unix.go

@@ -19,9 +19,9 @@
 package dialer
 
 import (
+	"errors"
 	"fmt"
 	"net"
-	"os"
 	"strings"
 	"syscall"
 	"time"
@@ -34,16 +34,7 @@ func DialAddress(address string) string {
 }
 
 func isNoent(err error) bool {
-	if err != nil {
+	return errors.Is(err, syscall.ENOENT)
-		if nerr, ok := err.(*net.OpError); ok {
-			if serr, ok := nerr.Err.(*os.SyscallError); ok {
-				if serr.Err == syscall.ENOENT {
-					return true
-				}
-			}
-		}
-	}
-	return false
 }
 
 func dialer(address string, timeout time.Duration) (net.Conn, error) {

pkg/shim/util_unix.go

@@ -22,6 +22,7 @@ import (
 	"bufio"
 	"context"
 	"crypto/sha256"
+	"errors"
 	"fmt"
 	"io"
 	"math"
@@ -173,22 +174,14 @@ func RemoveSocket(address string) error {
 // SocketEaddrinuse returns true if the provided error is caused by the
 // EADDRINUSE error number
 func SocketEaddrinuse(err error) bool {
-	netErr, ok := err.(*net.OpError)
+	var netErr *net.OpError
-	if !ok {
+	if errors.As(err, &netErr) {
-		return false
+		if netErr.Op != "listen" {
+			return false
+		}
+		return errors.Is(err, syscall.EADDRINUSE)
 	}
-	if netErr.Op != "listen" {
+	return false
-		return false
-	}
-	syscallErr, ok := netErr.Err.(*os.SyscallError)
-	if !ok {
-		return false
-	}
-	errno, ok := syscallErr.Err.(syscall.Errno)
-	if !ok {
-		return false
-	}
-	return errno == syscall.EADDRINUSE
 }
 
 // CanConnect returns true if the socket provided at the address