diff options
author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2018-01-19 00:30:25 +0300 |
---|---|---|
committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2018-01-19 00:30:25 +0300 |
commit | 5680860e39e2f04fe3373bfe96fc6d297a4384ff (patch) | |
tree | 342bcacb97ceda981f1e381ec11ede8f67a04a5b | |
parent | 067aa41bdcf8e54725928e95688a34add2bf9501 (diff) |
Fix gRPC update snafu
-rw-r--r-- | internal/service/repository/create_bundle.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/service/repository/create_bundle.go b/internal/service/repository/create_bundle.go index 6832b4600..83ea5e7a2 100644 --- a/internal/service/repository/create_bundle.go +++ b/internal/service/repository/create_bundle.go @@ -8,21 +8,21 @@ import ( pb "gitlab.com/gitlab-org/gitaly-proto/go" - "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) func (s *server) CreateBundle(req *pb.CreateBundleRequest, stream pb.RepositoryService_CreateBundleServer) error { repo := req.GetRepository() if repo == nil { - return grpc.Errorf(codes.InvalidArgument, "CreateBundle: empty Repository") + return status.Errorf(codes.InvalidArgument, "CreateBundle: empty Repository") } ctx := stream.Context() cmd, err := git.Command(ctx, repo, "bundle", "create", "-", "--all") if err != nil { - return grpc.Errorf(codes.Internal, "CreateBundle: cmd start failed: %v", err) + return status.Errorf(codes.Internal, "CreateBundle: cmd start failed: %v", err) } writer := streamio.NewWriter(func(p []byte) error { @@ -31,11 +31,11 @@ func (s *server) CreateBundle(req *pb.CreateBundleRequest, stream pb.RepositoryS _, err = io.Copy(writer, cmd) if err != nil { - return grpc.Errorf(codes.Internal, "CreateBundle: stream writer failed: %v", err) + return status.Errorf(codes.Internal, "CreateBundle: stream writer failed: %v", err) } if err := cmd.Wait(); err != nil { - return grpc.Errorf(codes.Internal, "CreateBundle: cmd wait failed: %v", err) + return status.Errorf(codes.Internal, "CreateBundle: cmd wait failed: %v", err) } return nil |