diff --git a/internal/provider/cyberghost/updater/servers.go b/internal/provider/cyberghost/updater/servers.go index a0e53b5c..b6ceb0fa 100644 --- a/internal/provider/cyberghost/updater/servers.go +++ b/internal/provider/cyberghost/updater/servers.go @@ -9,7 +9,7 @@ import ( "github.com/qdm12/gluetun/internal/models" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { possibleServers := getPossibleServers() diff --git a/internal/provider/expressvpn/updater/servers.go b/internal/provider/expressvpn/updater/servers.go index dd1d7ec9..8c620e2b 100644 --- a/internal/provider/expressvpn/updater/servers.go +++ b/internal/provider/expressvpn/updater/servers.go @@ -12,7 +12,7 @@ import ( "github.com/qdm12/gluetun/internal/provider/common" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { servers = hardcodedServers() diff --git a/internal/provider/fastestvpn/updater/servers.go b/internal/provider/fastestvpn/updater/servers.go index 10b2a195..07e02ded 100644 --- a/internal/provider/fastestvpn/updater/servers.go +++ b/internal/provider/fastestvpn/updater/servers.go @@ -13,7 +13,7 @@ import ( "github.com/qdm12/gluetun/internal/updater/openvpn" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { const url = "https://support.fastestvpn.com/download/openvpn-tcp-udp-config-files" contents, err := u.unzipper.FetchAndExtract(ctx, url) diff --git a/internal/provider/hidemyass/updater/servers.go b/internal/provider/hidemyass/updater/servers.go index befbdd77..bbda07dc 100644 --- a/internal/provider/hidemyass/updater/servers.go +++ b/internal/provider/hidemyass/updater/servers.go @@ -12,7 +12,7 @@ import ( "github.com/qdm12/gluetun/internal/provider/common" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { tcpHostToURL, udpHostToURL, err := getAllHostToURL(ctx, u.client) if err != nil { diff --git a/internal/provider/ipvanish/updater/servers.go b/internal/provider/ipvanish/updater/servers.go index e15e97f2..fabc0144 100644 --- a/internal/provider/ipvanish/updater/servers.go +++ b/internal/provider/ipvanish/updater/servers.go @@ -15,7 +15,7 @@ import ( "golang.org/x/text/language" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { const url = "https://www.ipvanish.com/software/configs/configs.zip" contents, err := u.unzipper.FetchAndExtract(ctx, url) diff --git a/internal/provider/ipvanish/updater/servers_test.go b/internal/provider/ipvanish/updater/servers_test.go index 12642804..b88f0873 100644 --- a/internal/provider/ipvanish/updater/servers_test.go +++ b/internal/provider/ipvanish/updater/servers_test.go @@ -183,7 +183,7 @@ func Test_Updater_GetServers(t *testing.T) { updater := New(unzipper, presolver, warner) - servers, err := updater.GetServers(ctx, testCase.minServers) + servers, err := updater.FetchServers(ctx, testCase.minServers) assert.Equal(t, testCase.servers, servers) if testCase.err != nil { diff --git a/internal/provider/ivpn/updater/servers.go b/internal/provider/ivpn/updater/servers.go index b1791591..e73f6e0a 100644 --- a/internal/provider/ivpn/updater/servers.go +++ b/internal/provider/ivpn/updater/servers.go @@ -12,7 +12,7 @@ import ( "github.com/qdm12/gluetun/internal/provider/common" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { data, err := fetchAPI(ctx, u.client) if err != nil { diff --git a/internal/provider/ivpn/updater/servers_test.go b/internal/provider/ivpn/updater/servers_test.go index 2f3d9aae..7c21e761 100644 --- a/internal/provider/ivpn/updater/servers_test.go +++ b/internal/provider/ivpn/updater/servers_test.go @@ -142,7 +142,7 @@ func Test_Updater_GetServers(t *testing.T) { updater := New(client, presolver, warner) - servers, err := updater.GetServers(ctx, testCase.minServers) + servers, err := updater.FetchServers(ctx, testCase.minServers) assert.Equal(t, testCase.servers, servers) if testCase.err != nil { diff --git a/internal/provider/mullvad/updater/servers.go b/internal/provider/mullvad/updater/servers.go index e0d8a8c7..4eb46d9c 100644 --- a/internal/provider/mullvad/updater/servers.go +++ b/internal/provider/mullvad/updater/servers.go @@ -11,7 +11,7 @@ import ( "github.com/qdm12/gluetun/internal/provider/common" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { data, err := fetchAPI(ctx, u.client) if err != nil { diff --git a/internal/provider/nordvpn/updater/servers.go b/internal/provider/nordvpn/updater/servers.go index be45ddfe..3769d147 100644 --- a/internal/provider/nordvpn/updater/servers.go +++ b/internal/provider/nordvpn/updater/servers.go @@ -19,7 +19,7 @@ var ( ErrNotIPv4 = errors.New("IP address is not IPv4") ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { data, err := fetchAPI(ctx, u.client) if err != nil { diff --git a/internal/provider/perfectprivacy/updater/servers.go b/internal/provider/perfectprivacy/updater/servers.go index 88f9d324..26d71a55 100644 --- a/internal/provider/perfectprivacy/updater/servers.go +++ b/internal/provider/perfectprivacy/updater/servers.go @@ -12,7 +12,7 @@ import ( "github.com/qdm12/gluetun/internal/updater/openvpn" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { zipURL := url.URL{ Scheme: "https", diff --git a/internal/provider/privado/updater/servers.go b/internal/provider/privado/updater/servers.go index 6adbb3f4..c8c07a58 100644 --- a/internal/provider/privado/updater/servers.go +++ b/internal/provider/privado/updater/servers.go @@ -13,7 +13,7 @@ import ( "github.com/qdm12/gluetun/internal/updater/openvpn" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { const url = "https://privado.io/apps/ovpn_configs.zip" contents, err := u.unzipper.FetchAndExtract(ctx, url) diff --git a/internal/provider/privateinternetaccess/updater/servers.go b/internal/provider/privateinternetaccess/updater/servers.go index e66e824c..4d632bb4 100644 --- a/internal/provider/privateinternetaccess/updater/servers.go +++ b/internal/provider/privateinternetaccess/updater/servers.go @@ -12,7 +12,7 @@ import ( "github.com/qdm12/gluetun/internal/provider/common" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { nts := make(nameToServer) diff --git a/internal/provider/privatevpn/updater/servers.go b/internal/provider/privatevpn/updater/servers.go index 3811988f..fe4ade28 100644 --- a/internal/provider/privatevpn/updater/servers.go +++ b/internal/provider/privatevpn/updater/servers.go @@ -14,7 +14,7 @@ import ( "github.com/qdm12/gluetun/internal/updater/openvpn" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { const url = "https://privatevpn.com/client/PrivateVPN-TUN.zip" contents, err := u.unzipper.FetchAndExtract(ctx, url) diff --git a/internal/provider/protonvpn/updater/servers.go b/internal/provider/protonvpn/updater/servers.go index 9344fe52..37e50d9a 100644 --- a/internal/provider/protonvpn/updater/servers.go +++ b/internal/provider/protonvpn/updater/servers.go @@ -12,7 +12,7 @@ import ( "github.com/qdm12/gluetun/internal/provider/common" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { data, err := fetchAPI(ctx, u.client) if err != nil { diff --git a/internal/provider/purevpn/updater/servers.go b/internal/provider/purevpn/updater/servers.go index 8cac1206..e4205e9b 100644 --- a/internal/provider/purevpn/updater/servers.go +++ b/internal/provider/purevpn/updater/servers.go @@ -15,7 +15,7 @@ import ( "github.com/qdm12/gluetun/internal/updater/openvpn" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { const url = "https://d32d3g1fvkpl8y.cloudfront.net/heartbleed/windows/New+OVPN+Files.zip" contents, err := u.unzipper.FetchAndExtract(ctx, url) diff --git a/internal/provider/surfshark/updater/servers.go b/internal/provider/surfshark/updater/servers.go index 299253b6..5fd4bdef 100644 --- a/internal/provider/surfshark/updater/servers.go +++ b/internal/provider/surfshark/updater/servers.go @@ -11,7 +11,7 @@ import ( "github.com/qdm12/gluetun/internal/provider/common" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { hts := make(hostToServer) diff --git a/internal/provider/torguard/updater/servers.go b/internal/provider/torguard/updater/servers.go index 7503e9aa..571b12ec 100644 --- a/internal/provider/torguard/updater/servers.go +++ b/internal/provider/torguard/updater/servers.go @@ -15,7 +15,7 @@ import ( "golang.org/x/text/language" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { const tcpURL = "https://torguard.net/downloads/OpenVPN-TCP-Linux.zip" tcpContents, err := u.unzipper.FetchAndExtract(ctx, tcpURL) diff --git a/internal/provider/vpnunlimited/updater/servers.go b/internal/provider/vpnunlimited/updater/servers.go index ef5c5f17..133d2a4a 100644 --- a/internal/provider/vpnunlimited/updater/servers.go +++ b/internal/provider/vpnunlimited/updater/servers.go @@ -11,7 +11,7 @@ import ( "github.com/qdm12/gluetun/internal/provider/common" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { // Hardcoded data from a user provided ZIP file since it's behind a login wall hts, warnings := getHostToServer() diff --git a/internal/provider/vyprvpn/updater/servers.go b/internal/provider/vyprvpn/updater/servers.go index 4448555e..40d28dd4 100644 --- a/internal/provider/vyprvpn/updater/servers.go +++ b/internal/provider/vyprvpn/updater/servers.go @@ -13,7 +13,7 @@ import ( "github.com/qdm12/gluetun/internal/updater/openvpn" ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { const url = "https://support.vyprvpn.com/hc/article_attachments/360052617332/Vypr_OpenVPN_20200320.zip" contents, err := u.unzipper.FetchAndExtract(ctx, url) diff --git a/internal/provider/wevpn/updater/servers.go b/internal/provider/wevpn/updater/servers.go index 12d4288a..88b4da02 100644 --- a/internal/provider/wevpn/updater/servers.go +++ b/internal/provider/wevpn/updater/servers.go @@ -18,7 +18,7 @@ var ( ErrGetAPI = errors.New("cannot fetch server information from API") ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { cities := getAvailableCities() servers = make([]models.Server, 0, len(cities)) diff --git a/internal/provider/windscribe/updater/servers.go b/internal/provider/windscribe/updater/servers.go index 4c6ee3e5..da4b1471 100644 --- a/internal/provider/windscribe/updater/servers.go +++ b/internal/provider/windscribe/updater/servers.go @@ -18,7 +18,7 @@ var ( ErrNoWireguardKey = errors.New("no wireguard public key found") ) -func (u *Updater) GetServers(ctx context.Context, minServers int) ( +func (u *Updater) FetchServers(ctx context.Context, minServers int) ( servers []models.Server, err error) { data, err := fetchAPI(ctx, u.client) if err != nil { diff --git a/internal/updater/providers.go b/internal/updater/providers.go index 35e5ecad..a04308ac 100644 --- a/internal/updater/providers.go +++ b/internal/updater/providers.go @@ -31,7 +31,7 @@ import ( func (u *Updater) updateProvider(ctx context.Context, provider string) (err error) { existingServersCount := u.storage.GetServersCount(provider) minServers := getMinServers(existingServersCount) - servers, err := u.getServers(ctx, provider, minServers) + servers, err := u.fetchServers(ctx, provider, minServers) if err != nil { return fmt.Errorf("cannot get servers: %w", err) } @@ -51,10 +51,10 @@ func (u *Updater) updateProvider(ctx context.Context, provider string) (err erro return nil } -func (u *Updater) getServers(ctx context.Context, provider string, +func (u *Updater) fetchServers(ctx context.Context, provider string, minServers int) (servers []models.Server, err error) { var providerUpdater interface { - GetServers(ctx context.Context, minServers int) (servers []models.Server, err error) + FetchServers(ctx context.Context, minServers int) (servers []models.Server, err error) } switch provider { case providers.Custom: @@ -103,7 +103,7 @@ func (u *Updater) getServers(ctx context.Context, provider string, panic("provider " + provider + " is unknown") } - return providerUpdater.GetServers(ctx, minServers) + return providerUpdater.FetchServers(ctx, minServers) } func getMinServers(existingServersCount int) (minServers int) {