primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 12:10:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg/storage: ensure mongo returns KindNotFound (#558)

Browse Source
This commit is contained in:
Marwan Sulaiman
2018-08-24 02:13:09 -04:00
committed by GitHub
parent 76121fb5cb
commit fc581c3784
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/mongo/getter.go
+14 -8
View File
@@ -3,8 +3,8 @@ package mongo
import (
"context"
"io"
"strings"
"github.com/globalsign/mgo"
"github.com/globalsign/mgo/bson"
"github.com/gomods/athens/pkg/errors"
"github.com/gomods/athens/pkg/storage"
@@ -20,10 +20,11 @@ func (s *ModuleStore) Info(ctx context.Context, module, vsn string) ([]byte, err
result := &storage.Module{}
err := c.Find(bson.M{"module": module, "version": vsn}).One(result)
if err != nil {
if strings.Contains(err.Error(), "not found") {
err = errors.E(op, errors.M(module), errors.V(vsn), errors.KindNotFound)
kind := errors.KindUnexpected
if err == mgo.ErrNotFound {
kind = errors.KindNotFound
}
return nil, err
return nil, errors.E(op, kind, errors.M(module), errors.V(vsn), err)
}
return result.Info, nil
@@ -38,10 +39,11 @@ func (s *ModuleStore) GoMod(ctx context.Context, module, vsn string) ([]byte, er
result := &storage.Module{}
err := c.Find(bson.M{"module": module, "version": vsn}).One(result)
if err != nil {
if strings.Contains(err.Error(), "not found") {
err = errors.E(op, errors.M(module), errors.V(vsn), errors.KindNotFound)
kind := errors.KindUnexpected
if err == mgo.ErrNotFound {
kind = errors.KindNotFound
}
return nil, err
return nil, errors.E(op, kind, errors.M(module), errors.V(vsn), err)
}
return result.Mod, nil
@@ -57,7 +59,11 @@ func (s *ModuleStore) Zip(ctx context.Context, module, vsn string) (io.ReadClose
fs := s.s.DB(s.d).GridFS("fs")
f, err := fs.Open(zipName)
if err != nil {
return nil, errors.E(op, err)
kind := errors.KindUnexpected
if err == mgo.ErrNotFound {
kind = errors.KindNotFound
}
return nil, errors.E(op, err, kind)
}
return f, nil
pkg/storage/mongo/lister.go
+5 -4
View File
@@ -2,8 +2,8 @@ package mongo
import (
"context"
"strings"
"github.com/globalsign/mgo"
"github.com/globalsign/mgo/bson"
"github.com/gomods/athens/pkg/errors"
"github.com/gomods/athens/pkg/storage"
@@ -19,10 +19,11 @@ func (s *ModuleStore) List(ctx context.Context, module string) ([]string, error)
result := make([]storage.Module, 0)
err := c.Find(bson.M{"module": module}).All(&result)
if err != nil {
if strings.Contains(err.Error(), "not found") {
err = errors.E(op, err, errors.M(module), errors.KindNotFound)
kind := errors.KindUnexpected
if err == mgo.ErrNotFound {
kind = errors.KindNotFound
}
return nil, err
return nil, errors.E(op, kind, errors.M(module), err)
}
versions := make([]string, len(result))