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

Jump to bottom

Wrap manager errors #171

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Wrap manager errors #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 21 additions & 16 deletions manager/presenter/grpc/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func New(svc service.Manager) ManageServerInterface {
func (h *handlers) CreateContainer(ctx context.Context, in *v1.CreateContainerRequest) (*v1.CreateContainerResponse, error) {
err := h.svc.CreateContainer(ctx, in.GetName())
if err != nil {
return nil, err
return nil, mapServiceError(err)
}

return &v1.CreateContainerResponse{}, nil
Expand All @@ -44,7 +44,7 @@ func (h *handlers) CreateContainer(ctx context.Context, in *v1.CreateContainerRe
func (h *handlers) RenameContainer(ctx context.Context, in *v1.RenameContainerRequest) (*v1.RenameContainerResponse, error) {
err := h.svc.RenameContainer(ctx, in.GetOldName(), in.GetNewName())
if err != nil {
return nil, err
return nil, mapServiceError(err)
}

return &v1.RenameContainerResponse{}, nil
Expand All @@ -53,7 +53,7 @@ func (h *handlers) RenameContainer(ctx context.Context, in *v1.RenameContainerRe
func (h *handlers) DeleteContainer(ctx context.Context, in *v1.DeleteContainerRequest) (*v1.DeleteContainerResponse, error) {
err := h.svc.DeleteContainer(ctx, in.GetName())
if err != nil {
return nil, err
return nil, mapServiceError(err)
}

return &v1.DeleteContainerResponse{}, nil
Expand All @@ -62,7 +62,7 @@ func (h *handlers) DeleteContainer(ctx context.Context, in *v1.DeleteContainerRe
func (h *handlers) ListContainers(ctx context.Context, _ *v1.ListContainersRequest) (*v1.ListContainersResponse, error) {
containers, err := h.svc.ListContainers(ctx)
if err != nil {
return nil, err
return nil, mapServiceError(err)
}

return &v1.ListContainersResponse{
Expand All @@ -73,7 +73,7 @@ func (h *handlers) ListContainers(ctx context.Context, _ *v1.ListContainersReque
func (h *handlers) CreateVersion(ctx context.Context, in *v1.CreateVersionRequest) (*v1.CreateVersionResponse, error) {
version, err := h.svc.CreateVersion(ctx, in.GetContainer())
if err != nil {
return nil, err
return nil, mapServiceError(err)
}

return &v1.CreateVersionResponse{
Expand All @@ -84,10 +84,7 @@ func (h *handlers) CreateVersion(ctx context.Context, in *v1.CreateVersionReques
func (h *handlers) ListVersions(ctx context.Context, in *v1.ListVersionsRequest) (*v1.ListVersionsResponse, error) {
versions, err := h.svc.ListAllVersions(ctx, in.GetContainer())
if err != nil {
if err == service.ErrNotFound {
return nil, status.Error(codes.NotFound, err.Error())
}
return nil, err
return nil, mapServiceError(err)
}

versionNames := []string{}
Expand All @@ -103,7 +100,7 @@ func (h *handlers) ListVersions(ctx context.Context, in *v1.ListVersionsRequest)
func (h *handlers) DeleteVersion(ctx context.Context, in *v1.DeleteVersionRequest) (*v1.DeleteVersionResponse, error) {
err := h.svc.DeleteVersion(ctx, in.GetContainer(), in.GetVersion())
if err != nil {
return nil, err
return nil, mapServiceError(err)
}

return &v1.DeleteVersionResponse{}, nil
Expand All @@ -112,7 +109,7 @@ func (h *handlers) DeleteVersion(ctx context.Context, in *v1.DeleteVersionReques
func (h *handlers) PublishVersion(ctx context.Context, in *v1.PublishVersionRequest) (*v1.PublishVersionResponse, error) {
err := h.svc.PublishVersion(ctx, in.GetContainer(), in.GetVersion())
if err != nil {
return nil, err
return nil, mapServiceError(err)
}

return &v1.PublishVersionResponse{}, nil
Expand All @@ -121,12 +118,12 @@ func (h *handlers) PublishVersion(ctx context.Context, in *v1.PublishVersionRequ
func (h *handlers) CreateObject(ctx context.Context, in *v1.CreateObjectRequest) (*v1.CreateObjectResponse, error) {
url, err := h.svc.EnsureBLOBPresenceOrGetUploadURL(ctx, in.GetChecksum(), in.GetSize())
if err != nil && url == "" {
return nil, err
return nil, mapServiceError(err)
}

err = h.svc.AddObject(ctx, in.GetContainer(), in.GetVersion(), in.GetKey(), in.GetChecksum())
if err != nil {
return nil, err
return nil, mapServiceError(err)
}

return &v1.CreateObjectResponse{
Expand All @@ -140,7 +137,7 @@ func (h *handlers) ListObjects(ctx context.Context, in *v1.ListObjectsRequest) (
if err == service.ErrNotFound {
return nil, status.Error(codes.NotFound, err.Error())
}
return nil, err
return nil, mapServiceError(err)
}

return &v1.ListObjectsResponse{
Expand All @@ -154,7 +151,7 @@ func (h *handlers) GetObjectURL(ctx context.Context, in *v1.GetObjectURLRequest)
if err == service.ErrNotFound {
return nil, status.Error(codes.NotFound, err.Error())
}
return nil, err
return nil, mapServiceError(err)
}

return &v1.GetObjectURLResponse{
Expand All @@ -165,7 +162,7 @@ func (h *handlers) GetObjectURL(ctx context.Context, in *v1.GetObjectURLRequest)
func (h *handlers) DeleteObject(ctx context.Context, in *v1.DeleteObjectRequest) (*v1.DeleteObjectResponse, error) {
err := h.svc.DeleteObject(ctx, in.GetContainer(), in.GetVersion(), in.GetKey())
if err != nil {
return nil, err
return nil, mapServiceError(err)
}

return &v1.DeleteObjectResponse{}, nil
Expand All @@ -174,3 +171,11 @@ func (h *handlers) DeleteObject(ctx context.Context, in *v1.DeleteObjectRequest)
func (h *handlers) Register(gs *grpc.Server) {
v1.RegisterManageServiceServer(gs, h)
}

func mapServiceError(err error) error {
switch err {
case service.ErrNotFound:
return status.Error(codes.NotFound, err.Error())
}
return status.Error(codes.Internal, err.Error())
}
130 changes: 130 additions & 0 deletions manager/presenter/grpc/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ func (s *manageHandlersTestSuite) TestCreateContainer() {
s.Require().NoError(err)
}

func (s *manageHandlersTestSuite) TestCreateContainerNotFound() {
s.svcMock.On("CreateContainer", "test-container").Return(service.ErrNotFound).Once()

_, err := s.client.CreateContainer(s.ctx, &v1pb.CreateContainerRequest{
Name: "test-container",
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestRenameContainer() {
s.svcMock.On("RenameContainer", "old-name", "new-name").Return(nil).Once()

Expand All @@ -32,6 +42,17 @@ func (s *manageHandlersTestSuite) TestRenameContainer() {
s.Require().NoError(err)
}

func (s *manageHandlersTestSuite) TestRenameContainerNotFound() {
s.svcMock.On("RenameContainer", "old-name", "new-name").Return(service.ErrNotFound).Once()

_, err := s.client.RenameContainer(s.ctx, &v1pb.RenameContainerRequest{
OldName: "old-name",
NewName: "new-name",
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestListContainers() {
s.svcMock.On("ListContainers").Return([]string{"test-container1", "test-container2"}, nil).Once()

Expand All @@ -42,6 +63,14 @@ func (s *manageHandlersTestSuite) TestListContainers() {
}, resp.GetName())
}

func (s *manageHandlersTestSuite) TestListContainersNotFound() {
s.svcMock.On("ListContainers").Return([]string{}, service.ErrNotFound).Once()

_, err := s.client.ListContainers(s.ctx, &v1pb.ListContainersRequest{})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestCreateVersion() {
s.svcMock.On("CreateVersion", "test-container").Return("20240102030405", nil).Once()

Expand All @@ -52,6 +81,16 @@ func (s *manageHandlersTestSuite) TestCreateVersion() {
s.Require().Equal("20240102030405", resp.GetVersion())
}

func (s *manageHandlersTestSuite) TestCreateVersionNotFound() {
s.svcMock.On("CreateVersion", "test-container").Return("", service.ErrNotFound).Once()

_, err := s.client.CreateVersion(s.ctx, &v1pb.CreateVersionRequest{
Container: "test-container",
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestDeleteContainer() {
s.svcMock.On("DeleteContainer", "test-container").Return(nil).Once()

Expand All @@ -61,6 +100,16 @@ func (s *manageHandlersTestSuite) TestDeleteContainer() {
s.Require().NoError(err)
}

func (s *manageHandlersTestSuite) TestDeleteContainerNotFound() {
s.svcMock.On("DeleteContainer", "test-container").Return(service.ErrNotFound).Once()

_, err := s.client.DeleteContainer(s.ctx, &v1pb.DeleteContainerRequest{
Name: "test-container",
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestListVersions() {
s.svcMock.On("ListAllVersions", "test-container").Return([]models.Version{
{
Expand All @@ -80,6 +129,16 @@ func (s *manageHandlersTestSuite) TestListVersions() {
}, resp.GetVersions())
}

func (s *manageHandlersTestSuite) TestListVersionsNotFound() {
s.svcMock.On("ListAllVersions", "test-container").Return([]models.Version{}, service.ErrNotFound).Once()

_, err := s.client.ListVersions(s.ctx, &v1pb.ListVersionsRequest{
Container: "test-container",
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestDeleteVersion() {
s.svcMock.On("DeleteVersion", "test-container", "test-version").Return(nil).Once()

Expand All @@ -90,6 +149,17 @@ func (s *manageHandlersTestSuite) TestDeleteVersion() {
s.Require().NoError(err)
}

func (s *manageHandlersTestSuite) TestDeleteVersionNotFound() {
s.svcMock.On("DeleteVersion", "test-container", "test-version").Return(service.ErrNotFound).Once()

_, err := s.client.DeleteVersion(s.ctx, &v1pb.DeleteVersionRequest{
Container: "test-container",
Version: "test-version",
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestPublishVersion() {
s.svcMock.On("PublishVersion", "test-container", "20240102030405").Return(nil).Once()

Expand All @@ -100,6 +170,17 @@ func (s *manageHandlersTestSuite) TestPublishVersion() {
s.Require().NoError(err)
}

func (s *manageHandlersTestSuite) TestPublishVersionNotFound() {
s.svcMock.On("PublishVersion", "test-container", "20240102030405").Return(service.ErrNotFound).Once()

_, err := s.client.PublishVersion(s.ctx, &v1pb.PublishVersionRequest{
Container: "test-container",
Version: "20240102030405",
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestCreateObject() {
s.svcMock.On("EnsureBLOBPresenceOrGetUploadURL", "checksum", int64(1234)).Return("https://example.com/url", nil).Once()
s.svcMock.On("AddObject", "test-container", "version", "key", "checksum").Return(nil).Once()
Expand All @@ -115,6 +196,20 @@ func (s *manageHandlersTestSuite) TestCreateObject() {
s.Require().Equal("https://example.com/url", resp.GetUploadUrl())
}

func (s *manageHandlersTestSuite) TestCreateObjectNotFound() {
s.svcMock.On("EnsureBLOBPresenceOrGetUploadURL", "checksum", int64(1234)).Return("", service.ErrNotFound).Once()

_, err := s.client.CreateObject(s.ctx, &v1pb.CreateObjectRequest{
Container: "test-container",
Version: "version",
Key: "key",
Checksum: "checksum",
Size: 1234,
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestListObjects() {
s.svcMock.On("ListObjects", "container", "version").Return([]string{"obj1", "obj2", "obj3"}, nil).Once()

Expand All @@ -128,6 +223,17 @@ func (s *manageHandlersTestSuite) TestListObjects() {
}, resp.GetObjects())
}

func (s *manageHandlersTestSuite) TestListObjectsNotFound() {
s.svcMock.On("ListObjects", "container", "version").Return([]string{}, service.ErrNotFound).Once()

_, err := s.client.ListObjects(s.ctx, &v1pb.ListObjectsRequest{
Container: "container",
Version: "version",
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestGetObjectURL() {
s.svcMock.On("GetObjectURL", "test-container", "test-version", "test-key").Return("test-url", nil).Once()

Expand All @@ -140,6 +246,18 @@ func (s *manageHandlersTestSuite) TestGetObjectURL() {
s.Require().Equal("test-url", resp.GetUrl())
}

func (s *manageHandlersTestSuite) TestGetObjectURLNotFound() {
s.svcMock.On("GetObjectURL", "test-container", "test-version", "test-key").Return("test-url", service.ErrNotFound).Once()

_, err := s.client.GetObjectURL(s.ctx, &v1pb.GetObjectURLRequest{
Container: "test-container",
Version: "test-version",
Key: "test-key",
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

func (s *manageHandlersTestSuite) TestDeleteObject() {
s.svcMock.On("DeleteObject", "test-container", "test-version", "test-key").Return(nil).Once()

Expand All @@ -151,6 +269,18 @@ func (s *manageHandlersTestSuite) TestDeleteObject() {
s.Require().NoError(err)
}

func (s *manageHandlersTestSuite) TestDeleteObjectNotFound() {
s.svcMock.On("DeleteObject", "test-container", "test-version", "test-key").Return(service.ErrNotFound).Once()

_, err := s.client.DeleteObject(s.ctx, &v1pb.DeleteObjectRequest{
Container: "test-container",
Version: "test-version",
Key: "test-key",
})
s.Require().Error(err)
s.Require().Equal("rpc error: code = NotFound desc = entity not found", err.Error())
}

// Definitions ...
type manageHandlersTestSuite struct {
suite.Suite
Expand Down
5 changes: 4 additions & 1 deletion repositories/metadata/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ import (
"github.com/teran/archived/models"
)

var ErrNotFound = errors.New("not found")
var (
ErrNotFound = errors.New("not found")
ErrConflict = errors.New("entity with given identifier already exists")
)

type Repository interface {
CreateContainer(ctx context.Context, name string) error
Expand Down
3 changes: 1 addition & 2 deletions repositories/metadata/postgresql/blobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"

sq "github.com/Masterminds/squirrel"
"github.com/pkg/errors"
)

func (r *repository) CreateBLOB(ctx context.Context, checksum string, size uint64, mimeType string) error {
Expand Down Expand Up @@ -60,7 +59,7 @@ func (r *repository) EnsureBlobKey(ctx context.Context, key string, size uint64)
"size": size,
}))
if err != nil {
return errors.Wrap(err, "error selecting BLOB")
return mapSQLErrors(err)
}

var blobID uint
Expand Down
4 changes: 4 additions & 0 deletions repositories/metadata/postgresql/blobs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ func (s *postgreSQLRepositoryTestSuite) TestBlobs() {
err := s.repo.CreateContainer(s.ctx, containerName)
s.Require().NoError(err)

_, err = s.repo.CreateVersion(s.ctx, "not-existent")
s.Require().Error(err)
s.Require().Equal(metadata.ErrNotFound, err)

versionID, err := s.repo.CreateVersion(s.ctx, containerName)
s.Require().NoError(err)

Expand Down
Loading
Loading