chore(errors): review all errors in codebase

internal/vpn/openvpn.go

@@ -2,7 +2,6 @@ package vpn
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
@@ -12,14 +11,6 @@ import (
 	"github.com/qdm12/golibs/command"
 )
 
-var (
-	errServerConn  = errors.New("failed finding a valid server connection")
-	errBuildConfig = errors.New("failed building configuration")
-	errWriteConfig = errors.New("failed writing configuration to file")
-	errWriteAuth   = errors.New("failed writing auth to file")
-	errFirewall    = errors.New("failed allowing VPN connection through firewall")
-)
-
 // setupOpenVPN sets OpenVPN up using the configurators and settings given.
 // It returns a serverName for port forwarding (PIA) and an error if it fails.
 func setupOpenVPN(ctx context.Context, fw firewall.VPNConnectionSetter,
@@ -28,27 +19,27 @@ func setupOpenVPN(ctx context.Context, fw firewall.VPNConnectionSetter,
 	runner vpnRunner, serverName string, err error) {
 	connection, err := providerConf.GetConnection(settings.Provider.ServerSelection)
 	if err != nil {
-		return nil, "", fmt.Errorf("%w: %s", errServerConn, err)
+		return nil, "", fmt.Errorf("failed finding a valid server connection: %w", err)
 	}
 
 	lines, err := providerConf.BuildConf(connection, settings.OpenVPN)
 	if err != nil {
-		return nil, "", fmt.Errorf("%w: %s", errBuildConfig, err)
+		return nil, "", fmt.Errorf("failed building configuration: %w", err)
 	}
 
 	if err := openvpnConf.WriteConfig(lines); err != nil {
-		return nil, "", fmt.Errorf("%w: %s", errWriteConfig, err)
+		return nil, "", fmt.Errorf("failed writing configuration to file: %w", err)
 	}
 
 	if settings.OpenVPN.User != "" {
 		err := openvpnConf.WriteAuthFile(settings.OpenVPN.User, settings.OpenVPN.Password)
 		if err != nil {
-			return nil, "", fmt.Errorf("%w: %s", errWriteAuth, err)
+			return nil, "", fmt.Errorf("failed writing auth to file: %w", err)
 		}
 	}
 
 	if err := fw.SetVPNConnection(ctx, connection, settings.OpenVPN.Interface); err != nil {
-		return nil, "", fmt.Errorf("%w: %s", errFirewall, err)
+		return nil, "", fmt.Errorf("failed allowing VPN connection through firewall: %w", err)
 	}
 
 	runner = openvpn.NewRunner(settings.OpenVPN, starter, logger)

internal/vpn/portforward.go

@@ -2,18 +2,12 @@ package vpn
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
 	"github.com/qdm12/gluetun/internal/portforward"
 )
 
-var (
-	errObtainVPNLocalGateway = errors.New("cannot obtain VPN local gateway IP")
-	errStartPortForwarding   = errors.New("cannot start port forwarding")
-)
-
 func (l *Loop) startPortForwarding(ctx context.Context, data tunnelUpData) (err error) {
 	if !data.portForwarding {
 		return nil
@@ -22,7 +16,7 @@ func (l *Loop) startPortForwarding(ctx context.Context, data tunnelUpData) (err
 	// only used for PIA for now
 	gateway, err := l.routing.VPNLocalGatewayIP(data.vpnIntf)
 	if err != nil {
-		return fmt.Errorf("%w: for interface %s: %s", errObtainVPNLocalGateway, data.vpnIntf, err)
+		return fmt.Errorf("cannot obtain VPN local gateway IP for interface %s: %w", data.vpnIntf, err)
 	}
 	l.logger.Info("VPN gateway IP address: " + gateway.String())
 
@@ -34,7 +28,7 @@ func (l *Loop) startPortForwarding(ctx context.Context, data tunnelUpData) (err
 	}
 	_, err = l.portForward.Start(ctx, pfData)
 	if err != nil {
-		return fmt.Errorf("%w: %s", errStartPortForwarding, err)
+		return fmt.Errorf("cannot start port forwarding: %w", err)
 	}
 
 	return nil

internal/vpn/wireguard.go

@@ -2,7 +2,6 @@ package vpn
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
@@ -13,11 +12,6 @@ import (
 	"github.com/qdm12/gluetun/internal/wireguard"
 )
 
-var (
-	errGetServer       = errors.New("failed finding a VPN server")
-	errCreateWireguard = errors.New("failed creating Wireguard")
-)
-
 // setupWireguard sets Wireguard up using the configurators and settings given.
 // It returns a serverName for port forwarding (PIA) and an error if it fails.
 func setupWireguard(ctx context.Context, netlinker netlink.NetLinker,
@@ -26,7 +20,7 @@ func setupWireguard(ctx context.Context, netlinker netlink.NetLinker,
 	wireguarder wireguard.Wireguarder, serverName string, err error) {
 	connection, err := providerConf.GetConnection(settings.Provider.ServerSelection)
 	if err != nil {
-		return nil, "", fmt.Errorf("%w: %s", errGetServer, err)
+		return nil, "", fmt.Errorf("failed finding a VPN server: %w", err)
 	}
 
 	wireguardSettings := utils.BuildWireguardSettings(connection, settings.Wireguard)
@@ -37,12 +31,12 @@ func setupWireguard(ctx context.Context, netlinker netlink.NetLinker,
 
 	wireguarder, err = wireguard.New(wireguardSettings, netlinker, logger)
 	if err != nil {
-		return nil, "", fmt.Errorf("%w: %s", errCreateWireguard, err)
+		return nil, "", fmt.Errorf("failed creating Wireguard: %w", err)
 	}
 
 	err = fw.SetVPNConnection(ctx, connection, settings.Wireguard.Interface)
 	if err != nil {
-		return nil, "", fmt.Errorf("%w: %s", errFirewall, err)
+		return nil, "", fmt.Errorf("failed setting firewall: %w", err)
 	}
 
 	return wireguarder, connection.Hostname, nil