blob: Enhance returned error messages

In some cases error returned by RPC methods are prefixed with
its names. This is redundant as the caller knows exactly what
method is called and also the log entry always contains full
method name including service name. Instead, the prefixes for
errors in some cases were added to better describe what operation
failed. It should help to better navigate to the reason of the
error.

4 files changed, 18 insertions, 18 deletions

diff --git a/internal/gitaly/service/blob/blobs.go b/internal/gitaly/service/blob/blobs.go
index 73cef0866..64c5f8e62 100644
--- a/internal/gitaly/service/blob/blobs.go
+++ b/internal/gitaly/service/blob/blobs.go
@@ -142,7 +142,7 @@ func (s *server) processBlobs(
 
 		catfileObjectIter, err := gitpipe.CatfileObject(ctx, objectReader, objectIter)
 		if err != nil {
-			return helper.ErrInternalf("creating catfile object iterator: %w", err)
+			return helper.ErrInternalf("creating object iterator: %w", err)
 		}
 
 		var i uint32
diff --git a/internal/gitaly/service/blob/get_blob.go b/internal/gitaly/service/blob/get_blob.go
index 8b4046fe0..4b7f00eb3 100644
--- a/internal/gitaly/service/blob/get_blob.go
+++ b/internal/gitaly/service/blob/get_blob.go
@@ -23,7 +23,7 @@ func (s *server) GetBlob(in *gitalypb.GetBlobRequest, stream gitalypb.BlobServic
 
 	objectReader, cancel, err := s.catfileCache.ObjectReader(stream.Context(), repo)
 	if err != nil {
-		return helper.ErrInternalf("GetBlob: %v", err)
+		return helper.ErrInternalf("create object reader: %v", err)
 	}
 	defer cancel()
 
@@ -32,7 +32,7 @@ func (s *server) GetBlob(in *gitalypb.GetBlobRequest, stream gitalypb.BlobServic
 		if catfile.IsNotFound(err) {
 			return helper.ErrUnavailable(stream.Send(&gitalypb.GetBlobResponse{}))
 		}
-		return helper.ErrInternalf("GetBlob: %v", err)
+		return helper.ErrInternalf("read object: %v", err)
 	}
 
 	if blob.Type != "blob" {
@@ -64,7 +64,7 @@ func (s *server) GetBlob(in *gitalypb.GetBlobRequest, stream gitalypb.BlobServic
 
 	_, err = io.CopyN(sw, blob, readLimit)
 	if err != nil {
-		return helper.ErrUnavailablef("GetBlob: send: %v", err)
+		return helper.ErrUnavailablef("send: %v", err)
 	}
 
 	return nil
diff --git a/internal/gitaly/service/blob/get_blobs.go b/internal/gitaly/service/blob/get_blobs.go
index 0417d504e..694209fa5 100644
--- a/internal/gitaly/service/blob/get_blobs.go
+++ b/internal/gitaly/service/blob/get_blobs.go
@@ -40,14 +40,14 @@ func sendGetBlobsResponse(
 
 		treeEntry, err := tef.FindByRevisionAndPath(ctx, revision, string(path))
 		if err != nil {
-			return helper.ErrInternal(err)
+			return helper.ErrInternalf("find by revision and path: %v", err)
 		}
 
 		response := &gitalypb.GetBlobsResponse{Revision: revision, Path: path}
 
 		if treeEntry == nil || len(treeEntry.Oid) == 0 {
 			if err := stream.Send(response); err != nil {
-				return helper.ErrUnavailablef("GetBlobs: send: %v", err)
+				return helper.ErrUnavailablef("send: %v", err)
 			}
 
 			continue
@@ -61,7 +61,7 @@ func sendGetBlobsResponse(
 			response.Type = gitalypb.ObjectType_COMMIT
 
 			if err := stream.Send(response); err != nil {
-				return helper.ErrUnavailablef("GetBlobs: send: %v", err)
+				return helper.ErrUnavailablef("send: %v", err)
 			}
 
 			continue
@@ -69,7 +69,7 @@ func sendGetBlobsResponse(
 
 		objectInfo, err := objectInfoReader.Info(ctx, git.Revision(treeEntry.Oid))
 		if err != nil {
-			return helper.ErrInternalf("GetBlobs: %v", err)
+			return helper.ErrInternalf("read object info: %v", err)
 		}
 
 		response.Size = objectInfo.Size
@@ -83,7 +83,7 @@ func sendGetBlobsResponse(
 
 		if response.Type != gitalypb.ObjectType_BLOB {
 			if err := stream.Send(response); err != nil {
-				return helper.ErrUnavailablef("GetBlobs: send: %v", err)
+				return helper.ErrUnavailablef("send: %v", err)
 			}
 			continue
 		}
@@ -116,18 +116,18 @@ func sendBlobTreeEntry(
 	// blobObj.
 	if readLimit == 0 {
 		if err := stream.Send(response); err != nil {
-			return helper.ErrUnavailablef("GetBlobs: send: %v", err)
+			return helper.ErrUnavailablef("send: %v", err)
 		}
 		return nil
 	}
 
 	blobObj, err := objectReader.Object(ctx, git.Revision(response.Oid))
 	if err != nil {
-		return helper.ErrInternalf("GetBlobs: %v", err)
+		return helper.ErrInternalf("read object: %v", err)
 	}
 	defer func() {
 		if _, err := io.Copy(io.Discard, blobObj); err != nil && returnedErr == nil {
-			returnedErr = helper.ErrInternalf("GetBlobs: discarding data: %v", err)
+			returnedErr = helper.ErrInternalf("discarding data: %v", err)
 		}
 	}()
 	if blobObj.Type != "blob" {
@@ -148,7 +148,7 @@ func sendBlobTreeEntry(
 
 	_, err = io.CopyN(sw, blobObj, readLimit)
 	if err != nil {
-		return helper.ErrUnavailablef("GetBlobs: send: %v", err)
+		return helper.ErrUnavailablef("send: %v", err)
 	}
 
 	return nil
@@ -163,13 +163,13 @@ func (s *server) GetBlobs(req *gitalypb.GetBlobsRequest, stream gitalypb.BlobSer
 
 	objectReader, cancel, err := s.catfileCache.ObjectReader(stream.Context(), repo)
 	if err != nil {
-		return helper.ErrInternal(err)
+		return helper.ErrInternal(fmt.Errorf("creating object reader: %w", err))
 	}
 	defer cancel()
 
 	objectInfoReader, cancel, err := s.catfileCache.ObjectInfoReader(stream.Context(), repo)
 	if err != nil {
-		return helper.ErrInternal(err)
+		return helper.ErrInternal(fmt.Errorf("creating object info reader: %w", err))
 	}
 	defer cancel()
 
@@ -182,12 +182,12 @@ func validateGetBlobsRequest(req *gitalypb.GetBlobsRequest) error {
 	}
 
 	if len(req.RevisionPaths) == 0 {
-		return errors.New("GetBlobs: empty RevisionPaths")
+		return errors.New("empty RevisionPaths")
 	}
 
 	for _, rp := range req.RevisionPaths {
 		if err := git.ValidateRevision([]byte(rp.Revision)); err != nil {
-			return fmt.Errorf("GetBlobs: %v", err)
+			return err
 		}
 	}
 
diff --git a/internal/gitaly/service/blob/lfs_pointers.go b/internal/gitaly/service/blob/lfs_pointers.go
index 28c231fa0..88b7870ec 100644
--- a/internal/gitaly/service/blob/lfs_pointers.go
+++ b/internal/gitaly/service/blob/lfs_pointers.go
@@ -95,7 +95,7 @@ func (s *server) ListAllLFSPointers(in *gitalypb.ListAllLFSPointersRequest, stre
 
 	objectReader, cancel, err := s.catfileCache.ObjectReader(ctx, repo)
 	if err != nil {
-		return helper.ErrInternal(fmt.Errorf("creating object reader: %w", err))
+		return helper.ErrInternalf("creating object reader: %w", err)
 	}
 	defer cancel()