Chore(deps): Bump the low-importance group with 5 updates

Bumps the low-importance group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [github.com/breml/rootcerts](https://github.com/breml/rootcerts) | `0.3.4` | `0.3.5` |
| [github.com/fatih/color](https://github.com/fatih/color) | `1.18.0` | `1.19.0` |
| [github.com/klauspost/compress](https://github.com/klauspost/compress) | `1.18.4` | `1.18.6` |
| [github.com/pelletier/go-toml/v2](https://github.com/pelletier/go-toml) | `2.2.4` | `2.3.1` |
| gopkg.in/ini.v1 | `1.67.1` | `1.67.2` |


Updates `github.com/breml/rootcerts` from 0.3.4 to 0.3.5
- [Release notes](https://github.com/breml/rootcerts/releases)
- [Commits](https://github.com/breml/rootcerts/compare/v0.3.4...v0.3.5)

Updates `github.com/fatih/color` from 1.18.0 to 1.19.0
- [Release notes](https://github.com/fatih/color/releases)
- [Commits](https://github.com/fatih/color/compare/v1.18.0...v1.19.0)

Updates `github.com/klauspost/compress` from 1.18.4 to 1.18.6
- [Release notes](https://github.com/klauspost/compress/releases)
- [Commits](https://github.com/klauspost/compress/compare/v1.18.4...v1.18.6)

Updates `github.com/pelletier/go-toml/v2` from 2.2.4 to 2.3.1
- [Release notes](https://github.com/pelletier/go-toml/releases)
- [Commits](https://github.com/pelletier/go-toml/compare/v2.2.4...v2.3.1)

Updates `gopkg.in/ini.v1` from 1.67.1 to 1.67.2

---
updated-dependencies:
- dependency-name: github.com/breml/rootcerts
  dependency-version: 0.3.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: low-importance
- dependency-name: github.com/fatih/color
  dependency-version: 1.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: low-importance
- dependency-name: github.com/klauspost/compress
  dependency-version: 1.18.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: low-importance
- dependency-name: github.com/pelletier/go-toml/v2
  dependency-version: 2.3.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: low-importance
- dependency-name: gopkg.in/ini.v1
  dependency-version: 1.67.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: low-importance
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/ci.yml

@@ -44,6 +44,7 @@ jobs:
           locale: "US"
           level: error
           exclude: |
+            ./internal/storage/servers.json
             ./.golangci.yml
             *.md
 
@@ -119,8 +120,7 @@ jobs:
 
       - name: Run Gluetun container with ProtonVPN Wireguard and port forwarding
           configuration
-        run:
+        run: echo -e "${{ secrets.PROTONVPN_WIREGUARD_PRIVATE_KEY }}" | ./ci/runner
-          echo -e "${{ secrets.PROTONVPN_WIREGUARD_PRIVATE_KEY }}" | ./ci/runner
           protonvpn-wireguard-port-forwarding
 
       - name: Run Gluetun container with ProtonVPN OpenVPN and port forwarding
@@ -129,8 +129,7 @@ jobs:
           secrets.PROTONVPN_OPENVPN_PASSWORD }}" | ./ci/runner
           protonvpn-openvpn-port-forwarding
 
-      - name:
+      - name: Run Gluetun container with Private Internet Access OpenVPN and port
-          Run Gluetun container with Private Internet Access OpenVPN and port
           forwarding configuration
         run: echo -e "${{ secrets.PRIVATEINTERNETACCESS_OPENVPN_USER }}\n${{
           secrets.PRIVATEINTERNETACCESS_OPENVPN_PASSWORD }}" | ./ci/runner
@@ -142,8 +141,7 @@ jobs:
           secrets.AIRVPN_WIREGUARD_ADDRESSES }}" | ./ci/runner airvpn-wireguard
 
       - name: Run Gluetun container with AirVPN OpenVPN configuration
-        run:
+        run: echo -e "${{ secrets.AIRVPN_OPENVPN_KEY }}\n${{ secrets.AIRVPN_OPENVPN_CERT
-          echo -e "${{ secrets.AIRVPN_OPENVPN_KEY }}\n${{ secrets.AIRVPN_OPENVPN_CERT
           }}" | ./ci/runner airvpn-openvpn
 
   codeql:

internal/cli/update.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"net"
 	"net/http"
 	"slices"
 	"strings"
@@ -105,10 +104,6 @@ func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) e
 	if err != nil {
 		return fmt.Errorf("creating DoH dialer: %w", err)
 	}
-	net.DefaultResolver = &net.Resolver{
-		PreferGo: true,
-		Dial:     dnsDialer.Dial,
-	}
 
 	const clientTimeout = 10 * time.Second
 	httpClient := &http.Client{Timeout: clientTimeout}

internal/provider/custom/openvpnconf.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/constants/openvpn"
 	"github.com/qdm12/gluetun/internal/models"
 	"github.com/qdm12/gluetun/internal/provider/utils"
@@ -66,11 +65,7 @@ func modifyConfig(lines []string, connection models.Connection,
 	}
 
 	// Add values
-	protocol := connection.Protocol
+	modified = append(modified, "proto "+connection.Protocol)
-	if protocol == constants.TCP {
-		protocol = "tcp-client"
-	}
-	modified = append(modified, "proto "+protocol)
 	modified = append(modified, fmt.Sprintf("remote %s %d", connection.IP, connection.Port))
 	modified = append(modified, "dev "+settings.Interface)
 	modified = append(modified, "mute-replay-warnings")

internal/storage/hardcoded.go

@@ -1,23 +1,32 @@
 package storage
 
 import (
+	"embed"
 	"encoding/json"
 	"fmt"
-	"path/filepath"
+	"path"
 
 	serversmodule "github.com/qdm12/gluetun-servers/pkg/servers"
-	"github.com/qdm12/gluetun/internal/constants/providers"
 	"github.com/qdm12/gluetun/internal/models"
 )
 
-func parseHardcodedServers() (allServers models.AllServers) {
+//go:embed servers.json
-	allProviders := providers.All()
+var allServersEmbedFS embed.FS
 
-	const version = 1
+func parseHardcodedServers() (allServers models.AllServers) {
-	allServers.ProviderToServers = make(map[string]models.Servers, len(allProviders))
+	f, err := allServersEmbedFS.Open("servers.json")
-	allServers.Version = version
+	if err != nil {
-	for _, provider := range allProviders {
+		panic(err)
-		filename := provider + ".json"
+	}
+	defer f.Close() // no-op
+	decoder := json.NewDecoder(f)
+	err = decoder.Decode(&allServers)
+	if err != nil {
+		panic("decoding servers.json: " + err.Error())
+	}
+
+	for provider, metadata := range allServers.ProviderToServers {
+		filename := path.Base(metadata.Filepath)
 		providerFile, err := serversmodule.Files.Open(filename)
 		if err != nil {
 			panic(fmt.Sprintf("reading embedded provider file %s for %s: %s", filename, provider, err))
@@ -35,8 +44,7 @@ func parseHardcodedServers() (allServers models.AllServers) {
 				filename, provider))
 		}
 
-		const serversPath = "/gluetun/servers/"
+		providerServers.Filepath = metadata.Filepath // inherit filepath from servers.json
-		providerServers.Filepath = filepath.Join(serversPath, filename)
 		allServers.ProviderToServers[provider] = providerServers
 	}
 

internal/storage/helpers.go

@@ -3,5 +3,6 @@ package storage
 import "fmt"
 
 func panicOnProviderMissingHardcoded(provider string) {
-	panic(fmt.Sprintf("provider %s not found in hardcoded servers map", provider))
+	panic(fmt.Sprintf("provider %s not found in hardcoded servers map; "+
+		"did you add the provider key in the embedded servers.json?", provider))
 }

internal/storage/read_test.go

@@ -152,7 +152,8 @@ func Test_extractServersFromBytes(t *testing.T) {
 			allProviders[0]: 1,
 			// Missing provider allProviders[1]
 		}
-		expectedPanicValue := fmt.Sprintf("provider %s not found in hardcoded servers map", allProviders[1])
+		expectedPanicValue := fmt.Sprintf("provider %s not found in hardcoded servers map; "+
+			"did you add the provider key in the embedded servers.json?", allProviders[1])
 		assert.PanicsWithValue(t, expectedPanicValue, func() {
 			_, _ = s.extractServersFromBytes(b, hardcodedVersions)
 		})

internal/storage/servers.json

@@ -0,0 +1,72 @@
+{
+  "version": 1,
+  "airvpn": {
+    "filepath": "/gluetun/servers/airvpn.json"
+  },
+  "cyberghost": {
+    "filepath": "/gluetun/servers/cyberghost.json"
+  },
+  "expressvpn": {
+    "filepath": "/gluetun/servers/expressvpn.json"
+  },
+  "fastestvpn": {
+    "filepath": "/gluetun/servers/fastestvpn.json"
+  },
+  "giganews": {
+    "filepath": "/gluetun/servers/giganews.json"
+  },
+  "hidemyass": {
+    "filepath": "/gluetun/servers/hidemyass.json"
+  },
+  "ipvanish": {
+    "filepath": "/gluetun/servers/ipvanish.json"
+  },
+  "ivpn": {
+    "filepath": "/gluetun/servers/ivpn.json"
+  },
+  "mullvad": {
+    "filepath": "/gluetun/servers/mullvad.json"
+  },
+  "nordvpn": {
+    "filepath": "/gluetun/servers/nordvpn.json"
+  },
+  "perfect privacy": {
+    "filepath": "/gluetun/servers/perfect privacy.json"
+  },
+  "privado": {
+    "filepath": "/gluetun/servers/privado.json"
+  },
+  "private internet access": {
+    "filepath": "/gluetun/servers/private internet access.json"
+  },
+  "privatevpn": {
+    "filepath": "/gluetun/servers/privatevpn.json"
+  },
+  "protonvpn": {
+    "filepath": "/gluetun/servers/protonvpn.json"
+  },
+  "purevpn": {
+    "filepath": "/gluetun/servers/purevpn.json"
+  },
+  "slickvpn": {
+    "filepath": "/gluetun/servers/slickvpn.json"
+  },
+  "surfshark": {
+    "filepath": "/gluetun/servers/surfshark.json"
+  },
+  "torguard": {
+    "filepath": "/gluetun/servers/torguard.json"
+  },
+  "vpn unlimited": {
+    "filepath": "/gluetun/servers/vpn unlimited.json"
+  },
+  "vpnsecure": {
+    "filepath": "/gluetun/servers/vpnsecure.json"
+  },
+  "vyprvpn": {
+    "filepath": "/gluetun/servers/vyprvpn.json"
+  },
+  "windscribe": {
+    "filepath": "/gluetun/servers/windscribe.json"
+  }
+}