diff --git a/internal/provider/cyberghost/updater/servers.go b/internal/provider/cyberghost/updater/servers.go index a33560ea..13a2401b 100644 --- a/internal/provider/cyberghost/updater/servers.go +++ b/internal/provider/cyberghost/updater/servers.go @@ -17,7 +17,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( possibleHosts := possibleServers.hostsSlice() resolveSettings := parallelResolverSettings(possibleHosts) - hostToIPs, _, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, _, err := u.parallelResolver.Resolve(ctx, resolveSettings) if err != nil { return nil, err } diff --git a/internal/provider/cyberghost/updater/updater.go b/internal/provider/cyberghost/updater/updater.go index b46befa2..12134601 100644 --- a/internal/provider/cyberghost/updater/updater.go +++ b/internal/provider/cyberghost/updater/updater.go @@ -5,11 +5,11 @@ import ( ) type Updater struct { - presolver common.ParallelResolver + parallelResolver common.ParallelResolver } func New(parallelResolver common.ParallelResolver) *Updater { return &Updater{ - presolver: parallelResolver, + parallelResolver: parallelResolver, } } diff --git a/internal/provider/expressvpn/updater/servers.go b/internal/provider/expressvpn/updater/servers.go index 9280a75f..4bf2db3b 100644 --- a/internal/provider/expressvpn/updater/servers.go +++ b/internal/provider/expressvpn/updater/servers.go @@ -22,7 +22,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( } resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/expressvpn/updater/updater.go b/internal/provider/expressvpn/updater/updater.go index de83c263..3fbee059 100644 --- a/internal/provider/expressvpn/updater/updater.go +++ b/internal/provider/expressvpn/updater/updater.go @@ -5,16 +5,16 @@ import ( ) type Updater struct { - unzipper common.Unzipper - presolver common.ParallelResolver - warner common.Warner + unzipper common.Unzipper + parallelResolver common.ParallelResolver + warner common.Warner } func New(unzipper common.Unzipper, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - unzipper: unzipper, - presolver: parallelResolver, - warner: warner, + unzipper: unzipper, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/fastestvpn/updater/servers.go b/internal/provider/fastestvpn/updater/servers.go index 9c59da3e..5cb99267 100644 --- a/internal/provider/fastestvpn/updater/servers.go +++ b/internal/provider/fastestvpn/updater/servers.go @@ -57,7 +57,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( hosts := hts.toHostsSlice() resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/fastestvpn/updater/updater.go b/internal/provider/fastestvpn/updater/updater.go index de83c263..3fbee059 100644 --- a/internal/provider/fastestvpn/updater/updater.go +++ b/internal/provider/fastestvpn/updater/updater.go @@ -5,16 +5,16 @@ import ( ) type Updater struct { - unzipper common.Unzipper - presolver common.ParallelResolver - warner common.Warner + unzipper common.Unzipper + parallelResolver common.ParallelResolver + warner common.Warner } func New(unzipper common.Unzipper, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - unzipper: unzipper, - presolver: parallelResolver, - warner: warner, + unzipper: unzipper, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/hidemyass/updater/servers.go b/internal/provider/hidemyass/updater/servers.go index 44d3496d..a8ab3c23 100644 --- a/internal/provider/hidemyass/updater/servers.go +++ b/internal/provider/hidemyass/updater/servers.go @@ -27,7 +27,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( } resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/hidemyass/updater/updater.go b/internal/provider/hidemyass/updater/updater.go index f75e7b12..f15a2f3a 100644 --- a/internal/provider/hidemyass/updater/updater.go +++ b/internal/provider/hidemyass/updater/updater.go @@ -7,16 +7,16 @@ import ( ) type Updater struct { - client *http.Client - presolver common.ParallelResolver - warner common.Warner + client *http.Client + parallelResolver common.ParallelResolver + warner common.Warner } func New(client *http.Client, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - client: client, - presolver: parallelResolver, - warner: warner, + client: client, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/ipvanish/updater/servers.go b/internal/provider/ipvanish/updater/servers.go index f3cd8a1d..f903f727 100644 --- a/internal/provider/ipvanish/updater/servers.go +++ b/internal/provider/ipvanish/updater/servers.go @@ -68,7 +68,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( hosts := hts.toHostsSlice() resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/ipvanish/updater/servers_test.go b/internal/provider/ipvanish/updater/servers_test.go index 5f92f968..1ae6a924 100644 --- a/internal/provider/ipvanish/updater/servers_test.go +++ b/internal/provider/ipvanish/updater/servers_test.go @@ -199,16 +199,16 @@ func Test_Updater_GetServers(t *testing.T) { unzipper.EXPECT().FetchAndExtract(ctx, zipURL). Return(testCase.unzipContents, testCase.unzipErr) - presolver := common.NewMockParallelResolver(ctrl) + parallelResolver := common.NewMockParallelResolver(ctrl) if testCase.expectResolve { - presolver.EXPECT().Resolve(ctx, testCase.resolverSettings). + parallelResolver.EXPECT().Resolve(ctx, testCase.resolverSettings). Return(testCase.hostToIPs, testCase.resolveWarnings, testCase.resolveErr) } updater := &Updater{ - unzipper: unzipper, - warner: testCase.warnerBuilder(ctrl), - presolver: presolver, + unzipper: unzipper, + warner: testCase.warnerBuilder(ctrl), + parallelResolver: parallelResolver, } servers, err := updater.FetchServers(ctx, testCase.minServers) diff --git a/internal/provider/ipvanish/updater/updater.go b/internal/provider/ipvanish/updater/updater.go index 6b9be217..223cb0ed 100644 --- a/internal/provider/ipvanish/updater/updater.go +++ b/internal/provider/ipvanish/updater/updater.go @@ -5,16 +5,16 @@ import ( ) type Updater struct { - unzipper common.Unzipper - warner common.Warner - presolver common.ParallelResolver + unzipper common.Unzipper + warner common.Warner + parallelResolver common.ParallelResolver } func New(unzipper common.Unzipper, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - unzipper: unzipper, - warner: warner, - presolver: parallelResolver, + unzipper: unzipper, + warner: warner, + parallelResolver: parallelResolver, } } diff --git a/internal/provider/ivpn/updater/servers.go b/internal/provider/ivpn/updater/servers.go index 9d5680f3..85f25b33 100644 --- a/internal/provider/ivpn/updater/servers.go +++ b/internal/provider/ivpn/updater/servers.go @@ -39,7 +39,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( } resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/ivpn/updater/servers_test.go b/internal/provider/ivpn/updater/servers_test.go index 446cf36d..d83d402b 100644 --- a/internal/provider/ivpn/updater/servers_test.go +++ b/internal/provider/ivpn/updater/servers_test.go @@ -150,18 +150,18 @@ func Test_Updater_GetServers(t *testing.T) { }), } - presolver := common.NewMockParallelResolver(ctrl) + parallelResolver := common.NewMockParallelResolver(ctrl) if testCase.expectResolve { - presolver.EXPECT().Resolve(ctx, testCase.resolveSettings). + parallelResolver.EXPECT().Resolve(ctx, testCase.resolveSettings). Return(testCase.hostToIPs, testCase.resolveWarnings, testCase.resolveErr) } warner := testCase.warnerBuilder(ctrl) updater := &Updater{ - client: client, - presolver: presolver, - warner: warner, + client: client, + parallelResolver: parallelResolver, + warner: warner, } servers, err := updater.FetchServers(ctx, testCase.minServers) diff --git a/internal/provider/ivpn/updater/updater.go b/internal/provider/ivpn/updater/updater.go index f75e7b12..f15a2f3a 100644 --- a/internal/provider/ivpn/updater/updater.go +++ b/internal/provider/ivpn/updater/updater.go @@ -7,16 +7,16 @@ import ( ) type Updater struct { - client *http.Client - presolver common.ParallelResolver - warner common.Warner + client *http.Client + parallelResolver common.ParallelResolver + warner common.Warner } func New(client *http.Client, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - client: client, - presolver: parallelResolver, - warner: warner, + client: client, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/privado/updater/servers.go b/internal/provider/privado/updater/servers.go index 689b5776..913f24f8 100644 --- a/internal/provider/privado/updater/servers.go +++ b/internal/provider/privado/updater/servers.go @@ -51,7 +51,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( hosts := hts.toHostsSlice() resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/privado/updater/updater.go b/internal/provider/privado/updater/updater.go index 971f0037..1d269789 100644 --- a/internal/provider/privado/updater/updater.go +++ b/internal/provider/privado/updater/updater.go @@ -7,18 +7,18 @@ import ( ) type Updater struct { - client *http.Client - unzipper common.Unzipper - presolver common.ParallelResolver - warner common.Warner + client *http.Client + unzipper common.Unzipper + parallelResolver common.ParallelResolver + warner common.Warner } func New(client *http.Client, unzipper common.Unzipper, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - client: client, - unzipper: unzipper, - presolver: parallelResolver, - warner: warner, + client: client, + unzipper: unzipper, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/privatevpn/updater/servers.go b/internal/provider/privatevpn/updater/servers.go index 6de29dde..582f7984 100644 --- a/internal/provider/privatevpn/updater/servers.go +++ b/internal/provider/privatevpn/updater/servers.go @@ -83,7 +83,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( hosts := hts.toHostsSlice() resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/privatevpn/updater/updater.go b/internal/provider/privatevpn/updater/updater.go index de83c263..3fbee059 100644 --- a/internal/provider/privatevpn/updater/updater.go +++ b/internal/provider/privatevpn/updater/updater.go @@ -5,16 +5,16 @@ import ( ) type Updater struct { - unzipper common.Unzipper - presolver common.ParallelResolver - warner common.Warner + unzipper common.Unzipper + parallelResolver common.ParallelResolver + warner common.Warner } func New(unzipper common.Unzipper, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - unzipper: unzipper, - presolver: parallelResolver, - warner: warner, + unzipper: unzipper, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/purevpn/updater/servers.go b/internal/provider/purevpn/updater/servers.go index 21098297..77cb67e0 100644 --- a/internal/provider/purevpn/updater/servers.go +++ b/internal/provider/purevpn/updater/servers.go @@ -61,7 +61,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( hosts := hts.toHostsSlice() resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/purevpn/updater/updater.go b/internal/provider/purevpn/updater/updater.go index 971f0037..1d269789 100644 --- a/internal/provider/purevpn/updater/updater.go +++ b/internal/provider/purevpn/updater/updater.go @@ -7,18 +7,18 @@ import ( ) type Updater struct { - client *http.Client - unzipper common.Unzipper - presolver common.ParallelResolver - warner common.Warner + client *http.Client + unzipper common.Unzipper + parallelResolver common.ParallelResolver + warner common.Warner } func New(client *http.Client, unzipper common.Unzipper, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - client: client, - unzipper: unzipper, - presolver: parallelResolver, - warner: warner, + client: client, + unzipper: unzipper, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/surfshark/updater/servers.go b/internal/provider/surfshark/updater/servers.go index c2032eaf..f4ea8062 100644 --- a/internal/provider/surfshark/updater/servers.go +++ b/internal/provider/surfshark/updater/servers.go @@ -32,7 +32,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( hosts := hts.toHostsSlice() resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/surfshark/updater/updater.go b/internal/provider/surfshark/updater/updater.go index 971f0037..1d269789 100644 --- a/internal/provider/surfshark/updater/updater.go +++ b/internal/provider/surfshark/updater/updater.go @@ -7,18 +7,18 @@ import ( ) type Updater struct { - client *http.Client - unzipper common.Unzipper - presolver common.ParallelResolver - warner common.Warner + client *http.Client + unzipper common.Unzipper + parallelResolver common.ParallelResolver + warner common.Warner } func New(client *http.Client, unzipper common.Unzipper, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - client: client, - unzipper: unzipper, - presolver: parallelResolver, - warner: warner, + client: client, + unzipper: unzipper, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/torguard/updater/servers.go b/internal/provider/torguard/updater/servers.go index 369d9396..4b8580c2 100644 --- a/internal/provider/torguard/updater/servers.go +++ b/internal/provider/torguard/updater/servers.go @@ -51,7 +51,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( hosts := hts.toHostsSlice() resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) u.warnWarnings(warnings) if err != nil { return nil, err diff --git a/internal/provider/torguard/updater/updater.go b/internal/provider/torguard/updater/updater.go index de83c263..3fbee059 100644 --- a/internal/provider/torguard/updater/updater.go +++ b/internal/provider/torguard/updater/updater.go @@ -5,16 +5,16 @@ import ( ) type Updater struct { - unzipper common.Unzipper - presolver common.ParallelResolver - warner common.Warner + unzipper common.Unzipper + parallelResolver common.ParallelResolver + warner common.Warner } func New(unzipper common.Unzipper, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - unzipper: unzipper, - presolver: parallelResolver, - warner: warner, + unzipper: unzipper, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/vpnunlimited/updater/servers.go b/internal/provider/vpnunlimited/updater/servers.go index dd58f7f5..34199cad 100644 --- a/internal/provider/vpnunlimited/updater/servers.go +++ b/internal/provider/vpnunlimited/updater/servers.go @@ -21,7 +21,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( hosts := hts.toHostsSlice() resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/vpnunlimited/updater/updater.go b/internal/provider/vpnunlimited/updater/updater.go index de83c263..3fbee059 100644 --- a/internal/provider/vpnunlimited/updater/updater.go +++ b/internal/provider/vpnunlimited/updater/updater.go @@ -5,16 +5,16 @@ import ( ) type Updater struct { - unzipper common.Unzipper - presolver common.ParallelResolver - warner common.Warner + unzipper common.Unzipper + parallelResolver common.ParallelResolver + warner common.Warner } func New(unzipper common.Unzipper, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - unzipper: unzipper, - presolver: parallelResolver, - warner: warner, + unzipper: unzipper, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/vyprvpn/updater/servers.go b/internal/provider/vyprvpn/updater/servers.go index c21f4c5f..dadf8679 100644 --- a/internal/provider/vyprvpn/updater/servers.go +++ b/internal/provider/vyprvpn/updater/servers.go @@ -65,7 +65,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( hosts := hts.toHostsSlice() resolveSettings := parallelResolverSettings(hosts) - hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) + hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/vyprvpn/updater/updater.go b/internal/provider/vyprvpn/updater/updater.go index de83c263..3fbee059 100644 --- a/internal/provider/vyprvpn/updater/updater.go +++ b/internal/provider/vyprvpn/updater/updater.go @@ -5,16 +5,16 @@ import ( ) type Updater struct { - unzipper common.Unzipper - presolver common.ParallelResolver - warner common.Warner + unzipper common.Unzipper + parallelResolver common.ParallelResolver + warner common.Warner } func New(unzipper common.Unzipper, warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - unzipper: unzipper, - presolver: parallelResolver, - warner: warner, + unzipper: unzipper, + parallelResolver: parallelResolver, + warner: warner, } } diff --git a/internal/provider/wevpn/updater/servers.go b/internal/provider/wevpn/updater/servers.go index b8d68fb2..526ef840 100644 --- a/internal/provider/wevpn/updater/servers.go +++ b/internal/provider/wevpn/updater/servers.go @@ -32,7 +32,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) ( } resolverSettings := parallelResolverSettings(hostnames) - hostnameToIPs, warnings, err := u.presolver.Resolve(ctx, resolverSettings) + hostnameToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolverSettings) for _, warning := range warnings { u.warner.Warn(warning) } diff --git a/internal/provider/wevpn/updater/updater.go b/internal/provider/wevpn/updater/updater.go index 3a3140b6..47f9b831 100644 --- a/internal/provider/wevpn/updater/updater.go +++ b/internal/provider/wevpn/updater/updater.go @@ -3,13 +3,13 @@ package updater import "github.com/qdm12/gluetun/internal/provider/common" type Updater struct { - presolver common.ParallelResolver - warner common.Warner + parallelResolver common.ParallelResolver + warner common.Warner } func New(warner common.Warner, parallelResolver common.ParallelResolver) *Updater { return &Updater{ - presolver: parallelResolver, - warner: warner, + parallelResolver: parallelResolver, + warner: warner, } }