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

chore(constants): internal/constants/providers

Browse Source 
- New package to avoid package import cycles
This commit is contained in:
Quentin McGaw
2022-04-16 19:30:26 +00:00
parent ad80e0c1ab
commit 54b7e23974
51 changed files with 335 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ import (
"testing"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/constants/providers"
"github.com/qdm12/gluetun/internal/models"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -22,7 +22,7 @@ func Test_Cyberghost_filterServers(t *testing.T) {
err error
}{
"no server": {
selection: settings.ServerSelection{}.WithDefaults(constants.Cyberghost),
selection: settings.ServerSelection{}.WithDefaults(providers.Cyberghost),
err: errors.New("no server found: for VPN openvpn; protocol udp"),
},
"servers without filter defaults to UDP": {
@@ -32,7 +32,7 @@ func Test_Cyberghost_filterServers(t *testing.T) {
{Country: "c", UDP: true},
{Country: "d", UDP: true},
},
selection: settings.ServerSelection{}.WithDefaults(constants.Cyberghost),
selection: settings.ServerSelection{}.WithDefaults(providers.Cyberghost),
filteredServers: []models.CyberghostServer{
{Country: "c", UDP: true},
{Country: "d", UDP: true},
@@ -49,7 +49,7 @@ func Test_Cyberghost_filterServers(t *testing.T) {
OpenVPN: settings.OpenVPNSelection{
TCP: boolPtr(true),
},
}.WithDefaults(constants.Cyberghost),
}.WithDefaults(providers.Cyberghost),
filteredServers: []models.CyberghostServer{
{Country: "a", TCP: true},
{Country: "b", TCP: true},
@@ -64,7 +64,7 @@ func Test_Cyberghost_filterServers(t *testing.T) {
},
selection: settings.ServerSelection{
Countries: []string{"a", "c"},
}.WithDefaults(constants.Cyberghost),
}.WithDefaults(providers.Cyberghost),
filteredServers: []models.CyberghostServer{
{Country: "a", UDP: true},
{Country: "c", UDP: true},
@@ -78,7 +78,7 @@ func Test_Cyberghost_filterServers(t *testing.T) {
},
selection: settings.ServerSelection{
Hostnames: []string{"a", "c"},
}.WithDefaults(constants.Cyberghost),
}.WithDefaults(providers.Cyberghost),
filteredServers: []models.CyberghostServer{
{Hostname: "a", UDP: true},
{Hostname: "c", UDP: true},

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

@@ -3,7 +3,7 @@ package cyberghost
import (
"math/rand"
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/constants/providers"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/provider/utils"
)
@@ -18,6 +18,6 @@ func New(servers []models.CyberghostServer, randSource rand.Source) *Cyberghost
return &Cyberghost{
servers: servers,
randSource: randSource,
NoPortForwarder: utils.NewNoPortForwarding(constants.Cyberghost),
NoPortForwarder: utils.NewNoPortForwarding(providers.Cyberghost),
}
}