From 51a9de8079dea8b42de6406023e6185ff5604694 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 7 Mar 2022 11:26:59 +0000 Subject: [PATCH] runtime: Fix bad merge Fix missing brace from bad merge Signed-off-by: stevenhorsman --- src/runtime/virtcontainers/kata_agent.go | 1 + src/runtime/virtcontainers/pkg/mock/mock.go | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/runtime/virtcontainers/kata_agent.go b/src/runtime/virtcontainers/kata_agent.go index cd17cd2f11..f3edfa286a 100644 --- a/src/runtime/virtcontainers/kata_agent.go +++ b/src/runtime/virtcontainers/kata_agent.go @@ -2204,6 +2204,7 @@ func (k *kataAgent) getGuestVolumeStats(ctx context.Context, volumeGuestPath str func (k *kataAgent) resizeGuestVolume(ctx context.Context, volumeGuestPath string, size uint64) error { _, err := k.sendReq(ctx, &grpc.ResizeVolumeRequest{VolumeGuestPath: volumeGuestPath, Size_: size}) return err +} func (k *kataAgent) PullImage(ctx context.Context, req *image.PullImageReq) (*image.PullImageResp, error) { r := &grpc.PullImageRequest{ diff --git a/src/runtime/virtcontainers/pkg/mock/mock.go b/src/runtime/virtcontainers/pkg/mock/mock.go index 8f75ddfd63..919f2e8a5c 100644 --- a/src/runtime/virtcontainers/pkg/mock/mock.go +++ b/src/runtime/virtcontainers/pkg/mock/mock.go @@ -12,12 +12,13 @@ import ( "net/url" "os" + "path" + "strings" + "github.com/containerd/ttrpc" gpb "github.com/gogo/protobuf/types" aTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols" pb "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc" - "path" - "strings" ) const VSockPrefix = "mock://" @@ -240,6 +241,6 @@ func (p *HybridVSockTTRPCMockImp) ResizeVolume(ctx context.Context, req *pb.Resi return &gpb.Empty{}, nil } -func (p *HybridVSockTTRPCMockImp) PullImage(ctx context.Context, req *pb.PullImageRequest) (*gpb.Empty +func (p *HybridVSockTTRPCMockImp) PullImage(ctx context.Context, req *pb.PullImageRequest) (*gpb.Empty, error) { return &gpb.Empty{}, nil }