chore(updater): common GetServers signature

- Log warnings when running outside of CLI mode
- Remove updater CLI bool setting
- Warnings are logged in updating functions

internal/provider/purevpn/updater/servers.go

@@ -7,27 +7,23 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"net/http"
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/models"
 	"github.com/qdm12/gluetun/internal/publicip"
 	"github.com/qdm12/gluetun/internal/updater/openvpn"
-	"github.com/qdm12/gluetun/internal/updater/resolver"
-	"github.com/qdm12/gluetun/internal/updater/unzip"
 )
 
 var ErrNotEnoughServers = errors.New("not enough servers found")
 
-func GetServers(ctx context.Context, client *http.Client,
-	unzipper unzip.Unzipper, presolver resolver.Parallel, minServers int) (
-	servers []models.Server, warnings []string, err error) {
+func (u *Updater) GetServers(ctx context.Context, minServers int) (
+	servers []models.Server, err error) {
 	const url = "https://d32d3g1fvkpl8y.cloudfront.net/heartbleed/windows/New+OVPN+Files.zip"
-	contents, err := unzipper.FetchAndExtract(ctx, url)
+	contents, err := u.unzipper.FetchAndExtract(ctx, url)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	} else if len(contents) < minServers {
-		return nil, nil, fmt.Errorf("%w: %d and expected at least %d",
+		return nil, fmt.Errorf("%w: %d and expected at least %d",
 			ErrNotEnoughServers, len(contents), minServers)
 	}
 
@@ -41,20 +37,18 @@ func GetServers(ctx context.Context, client *http.Client,
 		tcp, udp, err := openvpn.ExtractProto(content)
 		if err != nil {
 			// treat error as warning and go to next file
-			warning := err.Error() + " in " + fileName
-			warnings = append(warnings, warning)
+			u.warner.Warn(err.Error() + " in " + fileName)
 			continue
 		}
 
 		host, warning, err := openvpn.ExtractHost(content)
 		if warning != "" {
-			warnings = append(warnings, warning)
+			u.warner.Warn(warning)
 		}
 
 		if err != nil {
 			// treat error as warning and go to next file
-			warning := err.Error() + " in " + fileName
-			warnings = append(warnings, warning)
+			u.warner.Warn(err.Error() + " in " + fileName)
 			continue
 		}
 
@@ -62,15 +56,17 @@ func GetServers(ctx context.Context, client *http.Client,
 	}
 
 	if len(hts) < minServers {
-		return nil, warnings, fmt.Errorf("%w: %d and expected at least %d",
+		return nil, fmt.Errorf("%w: %d and expected at least %d",
 			ErrNotEnoughServers, len(hts), minServers)
 	}
 
 	hosts := hts.toHostsSlice()
-	hostToIPs, newWarnings, err := resolveHosts(ctx, presolver, hosts, minServers)
-	warnings = append(warnings, newWarnings...)
+	hostToIPs, warnings, err := resolveHosts(ctx, u.presolver, hosts, minServers)
+	for _, warning := range warnings {
+		u.warner.Warn(warning)
+	}
 	if err != nil {
-		return nil, warnings, err
+		return nil, err
 	}
 
 	hts.adaptWithIPs(hostToIPs)
@@ -78,7 +74,7 @@ func GetServers(ctx context.Context, client *http.Client,
 	servers = hts.toServersSlice()
 
 	if len(servers) < minServers {
-		return nil, warnings, fmt.Errorf("%w: %d and expected at least %d",
+		return nil, fmt.Errorf("%w: %d and expected at least %d",
 			ErrNotEnoughServers, len(servers), minServers)
 	}
 
@@ -87,9 +83,9 @@ func GetServers(ctx context.Context, client *http.Client,
 	for i := range servers {
 		ipsToGetInfo[i] = servers[i].IPs[0]
 	}
-	ipsInfo, err := publicip.MultiInfo(ctx, client, ipsToGetInfo)
+	ipsInfo, err := publicip.MultiInfo(ctx, u.client, ipsToGetInfo)
 	if err != nil {
-		return nil, warnings, err
+		return nil, err
 	}
 	for i := range servers {
 		servers[i].Country = ipsInfo[i].Country
@@ -99,5 +95,5 @@ func GetServers(ctx context.Context, client *http.Client,
 
 	sortServers(servers)
 
-	return servers, warnings, nil
+	return servers, nil
 }

internal/provider/purevpn/updater/updater.go

@@ -0,0 +1,29 @@
+package purevpn
+
+import (
+	"net/http"
+
+	"github.com/qdm12/gluetun/internal/updater/resolver"
+	"github.com/qdm12/gluetun/internal/updater/unzip"
+)
+
+type Updater struct {
+	client    *http.Client
+	unzipper  unzip.Unzipper
+	presolver resolver.Parallel
+	warner    Warner
+}
+
+type Warner interface {
+	Warn(s string)
+}
+
+func New(client *http.Client, unzipper unzip.Unzipper,
+	presolver resolver.Parallel, warner Warner) *Updater {
+	return &Updater{
+		client:    client,
+		unzipper:  unzipper,
+		presolver: presolver,
+		warner:    warner,
+	}
+}