Skip to content

Commit

Permalink
feat: add Wrap and Wrapf in errorx (#2126)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevwan committed Jul 11, 2022
1 parent 1c09db6 commit e672b3f
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 0 deletions.
21 changes: 21 additions & 0 deletions core/errorx/wrap.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package errorx

import "fmt"

// Wrap returns an error that wraps err with given message.
func Wrap(err error, message string) error {
if err == nil {
return nil
}

return fmt.Errorf("%s: %w", message, err)
}

// Wrapf returns an error that wraps err with given format and args.
func Wrapf(err error, format string, args ...interface{}) error {
if err == nil {
return nil
}

return fmt.Errorf("%s: %w", fmt.Sprintf(format, args...), err)
}
18 changes: 18 additions & 0 deletions core/errorx/wrap_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package errorx

import (
"errors"
"testing"

"github.com/stretchr/testify/assert"
)

func TestWrap(t *testing.T) {
assert.Nil(t, Wrap(nil, "test"))
assert.Equal(t, "foo: bar", Wrap(errors.New("bar"), "foo").Error())
}

func TestWrapf(t *testing.T) {
assert.Nil(t, Wrapf(nil, "%s", "test"))
assert.Equal(t, "foo bar: quz", Wrapf(errors.New("quz"), "foo %s", "bar").Error())
}
7 changes: 7 additions & 0 deletions gateway/config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package gateway

import "github.com/zeromicro/go-zero/rest"

type GatewayConf struct {
rest.RestConf
}
6 changes: 6 additions & 0 deletions gateway/server.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package gateway

type Server struct {
}

func MustNewServer() {}

0 comments on commit e672b3f

Please sign in to comment.