diff --git a/internal/configuration/cyberghost.go b/internal/configuration/cyberghost.go index 38b8faf0..b66f77bc 100644 --- a/internal/configuration/cyberghost.go +++ b/internal/configuration/cyberghost.go @@ -6,22 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) cyberghostLines() (lines []string) { - lines = append(lines, lastIndent+"Server groups: "+commaJoin(settings.ServerSelection.Groups)) - - if len(settings.ServerSelection.Regions) > 0 { - lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readCyberghost(r reader) (err error) { settings.Name = constants.Cyberghost diff --git a/internal/configuration/fastestvpn.go b/internal/configuration/fastestvpn.go index a30515b4..7eebdf30 100644 --- a/internal/configuration/fastestvpn.go +++ b/internal/configuration/fastestvpn.go @@ -6,20 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) fastestvpnLines() (lines []string) { - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readFastestvpn(r reader) (err error) { settings.Name = constants.Fastestvpn diff --git a/internal/configuration/hidemyass.go b/internal/configuration/hidemyass.go index b3366e2a..9677ff2a 100644 --- a/internal/configuration/hidemyass.go +++ b/internal/configuration/hidemyass.go @@ -6,28 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) hideMyAssLines() (lines []string) { - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - if len(settings.ServerSelection.Regions) > 0 { - lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readHideMyAss(r reader) (err error) { settings.Name = constants.HideMyAss diff --git a/internal/configuration/ipvanish.go b/internal/configuration/ipvanish.go index 50396fb3..4b9be342 100644 --- a/internal/configuration/ipvanish.go +++ b/internal/configuration/ipvanish.go @@ -6,24 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) ipvanishLines() (lines []string) { - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readIpvanish(r reader) (err error) { settings.Name = constants.Ipvanish diff --git a/internal/configuration/ipvanish_test.go b/internal/configuration/ipvanish_test.go index 65a38c18..50c10a2f 100644 --- a/internal/configuration/ipvanish_test.go +++ b/internal/configuration/ipvanish_test.go @@ -12,48 +12,6 @@ import ( "github.com/stretchr/testify/require" ) -func Test_Provider_ipvanishLines(t *testing.T) { - t.Parallel() - - testCases := map[string]struct { - settings Provider - lines []string - }{ - "empty settings": { - lines: []string{ - "|--OpenVPN selection:", - " |--Protocol: udp", - }, - }, - "full settings": { - settings: Provider{ - ServerSelection: ServerSelection{ - Countries: []string{"A", "B"}, - Cities: []string{"C", "D"}, - Hostnames: []string{"E", "F"}, - }, - }, - lines: []string{ - "|--Countries: A, B", - "|--Cities: C, D", - "|--Hostnames: E, F", - "|--OpenVPN selection:", - " |--Protocol: udp", - }, - }, - } - for name, testCase := range testCases { - testCase := testCase - t.Run(name, func(t *testing.T) { - t.Parallel() - - lines := testCase.settings.ipvanishLines() - - assert.Equal(t, testCase.lines, lines) - }) - } -} - func Test_Provider_readIpvanish(t *testing.T) { t.Parallel() diff --git a/internal/configuration/ivpn.go b/internal/configuration/ivpn.go index abd75b24..992bc319 100644 --- a/internal/configuration/ivpn.go +++ b/internal/configuration/ivpn.go @@ -6,24 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) ivpnLines() (lines []string) { - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readIvpn(r reader) (err error) { settings.Name = constants.Ivpn diff --git a/internal/configuration/ivpn_test.go b/internal/configuration/ivpn_test.go index f790b67e..678612f5 100644 --- a/internal/configuration/ivpn_test.go +++ b/internal/configuration/ivpn_test.go @@ -12,48 +12,6 @@ import ( "github.com/stretchr/testify/require" ) -func Test_Provider_ivpnLines(t *testing.T) { - t.Parallel() - - testCases := map[string]struct { - settings Provider - lines []string - }{ - "empty settings": { - lines: []string{ - "|--OpenVPN selection:", - " |--Protocol: udp", - }, - }, - "full settings": { - settings: Provider{ - ServerSelection: ServerSelection{ - Countries: []string{"A", "B"}, - Cities: []string{"C", "D"}, - Hostnames: []string{"E", "F"}, - }, - }, - lines: []string{ - "|--Countries: A, B", - "|--Cities: C, D", - "|--Hostnames: E, F", - "|--OpenVPN selection:", - " |--Protocol: udp", - }, - }, - } - for name, testCase := range testCases { - testCase := testCase - t.Run(name, func(t *testing.T) { - t.Parallel() - - lines := testCase.settings.ivpnLines() - - assert.Equal(t, testCase.lines, lines) - }) - } -} - func Test_Provider_readIvpn(t *testing.T) { t.Parallel() diff --git a/internal/configuration/mullvad.go b/internal/configuration/mullvad.go index d0605978..5a350f88 100644 --- a/internal/configuration/mullvad.go +++ b/internal/configuration/mullvad.go @@ -7,28 +7,6 @@ import ( "github.com/qdm12/golibs/params" ) -func (settings *Provider) mullvadLines() (lines []string) { - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - if len(settings.ServerSelection.ISPs) > 0 { - lines = append(lines, lastIndent+"ISPs: "+commaJoin(settings.ServerSelection.ISPs)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readMullvad(r reader) (err error) { settings.Name = constants.Mullvad diff --git a/internal/configuration/nordvpn.go b/internal/configuration/nordvpn.go index a7952736..48f77de3 100644 --- a/internal/configuration/nordvpn.go +++ b/internal/configuration/nordvpn.go @@ -8,32 +8,6 @@ import ( "github.com/qdm12/golibs/params" ) -func (settings *Provider) nordvpnLines() (lines []string) { - if len(settings.ServerSelection.Regions) > 0 { - lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - if len(settings.ServerSelection.Names) > 0 { - lines = append(lines, lastIndent+"Names: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - if numbersUint16 := settings.ServerSelection.Numbers; len(numbersUint16) > 0 { - numbersString := make([]string, len(numbersUint16)) - for i, numberUint16 := range numbersUint16 { - numbersString[i] = strconv.Itoa(int(numberUint16)) - } - lines = append(lines, lastIndent+"Numbers: "+commaJoin(numbersString)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readNordvpn(r reader) (err error) { settings.Name = constants.Nordvpn diff --git a/internal/configuration/privado.go b/internal/configuration/privado.go index e8277a11..5979c1b1 100644 --- a/internal/configuration/privado.go +++ b/internal/configuration/privado.go @@ -6,28 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) privadoLines() (lines []string) { - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - if len(settings.ServerSelection.Regions) > 0 { - lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readPrivado(r reader) (err error) { settings.Name = constants.Privado diff --git a/internal/configuration/privateinternetaccess.go b/internal/configuration/privateinternetaccess.go index a1d6c838..7d58c968 100644 --- a/internal/configuration/privateinternetaccess.go +++ b/internal/configuration/privateinternetaccess.go @@ -7,31 +7,6 @@ import ( "github.com/qdm12/golibs/params" ) -func (settings *Provider) privateinternetaccessLines() (lines []string) { - if len(settings.ServerSelection.Regions) > 0 { - lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - if len(settings.ServerSelection.Names) > 0 { - lines = append(lines, lastIndent+"Names: "+commaJoin(settings.ServerSelection.Names)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - if settings.PortForwarding.Enabled { - lines = append(lines, lastIndent+"Port forwarding:") - for _, line := range settings.PortForwarding.lines() { - lines = append(lines, indent+line) - } - } - - return lines -} - func (settings *Provider) readPrivateInternetAccess(r reader) (err error) { settings.Name = constants.PrivateInternetAccess diff --git a/internal/configuration/privatevpn.go b/internal/configuration/privatevpn.go index 78b476cf..96b96416 100644 --- a/internal/configuration/privatevpn.go +++ b/internal/configuration/privatevpn.go @@ -6,24 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) privatevpnLines() (lines []string) { - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readPrivatevpn(r reader) (err error) { settings.Name = constants.Privatevpn diff --git a/internal/configuration/protonvpn.go b/internal/configuration/protonvpn.go index a5e6f248..98019b76 100644 --- a/internal/configuration/protonvpn.go +++ b/internal/configuration/protonvpn.go @@ -7,36 +7,6 @@ import ( "github.com/qdm12/golibs/params" ) -func (settings *Provider) protonvpnLines() (lines []string) { - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - if len(settings.ServerSelection.Regions) > 0 { - lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Names) > 0 { - lines = append(lines, lastIndent+"Names: "+commaJoin(settings.ServerSelection.Names)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - if settings.ServerSelection.FreeOnly { - lines = append(lines, lastIndent+"Free only: yes") - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readProtonvpn(r reader) (err error) { settings.Name = constants.Protonvpn diff --git a/internal/configuration/provider.go b/internal/configuration/provider.go index b5a41ab7..fcf24bbf 100644 --- a/internal/configuration/provider.go +++ b/internal/configuration/provider.go @@ -24,57 +24,17 @@ func (settings *Provider) lines() (lines []string) { lines = append(lines, lastIndent+strings.Title(settings.Name)+" settings:") - selection := settings.ServerSelection - - if selection.TargetIP != nil { - lines = append(lines, indent+lastIndent+"Target IP address: "+selection.TargetIP.String()) - } - - var providerLines []string - switch strings.ToLower(settings.Name) { - case "cyberghost": - providerLines = settings.cyberghostLines() - case "fastestvpn": - providerLines = settings.fastestvpnLines() - case "hidemyass": - providerLines = settings.hideMyAssLines() - case "ipvanish": - providerLines = settings.ipvanishLines() - case "ivpn": - providerLines = settings.ivpnLines() - case "mullvad": - providerLines = settings.mullvadLines() - case "nordvpn": - providerLines = settings.nordvpnLines() - case "privado": - providerLines = settings.privadoLines() - case "privatevpn": - providerLines = settings.privatevpnLines() - case "private internet access": - providerLines = settings.privateinternetaccessLines() - case "protonvpn": - providerLines = settings.protonvpnLines() - case "purevpn": - providerLines = settings.purevpnLines() - case "surfshark": - providerLines = settings.surfsharkLines() - case "torguard": - providerLines = settings.torguardLines() - case strings.ToLower(constants.VPNUnlimited): - providerLines = settings.vpnUnlimitedLines() - case "vyprvpn": - providerLines = settings.vyprvpnLines() - case "windscribe": - providerLines = settings.windscribeLines() - default: - panic(`Missing lines method for provider "` + - settings.Name + `"! Please create a Github issue.`) - } - - for _, line := range providerLines { + for _, line := range settings.ServerSelection.toLines() { lines = append(lines, indent+line) } + if settings.PortForwarding.Enabled { // PIA + lines = append(lines, indent+lastIndent+"Port forwarding:") + for _, line := range settings.PortForwarding.lines() { + lines = append(lines, indent+indent+line) + } + } + return lines } diff --git a/internal/configuration/provider_test.go b/internal/configuration/provider_test.go index 88c54de7..42c8da6d 100644 --- a/internal/configuration/provider_test.go +++ b/internal/configuration/provider_test.go @@ -46,8 +46,8 @@ func Test_Provider_lines(t *testing.T) { }, lines: []string{ "|--Fastestvpn settings:", - " |--Hostnames: a, b", " |--Countries: c, d", + " |--Hostnames: a, b", " |--OpenVPN selection:", " |--Protocol: udp", }, @@ -192,8 +192,8 @@ func Test_Provider_lines(t *testing.T) { " |--Countries: a, b", " |--Regions: c, d", " |--Cities: e, f", - " |--Names: g, h", " |--Hostnames: i, j", + " |--Names: g, h", " |--OpenVPN selection:", " |--Protocol: udp", }, @@ -233,8 +233,8 @@ func Test_Provider_lines(t *testing.T) { }, lines: []string{ "|--Purevpn settings:", - " |--Regions: a, b", " |--Countries: c, d", + " |--Regions: a, b", " |--Cities: e, f", " |--OpenVPN selection:", " |--Protocol: udp", @@ -287,9 +287,9 @@ func Test_Provider_lines(t *testing.T) { "|--Vpn Unlimited settings:", " |--Countries: a, b", " |--Cities: c, d", - " |--Hostnames: e, f", " |--Free servers only", " |--Stream servers only", + " |--Hostnames: e, f", " |--OpenVPN selection:", " |--Protocol: udp", }, diff --git a/internal/configuration/purevpn.go b/internal/configuration/purevpn.go index 84bfbf2f..c3ff9bb6 100644 --- a/internal/configuration/purevpn.go +++ b/internal/configuration/purevpn.go @@ -6,28 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) purevpnLines() (lines []string) { - if len(settings.ServerSelection.Regions) > 0 { - lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions)) - } - - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readPurevpn(r reader) (err error) { settings.Name = constants.Purevpn diff --git a/internal/configuration/selection.go b/internal/configuration/selection.go index 37cc34ce..006c6bd2 100644 --- a/internal/configuration/selection.go +++ b/internal/configuration/selection.go @@ -42,6 +42,60 @@ type ServerSelection struct { //nolint:maligned OpenVPN OpenVPNSelection `json:"openvpn"` } +func (selection ServerSelection) toLines() (lines []string) { + if selection.TargetIP != nil { + lines = append(lines, lastIndent+"Target IP address: "+selection.TargetIP.String()) + } + + if len(selection.Groups) > 0 { + lines = append(lines, lastIndent+"Server groups: "+commaJoin(selection.Groups)) + } + + if len(selection.Countries) > 0 { + lines = append(lines, lastIndent+"Countries: "+commaJoin(selection.Countries)) + } + + if len(selection.Regions) > 0 { + lines = append(lines, lastIndent+"Regions: "+commaJoin(selection.Regions)) + } + + if len(selection.Cities) > 0 { + lines = append(lines, lastIndent+"Cities: "+commaJoin(selection.Cities)) + } + + if len(selection.ISPs) > 0 { + lines = append(lines, lastIndent+"ISPs: "+commaJoin(selection.ISPs)) + } + + if selection.FreeOnly { + lines = append(lines, lastIndent+"Free servers only") + } + + if selection.StreamOnly { + lines = append(lines, lastIndent+"Stream servers only") + } + + if len(selection.Hostnames) > 0 { + lines = append(lines, lastIndent+"Hostnames: "+commaJoin(selection.Hostnames)) + } + + if len(selection.Names) > 0 { + lines = append(lines, lastIndent+"Names: "+commaJoin(selection.Names)) + } + + if len(selection.Numbers) > 0 { + numbersString := make([]string, len(selection.Numbers)) + for i, numberUint16 := range selection.Numbers { + numbersString[i] = fmt.Sprint(numberUint16) + } + lines = append(lines, lastIndent+"Numbers: "+commaJoin(numbersString)) + } + + lines = append(lines, selection.OpenVPN.lines()...) + + return lines +} + type OpenVPNSelection struct { TCP bool `json:"tcp"` // UDP if TCP is false CustomPort uint16 `json:"custom_port"` // HideMyAss, Mullvad, PIA, ProtonVPN, Windscribe diff --git a/internal/configuration/surfshark.go b/internal/configuration/surfshark.go index 700ce4fc..9d630503 100644 --- a/internal/configuration/surfshark.go +++ b/internal/configuration/surfshark.go @@ -6,20 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) surfsharkLines() (lines []string) { - if len(settings.ServerSelection.Regions) > 0 { - lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readSurfshark(r reader) (err error) { settings.Name = constants.Surfshark diff --git a/internal/configuration/torguard.go b/internal/configuration/torguard.go index 8824e5a2..05a9cb1d 100644 --- a/internal/configuration/torguard.go +++ b/internal/configuration/torguard.go @@ -6,24 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) torguardLines() (lines []string) { - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readTorguard(r reader) (err error) { settings.Name = constants.Torguard diff --git a/internal/configuration/vpnunlimited.go b/internal/configuration/vpnunlimited.go index ed293060..05c65249 100644 --- a/internal/configuration/vpnunlimited.go +++ b/internal/configuration/vpnunlimited.go @@ -7,32 +7,6 @@ import ( "github.com/qdm12/golibs/params" ) -func (settings *Provider) vpnUnlimitedLines() (lines []string) { - if len(settings.ServerSelection.Countries) > 0 { - lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - if settings.ServerSelection.FreeOnly { - lines = append(lines, lastIndent+"Free servers only") - } - - if settings.ServerSelection.StreamOnly { - lines = append(lines, lastIndent+"Stream servers only") - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readVPNUnlimited(r reader) (err error) { settings.Name = constants.VPNUnlimited diff --git a/internal/configuration/vpnunlimited_test.go b/internal/configuration/vpnunlimited_test.go deleted file mode 100644 index 9e08b4b4..00000000 --- a/internal/configuration/vpnunlimited_test.go +++ /dev/null @@ -1,49 +0,0 @@ -package configuration - -import ( - "testing" - - "github.com/stretchr/testify/assert" -) - -func Test_Provider_vpnUnlimitedLines(t *testing.T) { - t.Parallel() - - testCases := map[string]struct { - settings Provider - lines []string - }{ - "empty settings": { - lines: []string{ - "|--OpenVPN selection:", - " |--Protocol: udp", - }, - }, - "full settings": { - settings: Provider{ - ServerSelection: ServerSelection{ - Countries: []string{"A", "B"}, - Cities: []string{"C", "D"}, - Hostnames: []string{"E", "F"}, - }, - }, - lines: []string{ - "|--Countries: A, B", - "|--Cities: C, D", - "|--Hostnames: E, F", - "|--OpenVPN selection:", - " |--Protocol: udp", - }, - }, - } - for name, testCase := range testCases { - testCase := testCase - t.Run(name, func(t *testing.T) { - t.Parallel() - - lines := testCase.settings.vpnUnlimitedLines() - - assert.Equal(t, testCase.lines, lines) - }) - } -} diff --git a/internal/configuration/vyprvpn.go b/internal/configuration/vyprvpn.go index 88378bff..4a9cafb2 100644 --- a/internal/configuration/vyprvpn.go +++ b/internal/configuration/vyprvpn.go @@ -6,16 +6,6 @@ import ( "github.com/qdm12/gluetun/internal/constants" ) -func (settings *Provider) vyprvpnLines() (lines []string) { - if len(settings.ServerSelection.Regions) > 0 { - lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readVyprvpn(r reader) (err error) { settings.Name = constants.Vyprvpn diff --git a/internal/configuration/windscribe.go b/internal/configuration/windscribe.go index dd4f01e9..7e11901e 100644 --- a/internal/configuration/windscribe.go +++ b/internal/configuration/windscribe.go @@ -7,24 +7,6 @@ import ( "github.com/qdm12/golibs/params" ) -func (settings *Provider) windscribeLines() (lines []string) { - if len(settings.ServerSelection.Regions) > 0 { - lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions)) - } - - if len(settings.ServerSelection.Cities) > 0 { - lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities)) - } - - if len(settings.ServerSelection.Hostnames) > 0 { - lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames)) - } - - lines = append(lines, settings.ServerSelection.OpenVPN.lines()...) - - return lines -} - func (settings *Provider) readWindscribe(r reader) (err error) { settings.Name = constants.Windscribe