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

chore(models): common Server & Servers for all providers (#943)

Browse Source
This commit is contained in:
Quentin McGaw
2022-04-16 22:25:36 +02:00
parent aa729515b9
commit 5d66c193aa
148 changed files with 27081 additions and 27795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/provider/surfshark/filter.go
View File

@@ -7,7 +7,7 @@ import (
)
func (s *Surfshark) filterServers(selection settings.ServerSelection) (
servers []models.SurfsharkServer, err error) {
servers []models.Server, err error) {
for _, server := range s.servers {
switch {
case

32
internal/provider/surfshark/filter_test.go
View File

@@ -18,9 +18,9 @@ func Test_Surfshark_filterServers(t *testing.T) {
t.Parallel()
testCases := map[string]struct {
servers []models.SurfsharkServer
servers []models.Server
selection settings.ServerSelection
filtered []models.SurfsharkServer
filtered []models.Server
err error
}{
"no server available": {
@@ -28,13 +28,13 @@ func Test_Surfshark_filterServers(t *testing.T) {
err: errors.New("no server found: for VPN openvpn; protocol udp"),
},
"no filter": {
servers: []models.SurfsharkServer{
servers: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "b", UDP: true},
{Hostname: "c", UDP: true},
},
selection: settings.ServerSelection{}.WithDefaults(providers.Surfshark),
filtered: []models.SurfsharkServer{
filtered: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "b", UDP: true},
{Hostname: "c", UDP: true},
@@ -44,12 +44,12 @@ func Test_Surfshark_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Regions: []string{"b"},
}.WithDefaults(providers.Surfshark),
servers: []models.SurfsharkServer{
servers: []models.Server{
{Region: "a", UDP: true},
{Region: "b", UDP: true},
{Region: "c", UDP: true},
},
filtered: []models.SurfsharkServer{
filtered: []models.Server{
{Region: "b", UDP: true},
},
},
@@ -57,12 +57,12 @@ func Test_Surfshark_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Countries: []string{"b"},
}.WithDefaults(providers.Surfshark),
servers: []models.SurfsharkServer{
servers: []models.Server{
{Country: "a", UDP: true},
{Country: "b", UDP: true},
{Country: "c", UDP: true},
},
filtered: []models.SurfsharkServer{
filtered: []models.Server{
{Country: "b", UDP: true},
},
},
@@ -70,12 +70,12 @@ func Test_Surfshark_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Cities: []string{"b"},
}.WithDefaults(providers.Surfshark),
servers: []models.SurfsharkServer{
servers: []models.Server{
{City: "a", UDP: true},
{City: "b", UDP: true},
{City: "c", UDP: true},
},
filtered: []models.SurfsharkServer{
filtered: []models.Server{
{City: "b", UDP: true},
},
},
@@ -83,12 +83,12 @@ func Test_Surfshark_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Hostnames: []string{"b"},
}.WithDefaults(providers.Surfshark),
servers: []models.SurfsharkServer{
servers: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "b", UDP: true},
{Hostname: "c", UDP: true},
},
filtered: []models.SurfsharkServer{
filtered: []models.Server{
{Hostname: "b", UDP: true},
},
},
@@ -98,12 +98,12 @@ func Test_Surfshark_filterServers(t *testing.T) {
TCP: boolPtr(true),
},
}.WithDefaults(providers.Surfshark),
servers: []models.SurfsharkServer{
servers: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "b", UDP: true, TCP: true},
{Hostname: "c", UDP: true},
},
filtered: []models.SurfsharkServer{
filtered: []models.Server{
{Hostname: "b", UDP: true, TCP: true},
},
},
@@ -111,12 +111,12 @@ func Test_Surfshark_filterServers(t *testing.T) {
selection: settings.ServerSelection{
MultiHopOnly: boolPtr(true),
}.WithDefaults(providers.Surfshark),
servers: []models.SurfsharkServer{
servers: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "b", MultiHop: true, UDP: true},
{Hostname: "c", UDP: true},
},
filtered: []models.SurfsharkServer{
filtered: []models.Server{
{Hostname: "b", MultiHop: true, UDP: true},
},
},

4
internal/provider/surfshark/provider.go
View File

@@ -9,12 +9,12 @@ import (
)
type Surfshark struct {
servers []models.SurfsharkServer
servers []models.Server
randSource rand.Source
utils.NoPortForwarder
}
func New(servers []models.SurfsharkServer, randSource rand.Source) *Surfshark {
func New(servers []models.Server, randSource rand.Source) *Surfshark {
return &Surfshark{
servers: servers,
randSource: randSource,