Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: presign url using blob storage #82

Merged
merged 11 commits into from
Jan 25, 2024
Merged

feat: presign url using blob storage #82

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d856ee0
feat: presign url using blob storage
bestmike007 Jan 15, 2024
c48eb63
chore: fix test
bestmike007 Jan 15, 2024
b8a3b02
Update internal/storage/blobstorage/gcs/blob_storage.go
bestmike007 Jan 23, 2024
a748241
Merge branch 'coinbase:master' into feat/presign-url-in-blob-storage
bestmike007 Jan 23, 2024
e6b7b24
chore: quick fix import
bestmike007 Jan 23, 2024
42d8826
chore: avoid grpc error in storage layer
bestmike007 Jan 23, 2024
d2ea75a
chore: make presigned_url_expiration required
bestmike007 Jan 23, 2024
b3faa94
chore: add presigned_url_expiration default value for gcp config
bestmike007 Jan 23, 2024
821aa21
chore: revert logging
bestmike007 Jan 23, 2024
ec9d91c
Merge branch 'coinbase:master' into feat/presign-url-in-blob-storage
bestmike007 Jan 25, 2024
c0a8298
chore: fix error logging
bestmike007 Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/server/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is a logging interceptor taking care of the logs

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

return nil, status.Errorf(codes.Internal, "internal block file url generation error: %+v", err)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all errors are by default mapped to internal by the error interceptor. no need to repeat it here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

}

return &api.BlockFile{
Expand Down
5 changes: 1 addition & 4 deletions internal/storage/blobstorage/gcs/blob_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
5 changes: 1 addition & 4 deletions internal/storage/blobstorage/s3/blob_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down