Use net/netip.Addr instead of net.IP

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
containers · Feb 3, 2023 · 6f7c31e · 6f7c31e
1 parent 4f4914e
commit 6f7c31e
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/openshift/openshift-copies.go b/openshift/openshift-copies.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"net/netip"
 	"net/url"
 	"os"
 	"path"
@@ -874,11 +875,11 @@ func newProxierWithNoProxyCIDR(delegate func(req *http.Request) (*url.URL, error
 	noProxyEnv := os.Getenv("NO_PROXY")
 	noProxyRules := strings.Split(noProxyEnv, ",")
 
-	cidrs := []*net.IPNet{}
+	cidrs := []netip.Prefix{}
 	for _, noProxyRule := range noProxyRules {
-		_, cidr, _ := net.ParseCIDR(noProxyRule)
-		if cidr != nil {
-			cidrs = append(cidrs, cidr)
+		prefix, err := netip.ParsePrefix(noProxyRule)
+		if err == nil {
+			cidrs = append(cidrs, prefix)
 		}
 	}
 
@@ -889,20 +890,20 @@ func newProxierWithNoProxyCIDR(delegate func(req *http.Request) (*url.URL, error
 	return func(req *http.Request) (*url.URL, error) {
 		host := req.URL.Host
 		// for some urls, the Host is already the host, not the host:port
-		if net.ParseIP(host) == nil {
+		if _, err := netip.ParseAddr(host); err != nil {
 			var err error
 			host, _, err = net.SplitHostPort(req.URL.Host)
 			if err != nil {
 				return delegate(req)
 			}
 		}
 
-		ip := net.ParseIP(host)
-		if ip == nil {
+		ip, err := netip.ParseAddr(host)
+		if err != nil {
 			return delegate(req)
 		}
 
-		if slices.ContainsFunc(cidrs, func(cidr *net.IPNet) bool {
+		if slices.ContainsFunc(cidrs, func(cidr netip.Prefix) bool {
 			return cidr.Contains(ip)
 		}) {
 			return nil, nil