chore(config): upgrade to gosettings v0.4.0

- drop qdm12/govalid dependency
- upgrade qdm12/ss-server to v0.6.0
- do not unset sensitive config settings (makes no sense to me)

internal/configuration/sources/secrets/wireguard.go

@@ -1,52 +1,27 @@
 package secrets
 
 import (
-	"fmt"
+	"os"
+	"path/filepath"
 
-	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/configuration/sources/files"
 )
 
-func (s *Source) readWireguard() (settings settings.Wireguard, err error) {
-	wireguardConf, err := s.readSecretFileAsStringPtr(
-		"WIREGUARD_CONF_SECRETFILE",
-		"/run/secrets/wg0.conf",
-	)
-	if err != nil {
-		return settings, fmt.Errorf("reading Wireguard conf secret file: %w", err)
-	} else if wireguardConf != nil {
-		// Wireguard ini config file takes precedence over individual secrets
-		return files.ParseWireguardConf([]byte(*wireguardConf))
+func (s *Source) lazyLoadWireguardConf() files.WireguardConfig {
+	if s.cached.wireguardLoaded {
+		return s.cached.wireguardConf
 	}
 
-	settings.PrivateKey, err = s.readSecretFileAsStringPtr(
-		"WIREGUARD_PRIVATE_KEY_SECRETFILE",
-		"/run/secrets/wireguard_private_key",
-	)
-	if err != nil {
-		return settings, fmt.Errorf("reading private key file: %w", err)
+	path := os.Getenv("WIREGUARD_CONF_SECRETFILE")
+	if path == "" {
+		path = filepath.Join(s.rootDirectory, "wg0.conf")
 	}
 
-	settings.PreSharedKey, err = s.readSecretFileAsStringPtr(
-		"WIREGUARD_PRESHARED_KEY_SECRETFILE",
-		"/run/secrets/wireguard_preshared_key",
-	)
+	s.cached.wireguardLoaded = true
+	var err error
+	s.cached.wireguardConf, err = files.ParseWireguardConf(path)
 	if err != nil {
-		return settings, fmt.Errorf("reading preshared key file: %w", err)
+		s.warner.Warnf("skipping Wireguard config: %s", err)
 	}
-
-	wireguardAddressesCSV, err := s.readSecretFileAsStringPtr(
-		"WIREGUARD_ADDRESSES_SECRETFILE",
-		"/run/secrets/wireguard_addresses",
-	)
-	if err != nil {
-		return settings, fmt.Errorf("reading addresses file: %w", err)
-	} else if wireguardAddressesCSV != nil {
-		settings.Addresses, err = parseAddresses(*wireguardAddressesCSV)
-		if err != nil {
-			return settings, fmt.Errorf("parsing addresses: %w", err)
-		}
-	}
-
-	return settings, nil
+	return s.cached.wireguardConf
 }