TrueCloudLab/frostfs-api-go
21
0
Fork 13
Code Issues 9 Pull requests 3 Projects Releases Activity Actions

Merge pull request #21 from nspcc-dev/fix/get-status-error-even-if-it-is-wrapped

Browse source 
Get status error even if it is wrapped
This commit is contained in:
Evgeniy Kulikov 2019-11-26 14:20:05 +03:00 committed by GitHub
commit ab70f84999
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
service/meta.go
View file

@ -2,6 +2,7 @@ package service
import ( import (
"github.com/nspcc-dev/neofs-proto/internal" "github.com/nspcc-dev/neofs-proto/internal"
"github.com/pkg/errors"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
) )
@ -106,7 +107,7 @@ func ProcessRequestTTL(req MetaHeader, cond ...TTLCondition) error {
// check specific condition: // check specific condition:
if err := cond[i](ttl); err != nil { if err := cond[i](ttl); err != nil {
if st, ok := status.FromError(err); ok { if st, ok := status.FromError(errors.Cause(err)); ok {
return st.Err() return st.Err()
} }

13
service/meta_test.go
View file

@ -3,6 +3,7 @@ package service
import ( import (
"testing" "testing"
"github.com/pkg/errors"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
@ -54,6 +55,18 @@ func TestMetaRequest(t *testing.T) {
RequestMetaHeader: RequestMetaHeader{TTL: SingleForwardingTTL}, RequestMetaHeader: RequestMetaHeader{TTL: SingleForwardingTTL},
handler: func(_ uint32) error { return status.Error(codes.NotFound, "not found") }, handler: func(_ uint32) error { return status.Error(codes.NotFound, "not found") },
}, },
{
msg: "not found",
code: codes.NotFound,
name: "custom wrapped status error",
RequestMetaHeader: RequestMetaHeader{TTL: SingleForwardingTTL},
handler: func(_ uint32) error {
err := status.Error(codes.NotFound, "not found")
err = errors.Wrap(err, "some error context")
err = errors.Wrap(err, "another error context")
return err
},
},
} }
for i := range tests { for i := range tests {