fix(tester): improve error handling

pkg/aws-s3-client.go

@@ -0,0 +1 @@
+package pkg

pkg/errors.go

@@ -0,0 +1,37 @@
+package pkg
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+)
+
+var (
+	NoPermission       = errors.New("no permission")
+	ErrUnauthenticated = errors.New("unauthenticated")
+	ErrUnhandled       = errors.New("unhandled")
+	ErrNotFound        = errors.New("not found")
+	ErrBadInput        = errors.New("bad input")
+	ErrInternal        = errors.New("internal")
+)
+
+func Wrap(basic error, err error, op string, msg string) error {
+	return errors.Join(basic, err, fmt.Errorf("during %s: %s", op, msg))
+}
+
+func ToREST(err error) int {
+	switch {
+	case errors.Is(err, ErrUnauthenticated):
+		return http.StatusUnauthorized
+	case errors.Is(err, ErrBadInput):
+		return http.StatusBadRequest
+	case errors.Is(err, ErrNotFound):
+		return http.StatusNotFound
+	case errors.Is(err, ErrInternal):
+		return http.StatusInternalServerError
+	case errors.Is(err, NoPermission):
+		return http.StatusForbidden
+	}
+
+	return http.StatusInternalServerError
+}

pkg/external/aws/client.go

@@ -1 +0,0 @@
-package aws

pkg/pandoc-client.go

@@ -1,4 +1,4 @@
-package pandoc
+package pkg
 
 import (
 	"bytes"

pkg/postgres-client.go

@@ -1,4 +1,4 @@
-package postgres
+package pkg
 
 import (
 	_ "github.com/jackc/pgx/v5/stdlib"

pkg/rabbitmq-client.go

@@ -1,4 +1,4 @@
-package rabbitmq
+package pkg
 
 import amqp "github.com/rabbitmq/amqp091-go"
 

pkg/utils/errors.go

@@ -1,132 +0,0 @@
-package utils
-
-import (
-	"errors"
-	"fmt"
-	"go.uber.org/zap/zapcore"
-	"runtime"
-)
-
-type code uint8
-
-const (
-	ErrValidationFailed code = 1
-	ErrInternal         code = 2
-	ErrExternal         code = 3
-	ErrNoPermission     code = 4
-	ErrUnknown          code = 5
-	ErrDeadlineExceeded code = 6
-	ErrNotFound         code = 7
-	ErrAlreadyExists    code = 8
-	ErrConflict         code = 9
-	ErrUnimplemented    code = 10
-	ErrBadInput         code = 11
-	ErrUnauthenticated  code = 12
-)
-
-func (c code) String() string {
-	switch {
-	case errors.Is(c, ErrValidationFailed):
-		return "validation error"
-	case errors.Is(c, ErrInternal):
-		return "internal error"
-	case errors.Is(c, ErrExternal):
-		return "external error"
-	case errors.Is(c, ErrNoPermission):
-		return "permission error"
-	case errors.Is(c, ErrUnknown):
-		return "unknown error"
-	case errors.Is(c, ErrDeadlineExceeded):
-		return "deadline error"
-	case errors.Is(c, ErrNotFound):
-		return "not found error"
-	case errors.Is(c, ErrAlreadyExists):
-		return "already exists error"
-	case errors.Is(c, ErrConflict):
-		return "conflict error"
-	case errors.Is(c, ErrUnimplemented):
-		return "unimplemented error"
-	case errors.Is(c, ErrBadInput):
-		return "bad input error"
-	}
-
-	panic("unimplemented")
-}
-
-func (c code) Error() string {
-	return c.String()
-}
-
-type layer uint8
-
-const (
-	LayerTransport layer = 1
-	LayerService   layer = 2
-	LayerStorage   layer = 3
-)
-
-func (l layer) String() string {
-	switch l {
-	case LayerTransport:
-		return "transport"
-	case LayerService:
-		return "service"
-	case LayerStorage:
-		return "storage"
-	}
-
-	panic("unimplemented")
-}
-
-func location(skip int) string {
-	_, file, line, _ := runtime.Caller(skip)
-	return fmt.Sprintf("%s:%d", file, line)
-}
-
-type Error struct {
-	src   error
-	layer layer
-	code  code
-	msg   string
-	loc   string
-}
-
-func wrap(src error, layer layer, class code, msg string, loc string) *Error {
-	return &Error{
-		src:   src,
-		layer: layer,
-		code:  class,
-		msg:   msg,
-		loc:   loc,
-	}
-}
-
-func (e *Error) Unwrap() []error {
-	return []error{e.src, e.code}
-}
-
-func (e *Error) Error() string {
-	return fmt.Sprintf("%s: %s", e.code.String(), e.msg)
-}
-
-func (e *Error) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	if e.src != nil {
-		encoder.AddString("src", e.src.Error())
-	}
-	encoder.AddString("layer", e.layer.String())
-	encoder.AddString("code", e.code.String())
-	encoder.AddString("msg", e.msg)
-	return nil
-}
-
-func TransportError(src error, code code, msg string) error {
-	return wrap(src, LayerTransport, code, msg, location(2))
-}
-
-func ServiceError(src error, code code, msg string) error {
-	return wrap(src, LayerService, code, msg, location(2))
-}
-
-func StorageError(src error, code code, msg string) error {
-	return wrap(src, LayerStorage, code, msg, location(2))
-}

pkg/utils/utils.go

@@ -1,33 +0,0 @@
-package utils
-
-import (
-	"google.golang.org/protobuf/types/known/timestamppb"
-	"time"
-)
-
-func AsTimeP(t time.Time) *time.Time {
-	return &t
-}
-
-func AsInt32P(v int32) *int32 {
-	return &v
-}
-
-func AsStringP(str string) *string {
-	return &str
-}
-
-func TimeP(t *timestamppb.Timestamp) *time.Time {
-	if t == nil {
-		return nil
-	}
-	tt := t.AsTime()
-	return &tt
-}
-
-func TimestampP(t *time.Time) *timestamppb.Timestamp {
-	if t == nil {
-		return nil
-	}
-	return timestamppb.New(*t)
-}

pkg/valkey-client.go

@@ -1,4 +1,4 @@
-package valkey
+package pkg
 
 import "github.com/valkey-io/valkey-go"