Merge pull request #21 from srvc/qnighy/fail-4.1.1

Use github.com/srvc/fail v4.1.1

Author: qnighy

CHANGELOG.md

@@ -0,0 +1,33 @@
+## Unreleased
+
+## 1.2.0
+
+- [Technically breaking] Use github.com/srvc/fail v4.1.1 https://github.com/srvc/grpc-errors/pull/21
+
+## 1.1.0
+
+- Use go mod instead of dep https://github.com/srvc/grpc-errors/pull/20
+
+## 1.0.0
+
+- [Breaking] Expand error handler interfaces https://github.com/srvc/grpc-errors/pull/11
+- Add new error handler for catching reportable errors for unary server https://github.com/srvc/grpc-errors/pull/12
+- [Behavioral change] Use codes.Unknown on WithStatusCodeMap when a status code is unknown https://github.com/srvc/grpc-errors/pull/14
+- [Behavioral change] Map status code only when grpc/codes.Code has not been set https://github.com/srvc/grpc-errors/pull/15
+- [Behavioral change] WithStatusCodeMap: return original error when no code is found https://github.com/srvc/grpc-errors/pull/16
+- Add `WithGrpcStatusUnwrapper` https://github.com/srvc/grpc-errors/pull/16
+- Add error handler for stream servers https://github.com/srvc/grpc-errors/pull/17
+- Move from izumin5210/grpc-errors to srvc/grpc-errors https://github.com/srvc/grpc-errors/pull/19
+- [Breaking] Use srvc/fail instead of creasty/apperrors https://github.com/srvc/grpc-errors/pull/18
+
+
+## 0.2.0
+
+- Add `WithAppErrorHandler` https://github.com/srvc/grpc-errors/pull/7
+- [Breaking] Make error handlers receive request contexts https://github.com/srvc/grpc-errors/pull/8
+- [Breaking] Add new status code mapper handler impl https://github.com/srvc/grpc-errors/pull/9
+- Improve readme https://github.com/srvc/grpc-errors/pull/10
+
+## 0.1.0
+
+Initial release.

go.mod

@@ -5,9 +5,7 @@ go 1.12
 require (
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
 	github.com/golang/protobuf v1.1.0
-	github.com/pkg/errors v0.8.0 // indirect
-	github.com/srvc/fail v3.0.0+incompatible
-	github.com/stretchr/testify v1.3.0 // indirect
+	github.com/srvc/fail/v4 v4.1.1
 	golang.org/x/net v0.0.0-20180816102801-aaf60122140d
 	golang.org/x/sync v0.0.0-20190412183630-56d357773e84 // indirect
 	golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c // indirect

go.sum

@@ -4,15 +4,15 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekf
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/protobuf v1.1.0 h1:0iH4Ffd/meGoXqF2lSAhZHt8X+cPgkfn/cb6Cce5Vpc=
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/srvc/fail v3.0.0+incompatible h1:or7UerTqPWiSxOlnEyNF++7z32Y+edWo6K5y1xzr9d0=
-github.com/srvc/fail v3.0.0+incompatible/go.mod h1:O6qL3O5sUrJlIh2oGAZ5J9RKGGae3D1U6jMGyzM6RK4=
+github.com/srvc/fail/v4 v4.1.1 h1:yJQ7qyoOCMpxv95rnZ2Cv+PraW2YMHJjRQvi+wYzgUs=
+github.com/srvc/fail/v4 v4.1.1/go.mod h1:MRvEHBeA6us0y3MbIfpgDc7HgshPP6T8qy7Ut9pfJJ4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 golang.org/x/net v0.0.0-20180816102801-aaf60122140d h1:211XH5RPVP5tOBkz6xm3/b7KxtjqVf6PYG+evqJpE08=
 golang.org/x/net v0.0.0-20180816102801-aaf60122140d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/sync v0.0.0-20190412183630-56d357773e84 h1:IqXQ59gzdXv58Jmm2xn0tSOR9i6HqroaOFRQ3wR/dJQ=
@@ -25,3 +25,7 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/grpc v1.14.0 h1:ArxJuB1NWfPY6r9Gp9gqwplT0Ge7nqv9msgu03lHLmo=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

handlers.go

@@ -1,7 +1,7 @@
 package grpcerrors
 
 import (
-	"github.com/srvc/fail"
+	"github.com/srvc/fail/v4"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

interceptors_test.go

@@ -10,7 +10,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/srvc/fail"
+	"github.com/srvc/fail/v4"
 	"github.com/srvc/grpc-errors/testing"
 )
 

stream_server_error_handlers.go

@@ -1,7 +1,7 @@
 package grpcerrors
 
 import (
-	"github.com/srvc/fail"
+	"github.com/srvc/fail/v4"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )

unary_server_error_handlers.go

@@ -1,7 +1,7 @@
 package grpcerrors
 
 import (
-	"github.com/srvc/fail"
+	"github.com/srvc/fail/v4"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )