blob: Replace %v with %w

We should use %w for the error wrapping. That will
allow us to unwrap the error without loosing any context.
It is not use right now, but maybe in the future if we need
to change response based on the returned error in the chain
of interceptors.
And one simplification from fmt.Errorf() to errors.New().

2 files changed, 14 insertions, 14 deletions

diff --git a/internal/gitaly/service/blob/get_blob.go b/internal/gitaly/service/blob/get_blob.go
index 4b7f00eb3..77ad6dfae 100644
--- a/internal/gitaly/service/blob/get_blob.go
+++ b/internal/gitaly/service/blob/get_blob.go
@@ -1,7 +1,7 @@
 package blob
 
 import (
-	"fmt"
+	"errors"
 	"io"
 
 	gitalyerrors "gitlab.com/gitlab-org/gitaly/v15/internal/errors"
@@ -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("create object reader: %v", err)
+		return helper.ErrInternalf("create object reader: %w", 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("read object: %v", err)
+		return helper.ErrInternalf("read object: %w", 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("send: %v", err)
+		return helper.ErrUnavailablef("send: %w", err)
 	}
 
 	return nil
@@ -76,7 +76,7 @@ func validateRequest(in *gitalypb.GetBlobRequest) error {
 	}
 
 	if len(in.GetOid()) == 0 {
-		return fmt.Errorf("empty Oid")
+		return errors.New("empty Oid")
 	}
 	return nil
 }
diff --git a/internal/gitaly/service/blob/get_blobs.go b/internal/gitaly/service/blob/get_blobs.go
index 694209fa5..114fbbfc0 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.ErrInternalf("find by revision and path: %v", err)
+			return helper.ErrInternalf("find by revision and path: %w", 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("send: %v", err)
+				return helper.ErrUnavailablef("send: %w", err)
 			}
 
 			continue
@@ -61,7 +61,7 @@ func sendGetBlobsResponse(
 			response.Type = gitalypb.ObjectType_COMMIT
 
 			if err := stream.Send(response); err != nil {
-				return helper.ErrUnavailablef("send: %v", err)
+				return helper.ErrUnavailablef("send: %w", err)
 			}
 
 			continue
@@ -69,7 +69,7 @@ func sendGetBlobsResponse(
 
 		objectInfo, err := objectInfoReader.Info(ctx, git.Revision(treeEntry.Oid))
 		if err != nil {
-			return helper.ErrInternalf("read object info: %v", err)
+			return helper.ErrInternalf("read object info: %w", 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("send: %v", err)
+				return helper.ErrUnavailablef("send: %w", err)
 			}
 			continue
 		}
@@ -116,18 +116,18 @@ func sendBlobTreeEntry(
 	// blobObj.
 	if readLimit == 0 {
 		if err := stream.Send(response); err != nil {
-			return helper.ErrUnavailablef("send: %v", err)
+			return helper.ErrUnavailablef("send: %w", err)
 		}
 		return nil
 	}
 
 	blobObj, err := objectReader.Object(ctx, git.Revision(response.Oid))
 	if err != nil {
-		return helper.ErrInternalf("read object: %v", err)
+		return helper.ErrInternalf("read object: %w", err)
 	}
 	defer func() {
 		if _, err := io.Copy(io.Discard, blobObj); err != nil && returnedErr == nil {
-			returnedErr = helper.ErrInternalf("discarding data: %v", err)
+			returnedErr = helper.ErrInternalf("discarding data: %w", err)
 		}
 	}()
 	if blobObj.Type != "blob" {
@@ -148,7 +148,7 @@ func sendBlobTreeEntry(
 
 	_, err = io.CopyN(sw, blobObj, readLimit)
 	if err != nil {
-		return helper.ErrUnavailablef("send: %v", err)
+		return helper.ErrUnavailablef("send: %w", err)
 	}
 
 	return nil