chore: avoid grpc error in storage layer

Signed-off-by: bestmike007 <i@bestmike007.com>

Author: bestmike007

internal/server/handler.go

@@ -715,7 +715,8 @@ func (s *Server) newBlockFile(block *api.BlockMetadata) (*api.BlockFile, error)
 	compression := storage_utils.GetCompressionType(key)
 	fileUrl, err := s.blobStorage.PreSign(context.Background(), key)
 	if err != nil {
-		return nil, err
+		s.logger.Error("block file s3 presign error", zap.String("key", key), zap.Error(err))
+		return nil, status.Errorf(codes.Internal, "internal block file url generation error: %+v", err)
 	}
 
 	return &api.BlockFile{

internal/storage/blobstorage/gcs/blob_storage.go

@@ -9,12 +9,10 @@ import (
 	"time"
 
 	"cloud.google.com/go/storage"
-	"github.com/gogo/status"
 	"github.com/uber-go/tally/v4"
 	"go.uber.org/fx"
 	"go.uber.org/zap"
 	"golang.org/x/xerrors"
-	"google.golang.org/grpc/codes"
 	"google.golang.org/protobuf/proto"
 
 	"github.com/coinbase/chainstorage/internal/config"
@@ -239,8 +237,7 @@ func (s *blobStorageImpl) PreSign(ctx context.Context, objectKey string) (string
 		Expires: time.Now().Add(s.presignedUrlExpiration),
 	})
 	if err != nil {
-		s.logger.Error("block file gcs presign error", zap.String("key", objectKey), zap.Error(err))
-		return "", status.Errorf(codes.Internal, "internal block file url generation error: %+v", err)
+		return "", xerrors.Errorf("failed to generate presigned url: %w", err)
 	}
 	return fileUrl, nil
 }

internal/storage/blobstorage/s3/blob_storage.go

@@ -13,12 +13,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws/request"
 	awss3 "github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
-	"github.com/gogo/status"
 	"github.com/uber-go/tally/v4"
 	"go.uber.org/fx"
 	"go.uber.org/zap"
 	"golang.org/x/xerrors"
-	"google.golang.org/grpc/codes"
 	"google.golang.org/protobuf/proto"
 
 	"github.com/coinbase/chainstorage/internal/config"
@@ -228,8 +226,7 @@ func (s *blobStorageImpl) PreSign(ctx context.Context, objectKey string) (string
 	})
 	fileUrl, err := getObjectReq.Presign(s.config.AWS.PresignedUrlExpiration)
 	if err != nil {
-		s.logger.Error("block file s3 presign error", zap.Reflect("key", objectKey), zap.Error(err))
-		return "", status.Errorf(codes.Internal, "internal block file url generation error: %+v", err)
+		return "", xerrors.Errorf("failed to generate presigned url: %w", err)
 	}
 	return fileUrl, nil
 }