dns: Move CheckCRCLocalDNSReachableFromHost from network to dns package

The 'dns' package already contains the other CheckCRC*Reachable*
functions, so it makes sense to also have CheckCRCLocalDNSReachableFromHost
This remove the cyclic dependency introduced in the previous commit.

pkg/crc/machine/start.go

@@ -469,7 +469,7 @@ func (client *client) Start(ctx context.Context, startConfig types.StartConfig)
 
 	// Check DNS lookup from host to VM
 	logging.Info("Check DNS query from host...")
-	if err := network.CheckCRCLocalDNSReachableFromHost(vm.bundle.GetAPIHostname(),
+	if err := dns.CheckCRCLocalDNSReachableFromHost(vm.bundle.GetAPIHostname(),
 		vm.bundle.GetAppHostname("foo"), vm.bundle.ClusterInfo.AppsDomain, instanceIP); err != nil {
 		if !client.useVSock() {
 			return nil, errors.Wrap(err, "Failed to query DNS from host")

pkg/crc/network/utils.go

@@ -2,11 +2,7 @@ package network
 
 import (
 	"fmt"
-	"net"
 	"net/url"
-	"runtime"
-
-	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 func URIStringForDisplay(uri string) (string, error) {
@@ -19,47 +15,3 @@ func URIStringForDisplay(uri string) (string, error) {
 	}
 	return uri, nil
 }
-
-func matchIP(ips []net.IP, expectedIP string) bool {
-	for _, ip := range ips {
-		if ip.String() == expectedIP {
-			return true
-		}
-	}
-
-	return false
-}
-func CheckCRCLocalDNSReachableFromHost(apiHostname, appsHostname, appsDomain, expectedIP string) error {
-	ip, err := net.LookupIP(apiHostname)
-	if err != nil {
-		return err
-	}
-	logging.Debugf("%s resolved to %s", apiHostname, ip)
-	if !matchIP(ip, expectedIP) {
-		logging.Warnf("%s resolved to %s but %s was expected", apiHostname, ip, expectedIP)
-		return fmt.Errorf("Invalid IP for %s", apiHostname)
-	}
-
-	if runtime.GOOS != "darwin" {
-		/* This check will fail with !CGO_ENABLED builds on darwin as
-		 * in this case, /etc/resolver/ will not be used, so we won't
-		 * have wildcard DNS for our domains
-		 */
-		ip, err = net.LookupIP(appsHostname)
-		if err != nil {
-			// Right now admin helper fallback is not implemented on windows so
-			// this check should still return an error.
-			if runtime.GOOS == "windows" {
-				return err
-			}
-			logging.Warnf("Wildcard DNS resolution for %s does not appear to be working", appsDomain)
-			return nil
-		}
-		logging.Debugf("%s resolved to %s", appsHostname, ip)
-		if !matchIP(ip, expectedIP) {
-			logging.Warnf("%s resolved to %s but %s was expected", appsHostname, ip, expectedIP)
-			return fmt.Errorf("Invalid IP for %s", appsHostname)
-		}
-	}
-	return nil
-}

pkg/crc/services/dns/dns.go

@@ -3,11 +3,14 @@ package dns
 import (
 	"context"
 	"fmt"
+	"net"
+	"runtime"
 	"time"
 
 	"github.com/crc-org/crc/pkg/crc/adminhelper"
 	"github.com/crc-org/crc/pkg/crc/constants"
 	"github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	"github.com/crc-org/crc/pkg/crc/network"
 	"github.com/crc-org/crc/pkg/crc/services"
 	"github.com/crc-org/crc/pkg/crc/systemd"
@@ -142,6 +145,51 @@ func CheckCRCPublicDNSReachable(serviceConfig services.ServicePostStartConfig) (
 	return stdout, err
 }
 
+func CheckCRCLocalDNSReachableFromHost(apiHostname, appsHostname, appsDomain, expectedIP string) error {
+	ip, err := net.LookupIP(apiHostname)
+	if err != nil {
+		return err
+	}
+	logging.Debugf("%s resolved to %s", apiHostname, ip)
+	if !matchIP(ip, expectedIP) {
+		logging.Warnf("%s resolved to %s but %s was expected", apiHostname, ip, expectedIP)
+		return fmt.Errorf("Invalid IP for %s", apiHostname)
+	}
+
+	if runtime.GOOS != "darwin" {
+		/* This check will fail with !CGO_ENABLED builds on darwin as
+		 * in this case, /etc/resolver/ will not be used, so we won't
+		 * have wildcard DNS for our domains
+		 */
+		ip, err = net.LookupIP(appsHostname)
+		if err != nil {
+			// Right now admin helper fallback is not implemented on windows so
+			// this check should still return an error.
+			if runtime.GOOS == "windows" {
+				return err
+			}
+			logging.Warnf("Wildcard DNS resolution for %s does not appear to be working", appsDomain)
+			return nil
+		}
+		logging.Debugf("%s resolved to %s", appsHostname, ip)
+		if !matchIP(ip, expectedIP) {
+			logging.Warnf("%s resolved to %s but %s was expected", appsHostname, ip, expectedIP)
+			return fmt.Errorf("Invalid IP for %s", appsHostname)
+		}
+	}
+	return nil
+}
+
+func matchIP(ips []net.IP, expectedIP string) bool {
+	for _, ip := range ips {
+		if ip.String() == expectedIP {
+			return true
+		}
+	}
+
+	return false
+}
+
 func addOpenShiftHosts(serviceConfig services.ServicePostStartConfig) error {
 	return adminhelper.UpdateHostsFile(serviceConfig.IP, serviceConfig.BundleMetadata.GetAPIHostname(),
 		serviceConfig.BundleMetadata.GetAppHostname("oauth-openshift"),