Refactor error handling to use fmt.Errorf instead of catcher for improved clarity

osmontero · osmontero · commit f7281c2ad871 · 2025-11-25T12:56:20.000Z
diff --git a/utils/casts.go b/utils/casts.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"fmt"
-	"github.com/threatwinds/go-sdk/catcher"
 	"reflect"
 	"strconv"
 )
@@ -32,7 +31,6 @@ func CastInt64(value interface{}) int64 {
 	case string:
 		val, err := strconv.ParseInt(v, 10, 64)
 		if err != nil {
-			_ = catcher.Error("failed to cast string to int64", err, map[string]any{"value": v})
 			return 0
 		}
 		return val
@@ -66,7 +64,6 @@ func CastFloat64(value interface{}) float64 {
 	case string:
 		val, err := strconv.ParseFloat(v, 64)
 		if err != nil {
-			_ = catcher.Error("failed to cast string to float64", err, map[string]any{"value": v})
 			return 0
 		}
 		return val
@@ -103,7 +100,6 @@ func CastBool(value interface{}) bool {
 	case string:
 		val, err := strconv.ParseBool(v)
 		if err != nil {
-			_ = catcher.Error("failed to cast string to bool", err, map[string]any{"value": v})
 			return false
 		}
 		return val
diff --git a/utils/csv.go b/utils/csv.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"encoding/csv"
-	"github.com/threatwinds/go-sdk/catcher"
+	"fmt"
 	"os"
 )
 
@@ -18,14 +18,14 @@ import (
 func ReadCSV(url string) ([][]string, error) {
 	file, err := os.Open(url)
 	if err != nil {
-		return nil, catcher.Error("error opening CSV file", err, map[string]any{"file": url})
+		return nil, fmt.Errorf("error opening CSV file %s: %w", url, err)
 	}
 	defer func() { _ = file.Close() }()
 
 	reader := csv.NewReader(file)
 	result, err := reader.ReadAll()
 	if err != nil {
-		return nil, catcher.Error("error reading CSV file", err, map[string]any{"file": url})
+		return nil, fmt.Errorf("error reading CSV file %s: %w", url, err)
 	}
 
 	return result, nil
diff --git a/utils/fields.go b/utils/fields.go
@@ -1,8 +1,7 @@
 package utils
 
 import (
-	"errors"
-	"github.com/threatwinds/go-sdk/catcher"
+	"fmt"
 	"regexp"
 	"strings"
 )
@@ -15,13 +14,12 @@ func ValidateReservedField(f string, allowEmpty bool) error {
 	}
 
 	if f == "" && !allowEmpty {
-		return catcher.Error("error validating field", errors.New("field name cannot be empty"), nil)
+		return fmt.Errorf("error validating field: field name cannot be empty")
 	}
 
 	for _, rf := range reservedFields {
 		if f == rf {
-			return catcher.Error("error validating field", errors.New("field cannot be a reserved field"),
-				map[string]any{"reservedFields": reservedFields, "usedField": f})
+			return fmt.Errorf("error validating field: field cannot be a reserved field (reserved: %v, used: %s)", reservedFields, f)
 		}
 	}
 
@@ -37,7 +35,6 @@ func SanitizeField(s *string) {
 	// compile the pattern
 	compiledPattern, err := regexp.Compile(exp)
 	if err != nil {
-		_ = catcher.Error("error compiling regexp", err, nil)
 		return
 	}
 
diff --git a/utils/files.go b/utils/files.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/threatwinds/go-sdk/catcher"
+	"fmt"
 	"strings"
 )
 
@@ -18,19 +18,13 @@ func ValidateFilePath(path string) error {
 
 	for _, c := range contains {
 		if strings.Contains(path, c) {
-			return catcher.Error("path contains an invalid character", nil, map[string]any{
-				"path":    path,
-				"invalid": c,
-			})
+			return fmt.Errorf("path contains an invalid character: path=%s, invalid=%s", path, c)
 		}
 	}
 
 	for _, p := range prefixes {
 		if strings.HasPrefix(path, p) {
-			return catcher.Error("path starts with an invalid character", nil, map[string]any{
-				"path":    path,
-				"invalid": p,
-			})
+			return fmt.Errorf("path starts with an invalid character: path=%s, invalid=%s", path, p)
 		}
 	}
 
diff --git a/utils/json.go b/utils/json.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"encoding/json"
-	"github.com/threatwinds/go-sdk/catcher"
+	"fmt"
 	"os"
 )
 
@@ -25,14 +25,14 @@ import (
 func ReadJSON[t any](f string) (*t, error) {
 	content, err := os.ReadFile(f)
 	if err != nil {
-		return nil, catcher.Error("error reading JSON file", err, map[string]any{"file": f})
+		return nil, fmt.Errorf("error reading JSON file %s: %w", f, err)
 	}
 
 	var value = new(t)
 
 	err = json.Unmarshal(content, value)
 	if err != nil {
-		return nil, catcher.Error("error parsing JSON file", err, map[string]any{"file": f})
+		return nil, fmt.Errorf("error parsing JSON file %s: %w", f, err)
 	}
 
 	return value, nil
diff --git a/utils/list_files.go b/utils/list_files.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/threatwinds/go-sdk/catcher"
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -33,7 +33,7 @@ func ListFiles(route string, filter string) []string {
 	})
 	if err != nil {
 		if !strings.Contains(err.Error(), "no such file or directory") {
-			panic(catcher.Error("cannot walk through directory", err, map[string]any{"route": route}))
+			panic(fmt.Errorf("cannot walk through directory %s: %w", route, err))
 		}
 	}
 
diff --git a/utils/network.go b/utils/network.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"context"
-	"github.com/threatwinds/go-sdk/catcher"
+	"fmt"
 	"net"
 	"time"
 )
@@ -23,19 +23,19 @@ func GetMainIP() (string, error) {
 	var d net.Dialer
 	conn, err := d.DialContext(ctx, "udp", "8.8.8.8:80")
 	if err != nil {
-		return "", catcher.Error("failed to create Dial context", err, nil)
+		return "", fmt.Errorf("failed to create Dial context: %w", err)
 	}
 	defer func() {
 		_ = conn.Close()
 	}()
 
 	localAddr, ok := conn.LocalAddr().(*net.UDPAddr)
 	if !ok {
-		return "", catcher.Error("failed to get local address", nil, nil)
+		return "", fmt.Errorf("failed to get local address: invalid type")
 	}
 
 	if localAddr.IP == nil {
-		return "", catcher.Error("failed to get local IP address", nil, nil)
+		return "", fmt.Errorf("failed to get local IP address: IP is nil")
 	}
 
 	return localAddr.IP.String(), nil
diff --git a/utils/protojson.go b/utils/protojson.go
@@ -1,9 +1,7 @@
 package utils
 
 import (
-	"errors"
 	"fmt"
-	"github.com/threatwinds/go-sdk/catcher"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
@@ -21,12 +19,12 @@ const maxMessageSize = 10 * 1024 * 1024 // 10MB limit
 //   - *error: A pointer to an error if an error occurs, otherwise nil.
 func ToString(object protoreflect.ProtoMessage) (*string, error) {
 	if object == nil {
-		return nil, catcher.Error("cannot convert to string", errors.New("object is a nil pointer"), nil)
+		return nil, fmt.Errorf("cannot convert to string: object is a nil pointer")
 	}
 
 	objectBytes, err := protojson.Marshal(object)
 	if err != nil {
-		return nil, catcher.Error("cannot convert to string", err, nil)
+		return nil, fmt.Errorf("cannot convert to string: %w", err)
 	}
 
 	objectString := string(objectBytes)
@@ -44,24 +42,18 @@ func ToString(object protoreflect.ProtoMessage) (*string, error) {
 //   - error: An error object if the unmarshalling fails, otherwise nil.
 func ToObject(str *string, object protoreflect.ProtoMessage) error {
 	if str == nil || object == nil {
-		return catcher.Error("cannot convert to object", errors.New("object or string is a nil pointer"), map[string]any{
-			"nilStr":    str == nil,
-			"nilObject": object == nil,
-		})
+		return fmt.Errorf("cannot convert to object: object or string is a nil pointer (nilStr=%v, nilObject=%v)", str == nil, object == nil)
 	}
 
 	if len(*str) > maxMessageSize {
-		return catcher.Error("cannot convert to object", errors.New("message size exceeds limit"), map[string]any{
-			"size":  fmt.Sprintf("%d bytes", len(*str)),
-			"limit": fmt.Sprintf("%d bytes", maxMessageSize),
-		})
+		return fmt.Errorf("cannot convert to object: message size exceeds limit (size=%d bytes, limit=%d bytes)", len(*str), maxMessageSize)
 	}
 
 	unmarshaler := protojson.UnmarshalOptions{DiscardUnknown: true}
 
 	err := unmarshaler.Unmarshal([]byte(*str), object)
 	if err != nil {
-		return catcher.Error("failed to parse object", err, nil)
+		return fmt.Errorf("failed to parse object: %w", err)
 	}
 
 	return nil
diff --git a/utils/request.go b/utils/request.go
@@ -4,9 +4,7 @@ import (
 	"bytes"
 	"crypto/tls"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"github.com/threatwinds/go-sdk/catcher"
 	"io"
 	"net/http"
 	"os"
@@ -38,16 +36,12 @@ func DoReq[response any](url string, data []byte, method string, headers map[str
 	var result response
 
 	if len(data) > maxMessageSize {
-		return result, http.StatusBadRequest, catcher.Error("cannot convert to object",
-			errors.New("data size exceeds limit"), map[string]any{
-				"size":  fmt.Sprintf("%d bytes", len(data)),
-				"limit": fmt.Sprintf("%d bytes", maxMessageSize),
-			})
+		return result, http.StatusBadRequest, fmt.Errorf("cannot convert to object: data size exceeds limit (size=%d bytes, limit=%d bytes)", len(data), maxMessageSize)
 	}
 
 	req, err := http.NewRequest(method, url, bytes.NewBuffer(data))
 	if err != nil {
-		return result, http.StatusInternalServerError, catcher.Error("error creating request", err, nil)
+		return result, http.StatusInternalServerError, fmt.Errorf("error creating request: %w", err)
 	}
 
 	for k, v := range headers {
@@ -67,21 +61,18 @@ func DoReq[response any](url string, data []byte, method string, headers map[str
 
 	resp, err := client.Do(req)
 	if err != nil {
-		return result, http.StatusInternalServerError, catcher.Error("error doing request", err, nil)
+		return result, http.StatusInternalServerError, fmt.Errorf("error doing request: %w", err)
 	}
 
 	defer func() { _ = resp.Body.Close() }()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return result, http.StatusInternalServerError, catcher.Error("error reading response body", err, nil)
+		return result, http.StatusInternalServerError, fmt.Errorf("error reading response body: %w", err)
 	}
 
 	if resp.StatusCode >= 400 {
-		return result, resp.StatusCode, catcher.Error("error response", nil, map[string]interface{}{
-			"response": string(body),
-			"status":   resp.StatusCode,
-		})
+		return result, resp.StatusCode, fmt.Errorf("error response (status=%d): %s", resp.StatusCode, string(body))
 	}
 
 	if resp.StatusCode == http.StatusNoContent {
@@ -90,7 +81,7 @@ func DoReq[response any](url string, data []byte, method string, headers map[str
 
 	err = json.Unmarshal(body, &result)
 	if err != nil {
-		return result, resp.StatusCode, catcher.Error("error parsing response", err, nil)
+		return result, resp.StatusCode, fmt.Errorf("error parsing response: %w", err)
 	}
 
 	return result, resp.StatusCode, nil
@@ -108,7 +99,7 @@ func DoReq[response any](url string, data []byte, method string, headers map[str
 func Download(url, file string) error {
 	out, err := os.Create(file)
 	if err != nil {
-		return catcher.Error("error creating file", err, map[string]interface{}{"file": file})
+		return fmt.Errorf("error creating file %s: %w", file, err)
 	}
 
 	defer func() { _ = out.Close() }()
@@ -125,14 +116,14 @@ func Download(url, file string) error {
 
 	resp, err := client.Get(url)
 	if err != nil {
-		return catcher.Error("error downloading file", err, map[string]any{"url": url})
+		return fmt.Errorf("error downloading file from %s: %w", url, err)
 	}
 
 	defer func() { _ = resp.Body.Close() }()
 
 	_, err = io.Copy(out, resp.Body)
 	if err != nil {
-		return catcher.Error("error saving file", err, map[string]any{"file": file})
+		return fmt.Errorf("error saving file %s: %w", file, err)
 	}
 
 	return nil
diff --git a/utils/yaml.go b/utils/yaml.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/threatwinds/go-sdk/catcher"
+	"fmt"
 	"os"
 
 	"gopkg.in/yaml.v3"
@@ -20,12 +20,12 @@ import (
 func ReadPbYaml(f string) ([]byte, error) {
 	content, err := os.ReadFile(f)
 	if err != nil {
-		return nil, catcher.Error("error opening file", err, map[string]interface{}{"file": f})
+		return nil, fmt.Errorf("error opening file %s: %w", f, err)
 	}
 
 	bytes, err := k8syaml.YAMLToJSON(content)
 	if err != nil {
-		return nil, catcher.Error("error converting YAML to JSON", err, map[string]interface{}{"file": f})
+		return nil, fmt.Errorf("error converting YAML to JSON for file %s: %w", f, err)
 	}
 
 	return bytes, nil
@@ -50,19 +50,19 @@ func ReadPbYaml(f string) ([]byte, error) {
 func ReadYaml[t any](f string, jsonMode bool) (*t, error) {
 	content, err := os.ReadFile(f)
 	if err != nil {
-		return nil, catcher.Error("error opening file", err, map[string]any{"file": f})
+		return nil, fmt.Errorf("error opening file %s: %w", f, err)
 	}
 
 	var value = new(t)
 	if jsonMode {
 		err = k8syaml.Unmarshal(content, value)
 		if err != nil {
-			return nil, catcher.Error("error decoding file", err, map[string]any{"file": f})
+			return nil, fmt.Errorf("error decoding file %s: %w", f, err)
 		}
 	} else {
 		err = yaml.Unmarshal(content, value)
 		if err != nil {
-			return nil, catcher.Error("error decoding file", err, map[string]any{"file": f})
+			return nil, fmt.Errorf("error decoding file %s: %w", f, err)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`package utils`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "errors"`
`5`		`- "github.com/threatwinds/go-sdk/catcher"`
	`4`	`+ "fmt"`
`6`	`5`	`"regexp"`
`7`	`6`	`"strings"`
`8`	`7`	`)`
`@@ -15,13 +14,12 @@ func ValidateReservedField(f string, allowEmpty bool) error {`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`if f == "" && !allowEmpty {`
`18`		`- return catcher.Error("error validating field", errors.New("field name cannot be empty"), nil)`
	`17`	`+ return fmt.Errorf("error validating field: field name cannot be empty")`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`for _, rf := range reservedFields {`
`22`	`21`	`if f == rf {`
`23`		`- return catcher.Error("error validating field", errors.New("field cannot be a reserved field"),`
`24`		`- map[string]any{"reservedFields": reservedFields, "usedField": f})`
	`22`	`+ return fmt.Errorf("error validating field: field cannot be a reserved field (reserved: %v, used: %s)", reservedFields, f)`
`25`	`23`	`}`
`26`	`24`	`}`
`27`	`25`
`@@ -37,7 +35,6 @@ func SanitizeField(s *string) {`
`37`	`35`	`// compile the pattern`
`38`	`36`	`compiledPattern, err := regexp.Compile(exp)`
`39`	`37`	`if err != nil {`
`40`		`- _ = catcher.Error("error compiling regexp", err, nil)`
`41`	`38`	`return`
`42`	`39`	`}`
`43`	`40`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package utils`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/threatwinds/go-sdk/catcher"`
	`4`	`+ "fmt"`
`5`	`5`	`"strings"`
`6`	`6`	`)`
`7`	`7`
`@@ -18,19 +18,13 @@ func ValidateFilePath(path string) error {`
`18`	`18`
`19`	`19`	`for _, c := range contains {`
`20`	`20`	`if strings.Contains(path, c) {`
`21`		`- return catcher.Error("path contains an invalid character", nil, map[string]any{`
`22`		`- "path": path,`
`23`		`- "invalid": c,`
`24`		`- })`
	`21`	`+ return fmt.Errorf("path contains an invalid character: path=%s, invalid=%s", path, c)`
`25`	`22`	`}`
`26`	`23`	`}`
`27`	`24`
`28`	`25`	`for _, p := range prefixes {`
`29`	`26`	`if strings.HasPrefix(path, p) {`
`30`		`- return catcher.Error("path starts with an invalid character", nil, map[string]any{`
`31`		`- "path": path,`
`32`		`- "invalid": p,`
`33`		`- })`
	`27`	`+ return fmt.Errorf("path starts with an invalid character: path=%s, invalid=%s", path, p)`
`34`	`28`	`}`
`35`	`29`	`}`
`36`	`30`