admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(updater): rename presolver to parallelResolver

Browse Source
This commit is contained in:
Quentin McGaw
2022-06-11 20:12:35 +00:00
parent 33b8f5f596
commit 45c9e780c0
30 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/provider/cyberghost/updater/servers.go
View File

@@ -17,7 +17,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
possibleHosts := possibleServers.hostsSlice() possibleHosts := possibleServers.hostsSlice()
resolveSettings := parallelResolverSettings(possibleHosts) resolveSettings := parallelResolverSettings(possibleHosts)
hostToIPs, _, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, _, err := u.parallelResolver.Resolve(ctx, resolveSettings)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
internal/provider/cyberghost/updater/updater.go
View File

@@ -5,11 +5,11 @@ import (
) )
type Updater struct { type Updater struct {
presolver common.ParallelResolver parallelResolver common.ParallelResolver
} }
func New(parallelResolver common.ParallelResolver) *Updater { func New(parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
presolver: parallelResolver, parallelResolver: parallelResolver,
} }
} }

2
internal/provider/expressvpn/updater/servers.go
View File

@@ -22,7 +22,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
} }
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

12
internal/provider/expressvpn/updater/updater.go
View File

@@ -5,16 +5,16 @@ import (
) )
type Updater struct { type Updater struct {
unzipper common.Unzipper unzipper common.Unzipper
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(unzipper common.Unzipper, warner common.Warner, func New(unzipper common.Unzipper, warner common.Warner,
parallelResolver common.ParallelResolver) *Updater { parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
unzipper: unzipper, unzipper: unzipper,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/fastestvpn/updater/servers.go
View File

@@ -57,7 +57,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
hosts := hts.toHostsSlice() hosts := hts.toHostsSlice()
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

12
internal/provider/fastestvpn/updater/updater.go
View File

@@ -5,16 +5,16 @@ import (
) )
type Updater struct { type Updater struct {
unzipper common.Unzipper unzipper common.Unzipper
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(unzipper common.Unzipper, warner common.Warner, func New(unzipper common.Unzipper, warner common.Warner,
parallelResolver common.ParallelResolver) *Updater { parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
unzipper: unzipper, unzipper: unzipper,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/hidemyass/updater/servers.go
View File

@@ -27,7 +27,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
} }
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

12
internal/provider/hidemyass/updater/updater.go
View File

@@ -7,16 +7,16 @@ import (
) )
type Updater struct { type Updater struct {
client *http.Client client *http.Client
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(client *http.Client, warner common.Warner, func New(client *http.Client, warner common.Warner,
parallelResolver common.ParallelResolver) *Updater { parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
client: client, client: client,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/ipvanish/updater/servers.go
View File

@@ -68,7 +68,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
hosts := hts.toHostsSlice() hosts := hts.toHostsSlice()
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

10
internal/provider/ipvanish/updater/servers_test.go
View File

@@ -199,16 +199,16 @@ func Test_Updater_GetServers(t *testing.T) {
unzipper.EXPECT().FetchAndExtract(ctx, zipURL). unzipper.EXPECT().FetchAndExtract(ctx, zipURL).
Return(testCase.unzipContents, testCase.unzipErr) Return(testCase.unzipContents, testCase.unzipErr)
presolver := common.NewMockParallelResolver(ctrl) parallelResolver := common.NewMockParallelResolver(ctrl)
if testCase.expectResolve { if testCase.expectResolve {
presolver.EXPECT().Resolve(ctx, testCase.resolverSettings). parallelResolver.EXPECT().Resolve(ctx, testCase.resolverSettings).
Return(testCase.hostToIPs, testCase.resolveWarnings, testCase.resolveErr) Return(testCase.hostToIPs, testCase.resolveWarnings, testCase.resolveErr)
} }
updater := &Updater{ updater := &Updater{
unzipper: unzipper, unzipper: unzipper,
warner: testCase.warnerBuilder(ctrl), warner: testCase.warnerBuilder(ctrl),
presolver: presolver, parallelResolver: parallelResolver,
} }
servers, err := updater.FetchServers(ctx, testCase.minServers) servers, err := updater.FetchServers(ctx, testCase.minServers)

12
internal/provider/ipvanish/updater/updater.go
View File

@@ -5,16 +5,16 @@ import (
) )
type Updater struct { type Updater struct {
unzipper common.Unzipper unzipper common.Unzipper
warner common.Warner warner common.Warner
presolver common.ParallelResolver parallelResolver common.ParallelResolver
} }
func New(unzipper common.Unzipper, warner common.Warner, func New(unzipper common.Unzipper, warner common.Warner,
parallelResolver common.ParallelResolver) *Updater { parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
unzipper: unzipper, unzipper: unzipper,
warner: warner, warner: warner,
presolver: parallelResolver, parallelResolver: parallelResolver,
} }
} }

2
internal/provider/ivpn/updater/servers.go
View File

@@ -39,7 +39,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
} }
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

10
internal/provider/ivpn/updater/servers_test.go
View File

@@ -150,18 +150,18 @@ func Test_Updater_GetServers(t *testing.T) {
}), }),
} }
presolver := common.NewMockParallelResolver(ctrl) parallelResolver := common.NewMockParallelResolver(ctrl)
if testCase.expectResolve { if testCase.expectResolve {
presolver.EXPECT().Resolve(ctx, testCase.resolveSettings). parallelResolver.EXPECT().Resolve(ctx, testCase.resolveSettings).
Return(testCase.hostToIPs, testCase.resolveWarnings, testCase.resolveErr) Return(testCase.hostToIPs, testCase.resolveWarnings, testCase.resolveErr)
} }
warner := testCase.warnerBuilder(ctrl) warner := testCase.warnerBuilder(ctrl)
updater := &Updater{ updater := &Updater{
client: client, client: client,
presolver: presolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
servers, err := updater.FetchServers(ctx, testCase.minServers) servers, err := updater.FetchServers(ctx, testCase.minServers)

12
internal/provider/ivpn/updater/updater.go
View File

@@ -7,16 +7,16 @@ import (
) )
type Updater struct { type Updater struct {
client *http.Client client *http.Client
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(client *http.Client, warner common.Warner, func New(client *http.Client, warner common.Warner,
parallelResolver common.ParallelResolver) *Updater { parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
client: client, client: client,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/privado/updater/servers.go
View File

@@ -51,7 +51,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
hosts := hts.toHostsSlice() hosts := hts.toHostsSlice()
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

16
internal/provider/privado/updater/updater.go
View File

@@ -7,18 +7,18 @@ import (
) )
type Updater struct { type Updater struct {
client *http.Client client *http.Client
unzipper common.Unzipper unzipper common.Unzipper
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(client *http.Client, unzipper common.Unzipper, func New(client *http.Client, unzipper common.Unzipper,
warner common.Warner, parallelResolver common.ParallelResolver) *Updater { warner common.Warner, parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
client: client, client: client,
unzipper: unzipper, unzipper: unzipper,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/privatevpn/updater/servers.go
View File

@@ -83,7 +83,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
hosts := hts.toHostsSlice() hosts := hts.toHostsSlice()
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

12
internal/provider/privatevpn/updater/updater.go
View File

@@ -5,16 +5,16 @@ import (
) )
type Updater struct { type Updater struct {
unzipper common.Unzipper unzipper common.Unzipper
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(unzipper common.Unzipper, warner common.Warner, func New(unzipper common.Unzipper, warner common.Warner,
parallelResolver common.ParallelResolver) *Updater { parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
unzipper: unzipper, unzipper: unzipper,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/purevpn/updater/servers.go
View File

@@ -61,7 +61,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
hosts := hts.toHostsSlice() hosts := hts.toHostsSlice()
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

16
internal/provider/purevpn/updater/updater.go
View File

@@ -7,18 +7,18 @@ import (
) )
type Updater struct { type Updater struct {
client *http.Client client *http.Client
unzipper common.Unzipper unzipper common.Unzipper
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(client *http.Client, unzipper common.Unzipper, func New(client *http.Client, unzipper common.Unzipper,
warner common.Warner, parallelResolver common.ParallelResolver) *Updater { warner common.Warner, parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
client: client, client: client,
unzipper: unzipper, unzipper: unzipper,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/surfshark/updater/servers.go
View File

@@ -32,7 +32,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
hosts := hts.toHostsSlice() hosts := hts.toHostsSlice()
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

16
internal/provider/surfshark/updater/updater.go
View File

@@ -7,18 +7,18 @@ import (
) )
type Updater struct { type Updater struct {
client *http.Client client *http.Client
unzipper common.Unzipper unzipper common.Unzipper
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(client *http.Client, unzipper common.Unzipper, func New(client *http.Client, unzipper common.Unzipper,
warner common.Warner, parallelResolver common.ParallelResolver) *Updater { warner common.Warner, parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
client: client, client: client,
unzipper: unzipper, unzipper: unzipper,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/torguard/updater/servers.go
View File

@@ -51,7 +51,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
hosts := hts.toHostsSlice() hosts := hts.toHostsSlice()
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
u.warnWarnings(warnings) u.warnWarnings(warnings)
if err != nil { if err != nil {
return nil, err return nil, err

12
internal/provider/torguard/updater/updater.go
View File

@@ -5,16 +5,16 @@ import (
) )
type Updater struct { type Updater struct {
unzipper common.Unzipper unzipper common.Unzipper
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(unzipper common.Unzipper, warner common.Warner, func New(unzipper common.Unzipper, warner common.Warner,
parallelResolver common.ParallelResolver) *Updater { parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
unzipper: unzipper, unzipper: unzipper,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/vpnunlimited/updater/servers.go
View File

@@ -21,7 +21,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
hosts := hts.toHostsSlice() hosts := hts.toHostsSlice()
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

12
internal/provider/vpnunlimited/updater/updater.go
View File

@@ -5,16 +5,16 @@ import (
) )
type Updater struct { type Updater struct {
unzipper common.Unzipper unzipper common.Unzipper
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(unzipper common.Unzipper, warner common.Warner, func New(unzipper common.Unzipper, warner common.Warner,
parallelResolver common.ParallelResolver) *Updater { parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
unzipper: unzipper, unzipper: unzipper,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/vyprvpn/updater/servers.go
View File

@@ -65,7 +65,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
hosts := hts.toHostsSlice() hosts := hts.toHostsSlice()
resolveSettings := parallelResolverSettings(hosts) resolveSettings := parallelResolverSettings(hosts)
hostToIPs, warnings, err := u.presolver.Resolve(ctx, resolveSettings) hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

12
internal/provider/vyprvpn/updater/updater.go
View File

@@ -5,16 +5,16 @@ import (
) )
type Updater struct { type Updater struct {
unzipper common.Unzipper unzipper common.Unzipper
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(unzipper common.Unzipper, warner common.Warner, func New(unzipper common.Unzipper, warner common.Warner,
parallelResolver common.ParallelResolver) *Updater { parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
unzipper: unzipper, unzipper: unzipper,
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }

2
internal/provider/wevpn/updater/servers.go
View File

@@ -32,7 +32,7 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
} }
resolverSettings := parallelResolverSettings(hostnames) resolverSettings := parallelResolverSettings(hostnames)
hostnameToIPs, warnings, err := u.presolver.Resolve(ctx, resolverSettings) hostnameToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolverSettings)
for _, warning := range warnings { for _, warning := range warnings {
u.warner.Warn(warning) u.warner.Warn(warning)
} }

8
internal/provider/wevpn/updater/updater.go
View File

@@ -3,13 +3,13 @@ package updater
import "github.com/qdm12/gluetun/internal/provider/common" import "github.com/qdm12/gluetun/internal/provider/common"
type Updater struct { type Updater struct {
presolver common.ParallelResolver parallelResolver common.ParallelResolver
warner common.Warner warner common.Warner
} }
func New(warner common.Warner, parallelResolver common.ParallelResolver) *Updater { func New(warner common.Warner, parallelResolver common.ParallelResolver) *Updater {
return &Updater{ return &Updater{
presolver: parallelResolver, parallelResolver: parallelResolver,
warner: warner, warner: warner,
} }
} }