From a00de75f615e10008e254fab008f16043b12369e Mon Sep 17 00:00:00 2001 From: "Quentin McGaw (desktop)" Date: Tue, 17 Aug 2021 14:08:53 +0000 Subject: [PATCH] Maint: rename utility names to be Openvpn specific - GetTargetIPConnection to GetTargetIPOpenVPNConnection - PickRandomConnection to PickRandomOpenVPNConnection --- internal/provider/cyberghost/connection.go | 4 ++-- internal/provider/fastestvpn/connection.go | 4 ++-- internal/provider/hidemyass/connection.go | 4 ++-- internal/provider/ipvanish/connection.go | 4 ++-- internal/provider/ivpn/connection.go | 4 ++-- internal/provider/mullvad/connection.go | 4 ++-- internal/provider/nordvpn/connection.go | 4 ++-- internal/provider/privado/connection.go | 4 ++-- internal/provider/privateinternetaccess/connection.go | 4 ++-- internal/provider/privatevpn/connection.go | 4 ++-- internal/provider/protonvpn/connection.go | 4 ++-- internal/provider/purevpn/connection.go | 4 ++-- internal/provider/surfshark/connection.go | 4 ++-- internal/provider/torguard/connection.go | 4 ++-- internal/provider/utils/pick.go | 2 +- internal/provider/utils/pick_test.go | 8 ++++---- internal/provider/utils/targetip.go | 2 +- internal/provider/vpnunlimited/connection.go | 4 ++-- internal/provider/vyprvpn/connection.go | 4 ++-- internal/provider/windscribe/connection.go | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/internal/provider/cyberghost/connection.go b/internal/provider/cyberghost/connection.go index 8b130a48..2bbd39d6 100644 --- a/internal/provider/cyberghost/connection.go +++ b/internal/provider/cyberghost/connection.go @@ -33,8 +33,8 @@ func (c *Cyberghost) GetOpenVPNConnection(selection configuration.ServerSelectio } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, c.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, c.randSource), nil } diff --git a/internal/provider/fastestvpn/connection.go b/internal/provider/fastestvpn/connection.go index 15d77c70..2158f608 100644 --- a/internal/provider/fastestvpn/connection.go +++ b/internal/provider/fastestvpn/connection.go @@ -33,8 +33,8 @@ func (f *Fastestvpn) GetOpenVPNConnection(selection configuration.ServerSelectio } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, f.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, f.randSource), nil } diff --git a/internal/provider/hidemyass/connection.go b/internal/provider/hidemyass/connection.go index 3582ba42..0bb7a790 100644 --- a/internal/provider/hidemyass/connection.go +++ b/internal/provider/hidemyass/connection.go @@ -38,8 +38,8 @@ func (h *HideMyAss) GetOpenVPNConnection(selection configuration.ServerSelection } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, h.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, h.randSource), nil } diff --git a/internal/provider/ipvanish/connection.go b/internal/provider/ipvanish/connection.go index 4ef80e28..f765530b 100644 --- a/internal/provider/ipvanish/connection.go +++ b/internal/provider/ipvanish/connection.go @@ -38,8 +38,8 @@ func (i *Ipvanish) GetOpenVPNConnection(selection configuration.ServerSelection) } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, i.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, i.randSource), nil } diff --git a/internal/provider/ivpn/connection.go b/internal/provider/ivpn/connection.go index 810ffae7..202862ff 100644 --- a/internal/provider/ivpn/connection.go +++ b/internal/provider/ivpn/connection.go @@ -38,8 +38,8 @@ func (i *Ivpn) GetOpenVPNConnection(selection configuration.ServerSelection) ( } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, i.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, i.randSource), nil } diff --git a/internal/provider/mullvad/connection.go b/internal/provider/mullvad/connection.go index 0eb7c8b1..9d8c5e35 100644 --- a/internal/provider/mullvad/connection.go +++ b/internal/provider/mullvad/connection.go @@ -38,8 +38,8 @@ func (m *Mullvad) GetOpenVPNConnection(selection configuration.ServerSelection) } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, m.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, m.randSource), nil } diff --git a/internal/provider/nordvpn/connection.go b/internal/provider/nordvpn/connection.go index 5f483db7..29b81c62 100644 --- a/internal/provider/nordvpn/connection.go +++ b/internal/provider/nordvpn/connection.go @@ -32,8 +32,8 @@ func (n *Nordvpn) GetOpenVPNConnection(selection configuration.ServerSelection) } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, n.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, n.randSource), nil } diff --git a/internal/provider/privado/connection.go b/internal/provider/privado/connection.go index a512c5f2..77f507e6 100644 --- a/internal/provider/privado/connection.go +++ b/internal/provider/privado/connection.go @@ -37,8 +37,8 @@ func (p *Privado) GetOpenVPNConnection(selection configuration.ServerSelection) } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, p.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, p.randSource), nil } diff --git a/internal/provider/privateinternetaccess/connection.go b/internal/provider/privateinternetaccess/connection.go index a0b2d722..d0725f0e 100644 --- a/internal/provider/privateinternetaccess/connection.go +++ b/internal/provider/privateinternetaccess/connection.go @@ -38,9 +38,9 @@ func (p *PIA) GetOpenVPNConnection(selection configuration.ServerSelection) ( } if selection.TargetIP != nil { - connection, err = utils.GetTargetIPConnection(connections, selection.TargetIP) + connection, err = utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } else { - connection, err = utils.PickRandomConnection(connections, p.randSource), nil + connection, err = utils.PickRandomOpenVPNConnection(connections, p.randSource), nil } if err != nil { diff --git a/internal/provider/privatevpn/connection.go b/internal/provider/privatevpn/connection.go index 97652359..36aac372 100644 --- a/internal/provider/privatevpn/connection.go +++ b/internal/provider/privatevpn/connection.go @@ -34,8 +34,8 @@ func (p *Privatevpn) GetOpenVPNConnection(selection configuration.ServerSelectio } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, p.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, p.randSource), nil } diff --git a/internal/provider/protonvpn/connection.go b/internal/provider/protonvpn/connection.go index 37f86dac..92bc6d59 100644 --- a/internal/provider/protonvpn/connection.go +++ b/internal/provider/protonvpn/connection.go @@ -34,8 +34,8 @@ func (p *Protonvpn) GetOpenVPNConnection(selection configuration.ServerSelection } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, p.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, p.randSource), nil } diff --git a/internal/provider/purevpn/connection.go b/internal/provider/purevpn/connection.go index e1ad5e43..32486239 100644 --- a/internal/provider/purevpn/connection.go +++ b/internal/provider/purevpn/connection.go @@ -34,8 +34,8 @@ func (p *Purevpn) GetOpenVPNConnection(selection configuration.ServerSelection) } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, p.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, p.randSource), nil } diff --git a/internal/provider/surfshark/connection.go b/internal/provider/surfshark/connection.go index 23bf6a7c..cd9a9e41 100644 --- a/internal/provider/surfshark/connection.go +++ b/internal/provider/surfshark/connection.go @@ -34,8 +34,8 @@ func (s *Surfshark) GetOpenVPNConnection(selection configuration.ServerSelection } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, s.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, s.randSource), nil } diff --git a/internal/provider/torguard/connection.go b/internal/provider/torguard/connection.go index cf153578..33984b17 100644 --- a/internal/provider/torguard/connection.go +++ b/internal/provider/torguard/connection.go @@ -37,8 +37,8 @@ func (t *Torguard) GetOpenVPNConnection(selection configuration.ServerSelection) } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, t.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, t.randSource), nil } diff --git a/internal/provider/utils/pick.go b/internal/provider/utils/pick.go index a5a61456..39edab97 100644 --- a/internal/provider/utils/pick.go +++ b/internal/provider/utils/pick.go @@ -6,7 +6,7 @@ import ( "github.com/qdm12/gluetun/internal/models" ) -func PickRandomConnection(connections []models.OpenVPNConnection, +func PickRandomOpenVPNConnection(connections []models.OpenVPNConnection, source rand.Source) models.OpenVPNConnection { return connections[rand.New(source).Intn(len(connections))] //nolint:gosec } diff --git a/internal/provider/utils/pick_test.go b/internal/provider/utils/pick_test.go index f5712379..a6ba6cb2 100644 --- a/internal/provider/utils/pick_test.go +++ b/internal/provider/utils/pick_test.go @@ -8,19 +8,19 @@ import ( "github.com/stretchr/testify/assert" ) -func Test_PickRandomConnection(t *testing.T) { +func Test_PickRandomOpenVPNConnection(t *testing.T) { t.Parallel() connections := []models.OpenVPNConnection{ {Port: 1}, {Port: 2}, {Port: 3}, {Port: 4}, } source := rand.NewSource(0) - connection := PickRandomConnection(connections, source) + connection := PickRandomOpenVPNConnection(connections, source) assert.Equal(t, models.OpenVPNConnection{Port: 3}, connection) - connection = PickRandomConnection(connections, source) + connection = PickRandomOpenVPNConnection(connections, source) assert.Equal(t, models.OpenVPNConnection{Port: 3}, connection) - connection = PickRandomConnection(connections, source) + connection = PickRandomOpenVPNConnection(connections, source) assert.Equal(t, models.OpenVPNConnection{Port: 2}, connection) } diff --git a/internal/provider/utils/targetip.go b/internal/provider/utils/targetip.go index 3e01aea8..fc002d93 100644 --- a/internal/provider/utils/targetip.go +++ b/internal/provider/utils/targetip.go @@ -10,7 +10,7 @@ import ( var ErrTargetIPNotFound = errors.New("target IP address not found") -func GetTargetIPConnection(connections []models.OpenVPNConnection, +func GetTargetIPOpenVPNConnection(connections []models.OpenVPNConnection, targetIP net.IP) (connection models.OpenVPNConnection, err error) { for _, connection := range connections { if targetIP.Equal(connection.IP) { diff --git a/internal/provider/vpnunlimited/connection.go b/internal/provider/vpnunlimited/connection.go index 567a4d85..dbfa79af 100644 --- a/internal/provider/vpnunlimited/connection.go +++ b/internal/provider/vpnunlimited/connection.go @@ -37,8 +37,8 @@ func (p *Provider) GetOpenVPNConnection(selection configuration.ServerSelection) } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, p.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, p.randSource), nil } diff --git a/internal/provider/vyprvpn/connection.go b/internal/provider/vyprvpn/connection.go index 655c09bd..8f9d86da 100644 --- a/internal/provider/vyprvpn/connection.go +++ b/internal/provider/vyprvpn/connection.go @@ -38,8 +38,8 @@ func (v *Vyprvpn) GetOpenVPNConnection(selection configuration.ServerSelection) } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, v.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, v.randSource), nil } diff --git a/internal/provider/windscribe/connection.go b/internal/provider/windscribe/connection.go index 6d7f256e..b619fa04 100644 --- a/internal/provider/windscribe/connection.go +++ b/internal/provider/windscribe/connection.go @@ -39,8 +39,8 @@ func (w *Windscribe) GetOpenVPNConnection(selection configuration.ServerSelectio } if selection.TargetIP != nil { - return utils.GetTargetIPConnection(connections, selection.TargetIP) + return utils.GetTargetIPOpenVPNConnection(connections, selection.TargetIP) } - return utils.PickRandomConnection(connections, w.randSource), nil + return utils.PickRandomOpenVPNConnection(connections, w.randSource), nil }