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

internal/updater/providers/wevpn/servers.go

@@ -18,9 +18,9 @@ var (
 )
 
 func GetServers(ctx context.Context, presolver resolver.Parallel, minServers int) (
-	servers []models.WevpnServer, warnings []string, err error) {
+	servers []models.Server, warnings []string, err error) {
 	cities := getAvailableCities()
-	servers = make([]models.WevpnServer, 0, len(cities))
+	servers = make([]models.Server, 0, len(cities))
 	hostnames := make([]string, len(cities))
 	hostnameToCity := make(map[string]string, len(cities))
 
@@ -43,7 +43,7 @@ func GetServers(ctx context.Context, presolver resolver.Parallel, minServers int
 
 	for hostname, ips := range hostnameToIPs {
 		city := hostnameToCity[hostname]
-		server := models.WevpnServer{
+		server := models.Server{
 			City:     city,
 			Hostname: hostname,
 			UDP:      true,

internal/updater/providers/wevpn/sort.go

@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/models"
 )
 
-func sortServers(servers []models.WevpnServer) {
+func sortServers(servers []models.Server) {
 	sort.Slice(servers, func(i, j int) bool {
 		if servers[i].City == servers[j].City {
 			return servers[i].Hostname < servers[j].Hostname

internal/updater/providers/wevpn/sort_test.go

@@ -10,18 +10,18 @@ import (
 func Test_sortServers(t *testing.T) {
 	t.Parallel()
 	testCases := map[string]struct {
-		initialServers []models.WevpnServer
-		sortedServers  []models.WevpnServer
+		initialServers []models.Server
+		sortedServers  []models.Server
 	}{
 		"no server": {},
 		"sorted servers": {
-			initialServers: []models.WevpnServer{
+			initialServers: []models.Server{
 				{City: "A", Hostname: "A"},
 				{City: "A", Hostname: "B"},
 				{City: "A", Hostname: "A"},
 				{City: "B", Hostname: "A"},
 			},
-			sortedServers: []models.WevpnServer{
+			sortedServers: []models.Server{
 				{City: "A", Hostname: "A"},
 				{City: "A", Hostname: "A"},
 				{City: "A", Hostname: "B"},