chore(errors): review all errors in codebase

internal/storage/read.go

@@ -35,8 +35,6 @@ func (s *Storage) readFromFile(filepath string, hardcoded models.AllServers) (
 }
 
 var (
-	errDecodeVersions = errors.New("cannot decode versions")
-	errDecodeServers  = errors.New("cannot decode servers")
 	errDecodeProvider = errors.New("cannot decode servers for provider")
 )
 
@@ -44,12 +42,12 @@ func (s *Storage) extractServersFromBytes(b []byte, hardcoded models.AllServers)
 	servers models.AllServers, err error) {
 	var versions allVersions
 	if err := json.Unmarshal(b, &versions); err != nil {
-		return servers, fmt.Errorf("%w: %s", errDecodeVersions, err)
+		return servers, fmt.Errorf("cannot decode versions: %w", err)
 	}
 
 	var rawMessages allJSONRawMessages
 	if err := json.Unmarshal(b, &rawMessages); err != nil {
-		return servers, fmt.Errorf("%w: %s", errDecodeServers, err)
+		return servers, fmt.Errorf("cannot decode servers: %w", err)
 	}
 
 	// TODO simplify with generics in Go 1.18

internal/storage/sync.go

@@ -1,18 +1,12 @@
 package storage
 
 import (
-	"errors"
 	"fmt"
 	"reflect"
 
 	"github.com/qdm12/gluetun/internal/models"
 )
 
-var (
-	ErrCannotReadFile  = errors.New("cannot read servers from file")
-	ErrCannotWriteFile = errors.New("cannot write servers to file")
-)
-
 func countServers(allServers models.AllServers) int {
 	return len(allServers.Cyberghost.Servers) +
 		len(allServers.Expressvpn.Servers) +
@@ -39,7 +33,7 @@ func countServers(allServers models.AllServers) int {
 func (s *Storage) SyncServers() (err error) {
 	serversOnFile, err := s.readFromFile(s.filepath, s.hardcodedServers)
 	if err != nil {
-		return fmt.Errorf("%w: %s", ErrCannotReadFile, err)
+		return fmt.Errorf("cannot read servers from file: %w", err)
 	}
 
 	hardcodedCount := countServers(s.hardcodedServers)
@@ -64,7 +58,7 @@ func (s *Storage) SyncServers() (err error) {
 	}
 
 	if err := flushToFile(s.filepath, s.mergedServers); err != nil {
-		return fmt.Errorf("%w: %s", ErrCannotWriteFile, err)
+		return fmt.Errorf("cannot write servers to file: %w", err)
 	}
 	return nil
 }