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/cyberghost/filter.go
View File

@@ -11,7 +11,7 @@ import (
var ErrGroupMismatchesProtocol = errors.New("server group does not match protocol")
func (c *Cyberghost) filterServers(selection settings.ServerSelection) (
servers []models.CyberghostServer, err error) {
servers []models.Server, err error) {
for _, server := range c.servers {
switch {
case

20
internal/provider/cyberghost/filter_test.go
View File

@@ -16,9 +16,9 @@ func boolPtr(b bool) *bool { return &b }
func Test_Cyberghost_filterServers(t *testing.T) {
t.Parallel()
testCases := map[string]struct {
servers []models.CyberghostServer
servers []models.Server
selection settings.ServerSelection
filteredServers []models.CyberghostServer
filteredServers []models.Server
err error
}{
"no server": {
@@ -26,20 +26,20 @@ func Test_Cyberghost_filterServers(t *testing.T) {
err: errors.New("no server found: for VPN openvpn; protocol udp"),
},
"servers without filter defaults to UDP": {
servers: []models.CyberghostServer{
servers: []models.Server{
{Country: "a", TCP: true},
{Country: "b", TCP: true},
{Country: "c", UDP: true},
{Country: "d", UDP: true},
},
selection: settings.ServerSelection{}.WithDefaults(providers.Cyberghost),
filteredServers: []models.CyberghostServer{
filteredServers: []models.Server{
{Country: "c", UDP: true},
{Country: "d", UDP: true},
},
},
"servers with TCP selection": {
servers: []models.CyberghostServer{
servers: []models.Server{
{Country: "a", TCP: true},
{Country: "b", TCP: true},
{Country: "c", UDP: true},
@@ -50,13 +50,13 @@ func Test_Cyberghost_filterServers(t *testing.T) {
TCP: boolPtr(true),
},
}.WithDefaults(providers.Cyberghost),
filteredServers: []models.CyberghostServer{
filteredServers: []models.Server{
{Country: "a", TCP: true},
{Country: "b", TCP: true},
},
},
"servers with regions filter": {
servers: []models.CyberghostServer{
servers: []models.Server{
{Country: "a", UDP: true},
{Country: "b", UDP: true},
{Country: "c", UDP: true},
@@ -65,13 +65,13 @@ func Test_Cyberghost_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Countries: []string{"a", "c"},
}.WithDefaults(providers.Cyberghost),
filteredServers: []models.CyberghostServer{
filteredServers: []models.Server{
{Country: "a", UDP: true},
{Country: "c", UDP: true},
},
},
"servers with hostnames filter": {
servers: []models.CyberghostServer{
servers: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "b", UDP: true},
{Hostname: "c", UDP: true},
@@ -79,7 +79,7 @@ func Test_Cyberghost_filterServers(t *testing.T) {
selection: settings.ServerSelection{
Hostnames: []string{"a", "c"},
}.WithDefaults(providers.Cyberghost),
filteredServers: []models.CyberghostServer{
filteredServers: []models.Server{
{Hostname: "a", UDP: true},
{Hostname: "c", UDP: true},
},

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

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