Skip to content

Commit 7c18133

Browse files
dmcgowank8s-infra-cherrypick-robot
authored andcommitted
Decode grpc errors in the transfer client proxy
Signed-off-by: Derek McGowan <[email protected]>
1 parent 64ed272 commit 7c18133

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

core/transfer/proxy/transfer.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,17 @@ import (
2828

2929
transferapi "github.com/containerd/containerd/api/services/transfer/v1"
3030
transfertypes "github.com/containerd/containerd/api/types/transfer"
31-
"github.com/containerd/containerd/v2/core/streaming"
32-
"github.com/containerd/containerd/v2/core/transfer"
33-
tstreaming "github.com/containerd/containerd/v2/core/transfer/streaming"
34-
"github.com/containerd/containerd/v2/pkg/oci"
3531
"github.com/containerd/errdefs"
32+
"github.com/containerd/errdefs/pkg/errgrpc"
3633
"github.com/containerd/log"
3734
"github.com/containerd/ttrpc"
3835
"github.com/containerd/typeurl/v2"
3936
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
37+
38+
"github.com/containerd/containerd/v2/core/streaming"
39+
"github.com/containerd/containerd/v2/core/transfer"
40+
tstreaming "github.com/containerd/containerd/v2/core/transfer/streaming"
41+
"github.com/containerd/containerd/v2/pkg/oci"
4042
)
4143

4244
type proxyTransferrer struct {
@@ -150,7 +152,7 @@ func (p *proxyTransferrer) Transfer(ctx context.Context, src interface{}, dst in
150152
Options: apiOpts,
151153
}
152154
_, err = p.client.Transfer(ctx, req)
153-
return err
155+
return errgrpc.ToNative(err)
154156
}
155157
func (p *proxyTransferrer) marshalAny(ctx context.Context, i interface{}) (typeurl.Any, error) {
156158
switch m := i.(type) {

0 commit comments

Comments
 (0)