From 97962976a4cd8a292a4340ad73fcccedf1f8b39f Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Wed, 28 Aug 2019 14:00:13 -0400 Subject: [PATCH] Update ttrpc to 92c8520ef9f86600c650dd540266a00 Signed-off-by: Michael Crosby --- vendor.conf | 2 +- vendor/github.com/containerd/ttrpc/client.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor.conf b/vendor.conf index fab4b6201..49b9f71f5 100644 --- a/vendor.conf +++ b/vendor.conf @@ -37,7 +37,7 @@ github.com/Microsoft/go-winio v0.4.14 github.com/Microsoft/hcsshim 9e921883ac929bbe515b39793ece99ce3a9d7706 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944 golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4 -github.com/containerd/ttrpc 9abb3e268010ea188f4e4051f77eb5aca49315fb +github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2 gotest.tools v2.3.0 github.com/google/go-cmp v0.2.0 diff --git a/vendor/github.com/containerd/ttrpc/client.go b/vendor/github.com/containerd/ttrpc/client.go index bdc01b5b0..bdd1d12e7 100644 --- a/vendor/github.com/containerd/ttrpc/client.go +++ b/vendor/github.com/containerd/ttrpc/client.go @@ -29,6 +29,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/pkg/errors" "github.com/sirupsen/logrus" + "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -134,10 +135,9 @@ func (c *Client) Call(ctx context.Context, service, method string, req, resp int return err } - if cresp.Status != nil { + if cresp.Status != nil && cresp.Status.Code != int32(codes.OK) { return status.ErrorProto(cresp.Status) } - return nil }