Skip to content

Commit f861e14

Browse files
b-2-83b-2-83
authored
Merge pull request #12 from objenious/change/lib
use objenious/errors
2 parents d9622c3 + 6491c77 commit f861e14

8 files changed

Lines changed: 426 additions & 65 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ backoffutil.Retry(func() error {
9393

9494
## Notes
9595

96-
errorutil is compatible with https://github.com/pkg/errors :
96+
errorutil is compatible with https://github.com/objenious/errors :
9797

9898
```go
9999
err = errors.Wrap(errorutil.RetryableError(err), "some message")

‎delayed.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package errorutil
22

33
import (
4-
"github.com/pkg/errors"
54
"time"
5+
6+
"github.com/objenious/errors"
67
)
78

89
// Delayer defines an error that
@@ -48,7 +49,6 @@ type delayedError struct {
4849
duration time.Duration
4950
}
5051

51-
5252
func (err *delayedError) Delay() time.Duration {
5353
return err.duration
5454
}

‎delayed_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package errorutil
22

33
import (
4-
"github.com/pkg/errors"
54
"testing"
65
"time"
6+
7+
"github.com/objenious/errors"
78
)
89

910
func TestDelay(t *testing.T) {

‎doc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ see backoffutil sub package
5252
5353
Notes
5454
55-
errorutil is compatible with https://github.com/pkg/errors :
55+
errorutil is compatible with https://github.com/objenious/errors :
5656
5757
err = errors.Wrap(errorutil.RetryableError(err), "some message")
5858
errorutil.IsRetryable(err) // returns true

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/objenious/errorutil
33
go 1.13
44

55
require (
6-
cloud.google.com/go v0.45.1
6+
cloud.google.com/go/storage v1.15.0
77
github.com/cenkalti/backoff v2.2.1+incompatible
8-
github.com/pkg/errors v0.8.1
8+
github.com/objenious/errors v0.9.1
99
)

‎go.sum‎

Lines changed: 373 additions & 13 deletions
Large diffs are not rendered by default.

‎http_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"cloud.google.com/go/storage"
1111

12-
pkgerrors "github.com/pkg/errors"
12+
oerrors "github.com/objenious/errors"
1313
)
1414

1515
func TestHTTPStatusCode(t *testing.T) {
@@ -22,29 +22,29 @@ func TestHTTPStatusCode(t *testing.T) {
2222
{errors.New("foo"), http.StatusInternalServerError},
2323

2424
{os.ErrNotExist, http.StatusNotFound},
25-
{pkgerrors.Wrap(os.ErrNotExist, "bar"), http.StatusNotFound},
25+
{oerrors.Wrap(os.ErrNotExist, "bar"), http.StatusNotFound},
2626
{os.ErrPermission, http.StatusForbidden},
27-
{pkgerrors.Wrap(os.ErrPermission, "bar"), http.StatusForbidden},
27+
{oerrors.Wrap(os.ErrPermission, "bar"), http.StatusForbidden},
2828
{sql.ErrNoRows, http.StatusNotFound},
29-
{pkgerrors.Wrap(sql.ErrNoRows, "bar"), http.StatusNotFound},
29+
{oerrors.Wrap(sql.ErrNoRows, "bar"), http.StatusNotFound},
3030
{storage.ErrBucketNotExist, http.StatusNotFound},
31-
{pkgerrors.Wrap(storage.ErrBucketNotExist, "bar"), http.StatusNotFound},
31+
{oerrors.Wrap(storage.ErrBucketNotExist, "bar"), http.StatusNotFound},
3232
{storage.ErrObjectNotExist, http.StatusNotFound},
33-
{pkgerrors.Wrap(storage.ErrObjectNotExist, "bar"), http.StatusNotFound},
33+
{oerrors.Wrap(storage.ErrObjectNotExist, "bar"), http.StatusNotFound},
3434

3535
{httpError(http.StatusNotFound), http.StatusNotFound},
36-
{pkgerrors.Wrap(httpError(http.StatusNotFound), "bar"), http.StatusNotFound},
36+
{oerrors.Wrap(httpError(http.StatusNotFound), "bar"), http.StatusNotFound},
3737
{httpError(http.StatusForbidden), http.StatusForbidden},
38-
{pkgerrors.Wrap(httpError(http.StatusForbidden), "bar"), http.StatusForbidden},
38+
{oerrors.Wrap(httpError(http.StatusForbidden), "bar"), http.StatusForbidden},
3939

4040
{NotFoundError(errors.New("foo")), http.StatusNotFound},
41-
{pkgerrors.Wrap(NotFoundError(errors.New("foo")), "bar"), http.StatusNotFound},
41+
{oerrors.Wrap(NotFoundError(errors.New("foo")), "bar"), http.StatusNotFound},
4242
{ForbiddenError(errors.New("foo")), http.StatusForbidden},
43-
{pkgerrors.Wrap(ForbiddenError(errors.New("foo")), "bar"), http.StatusForbidden},
43+
{oerrors.Wrap(ForbiddenError(errors.New("foo")), "bar"), http.StatusForbidden},
4444
{InvalidError(errors.New("foo")), http.StatusBadRequest},
45-
{pkgerrors.Wrap(InvalidError(errors.New("foo")), "bar"), http.StatusBadRequest},
45+
{oerrors.Wrap(InvalidError(errors.New("foo")), "bar"), http.StatusBadRequest},
4646
{ConflictError(errors.New("foo")), http.StatusConflict},
47-
{pkgerrors.Wrap(ConflictError(errors.New("foo")), "bar"), http.StatusConflict},
47+
{oerrors.Wrap(ConflictError(errors.New("foo")), "bar"), http.StatusConflict},
4848
}
4949
for _, tt := range tests {
5050
got := HTTPStatusCode(tt.err)

‎retryable_test.go‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net/http"
66
"testing"
77

8-
pkgerrors "github.com/pkg/errors"
8+
oerrors "github.com/objenious/errors"
99
)
1010

1111
type retryable bool
@@ -29,55 +29,55 @@ func TestIsRetryable(t *testing.T) {
2929
{nil, false},
3030
{RetryableError(nil), false},
3131
{NotRetryableError(nil), false},
32-
{pkgerrors.Wrap(RetryableError(nil), "bar"), false},
32+
{oerrors.Wrap(RetryableError(nil), "bar"), false},
3333

3434
{errors.New("foo"), false},
35-
{pkgerrors.New("foo"), false},
36-
{pkgerrors.Wrap(errors.New("foo"), "bar"), false},
35+
{oerrors.New("foo"), false},
36+
{oerrors.Wrap(errors.New("foo"), "bar"), false},
3737

3838
{RetryableError(errors.New("foo")), true},
39-
{RetryableError(pkgerrors.New("foo")), true},
40-
{pkgerrors.Wrap(RetryableError(errors.New("foo")), "bar"), true},
39+
{RetryableError(oerrors.New("foo")), true},
40+
{oerrors.Wrap(RetryableError(errors.New("foo")), "bar"), true},
4141

4242
{RetryableError(NotRetryableError(errors.New("foo"))), true},
4343
{NotRetryableError(errors.New("foo")), false},
44-
{NotRetryableError(pkgerrors.New("foo")), false},
45-
{pkgerrors.Wrap(NotRetryableError(errors.New("foo")), "bar"), false},
44+
{NotRetryableError(oerrors.New("foo")), false},
45+
{oerrors.Wrap(NotRetryableError(errors.New("foo")), "bar"), false},
4646

4747
{httpError(http.StatusBadGateway), true},
48-
{pkgerrors.Wrap(httpError(http.StatusBadGateway), "bar"), true},
48+
{oerrors.Wrap(httpError(http.StatusBadGateway), "bar"), true},
4949
{httpError(http.StatusInternalServerError), true},
50-
{pkgerrors.Wrap(httpError(http.StatusInternalServerError), "bar"), true},
50+
{oerrors.Wrap(httpError(http.StatusInternalServerError), "bar"), true},
5151
{httpError(http.StatusGatewayTimeout), true},
52-
{pkgerrors.Wrap(httpError(http.StatusGatewayTimeout), "bar"), true},
52+
{oerrors.Wrap(httpError(http.StatusGatewayTimeout), "bar"), true},
5353
{httpError(429), true},
54-
{pkgerrors.Wrap(httpError(429), "bar"), true},
54+
{oerrors.Wrap(httpError(429), "bar"), true},
5555
{httpError(http.StatusNotFound), false},
56-
{pkgerrors.Wrap(httpError(http.StatusNotFound), "bar"), false},
56+
{oerrors.Wrap(httpError(http.StatusNotFound), "bar"), false},
5757
{NotFoundError(errors.New("foo")), false},
5858
{httpError(http.StatusBadRequest), false},
59-
{pkgerrors.Wrap(httpError(http.StatusBadRequest), "bar"), false},
59+
{oerrors.Wrap(httpError(http.StatusBadRequest), "bar"), false},
6060
{InvalidError(errors.New("foo")), false},
6161
{httpError(http.StatusForbidden), false},
62-
{pkgerrors.Wrap(httpError(http.StatusForbidden), "bar"), false},
62+
{oerrors.Wrap(httpError(http.StatusForbidden), "bar"), false},
6363
{ForbiddenError(errors.New("foo")), false},
6464

6565
{NotRetryableError(httpError(http.StatusBadGateway)), false},
66-
{NotRetryableError(pkgerrors.Wrap(httpError(http.StatusBadGateway), "bar")), false},
66+
{NotRetryableError(oerrors.Wrap(httpError(http.StatusBadGateway), "bar")), false},
6767
{NotRetryableError(httpError(http.StatusInternalServerError)), false},
68-
{NotRetryableError(pkgerrors.Wrap(httpError(http.StatusInternalServerError), "bar")), false},
68+
{NotRetryableError(oerrors.Wrap(httpError(http.StatusInternalServerError), "bar")), false},
6969
{NotRetryableError(httpError(http.StatusGatewayTimeout)), false},
70-
{NotRetryableError(pkgerrors.Wrap(httpError(http.StatusGatewayTimeout), "bar")), false},
70+
{NotRetryableError(oerrors.Wrap(httpError(http.StatusGatewayTimeout), "bar")), false},
7171
{NotRetryableError(httpError(429)), false},
72-
{NotRetryableError(pkgerrors.Wrap(httpError(429), "bar")), false},
72+
{NotRetryableError(oerrors.Wrap(httpError(429), "bar")), false},
7373
{NotRetryableError(httpError(http.StatusNotFound)), false},
74-
{NotRetryableError(pkgerrors.Wrap(httpError(http.StatusNotFound), "bar")), false},
74+
{NotRetryableError(oerrors.Wrap(httpError(http.StatusNotFound), "bar")), false},
7575
{NotRetryableError(NotFoundError(errors.New("foo"))), false},
7676
{NotRetryableError(httpError(http.StatusBadRequest)), false},
77-
{NotRetryableError(pkgerrors.Wrap(httpError(http.StatusBadRequest), "bar")), false},
77+
{NotRetryableError(oerrors.Wrap(httpError(http.StatusBadRequest), "bar")), false},
7878
{NotRetryableError(InvalidError(errors.New("foo"))), false},
7979
{NotRetryableError(httpError(http.StatusForbidden)), false},
80-
{NotRetryableError(pkgerrors.Wrap(httpError(http.StatusForbidden), "bar")), false},
80+
{NotRetryableError(oerrors.Wrap(httpError(http.StatusForbidden), "bar")), false},
8181
{NotRetryableError(ForbiddenError(errors.New("foo"))), false},
8282

8383
{retryable(false), false},
@@ -110,23 +110,23 @@ func TestIsNotRetryable(t *testing.T) {
110110
{nil, false},
111111
{RetryableError(nil), false},
112112
{NotRetryableError(nil), false},
113-
{pkgerrors.Wrap(RetryableError(nil), "bar"), false},
114-
{NotRetryableError(pkgerrors.Wrap(RetryableError(nil), "bar")), false},
113+
{oerrors.Wrap(RetryableError(nil), "bar"), false},
114+
{NotRetryableError(oerrors.Wrap(RetryableError(nil), "bar")), false},
115115

116116
{errors.New("foo"), false},
117-
{pkgerrors.New("foo"), false},
118-
{pkgerrors.Wrap(errors.New("foo"), "bar"), false},
117+
{oerrors.New("foo"), false},
118+
{oerrors.Wrap(errors.New("foo"), "bar"), false},
119119

120120
{RetryableError(errors.New("foo")), false},
121121
{NotRetryableError(errors.New("foo")), true},
122122
{NotRetryableError(RetryableError(errors.New("foo"))), true},
123-
{RetryableError(pkgerrors.New("foo")), false},
124-
{NotRetryableError(RetryableError(pkgerrors.New("foo"))), true},
125-
{NotRetryableError(pkgerrors.New("foo")), true},
126-
{pkgerrors.Wrap(RetryableError(errors.New("foo")), "bar"), false},
127-
{pkgerrors.Wrap(NotRetryableError(errors.New("foo")), "bar"), true},
128-
{NotRetryableError(pkgerrors.Wrap(RetryableError(errors.New("foo")), "bar")), true},
129-
{RetryableError(NotRetryableError(pkgerrors.Wrap(RetryableError(errors.New("foo")), "bar"))), false},
123+
{RetryableError(oerrors.New("foo")), false},
124+
{NotRetryableError(RetryableError(oerrors.New("foo"))), true},
125+
{NotRetryableError(oerrors.New("foo")), true},
126+
{oerrors.Wrap(RetryableError(errors.New("foo")), "bar"), false},
127+
{oerrors.Wrap(NotRetryableError(errors.New("foo")), "bar"), true},
128+
{NotRetryableError(oerrors.Wrap(RetryableError(errors.New("foo")), "bar")), true},
129+
{RetryableError(NotRetryableError(oerrors.Wrap(RetryableError(errors.New("foo")), "bar"))), false},
130130

131131
{retryable(false), true},
132132
{retryable(true), false},

0 commit comments

Comments
 (0)