chore(all): replace net.IP with netip.Addr

internal/provider/windscribe/updater/api.go

@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net"
 	"net/http"
+	"net/netip"
 	"strconv"
 	"time"
 )
@@ -32,10 +32,10 @@ type groupData struct {
 }
 
 type serverData struct {
-	Hostname string `json:"hostname"`
-	IP       net.IP `json:"ip"`
-	IP2      net.IP `json:"ip2"`
-	IP3      net.IP `json:"ip3"`
+	Hostname string     `json:"hostname"`
+	IP       netip.Addr `json:"ip"`
+	IP2      netip.Addr `json:"ip2"`
+	IP3      netip.Addr `json:"ip3"`
 }
 
 func fetchAPI(ctx context.Context, client *http.Client) (

internal/provider/windscribe/updater/servers.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 	"sort"
 
 	"github.com/qdm12/gluetun/internal/constants/vpn"
@@ -30,11 +30,11 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
 			x5090Name := group.OvpnX509
 			wgPubKey := group.WgPubKey
 			for _, node := range group.Nodes {
-				ips := make([]net.IP, 0, 2) //nolint:gomnd
-				if node.IP != nil {
+				ips := make([]netip.Addr, 0, 2) //nolint:gomnd
+				if node.IP.IsValid() {
 					ips = append(ips, node.IP)
 				}
-				if node.IP2 != nil {
+				if node.IP2.IsValid() {
 					ips = append(ips, node.IP2)
 				}
 				server := models.Server{
@@ -49,7 +49,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
 				}
 				servers = append(servers, server)
 
-				if node.IP3 == nil { // Wireguard + Stealth
+				if !node.IP3.IsValid() { // Wireguard + Stealth
 					continue
 				} else if wgPubKey == "" {
 					return nil, fmt.Errorf("%w: for node %s", ErrNoWireguardKey, node.Hostname)
@@ -60,7 +60,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
 				server.TCP = false
 				server.OvpnX509 = ""
 				server.WgPubKey = wgPubKey
-				server.IPs = []net.IP{node.IP3}
+				server.IPs = []netip.Addr{node.IP3}
 				servers = append(servers, server)
 			}
 		}