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

fix List call - token should be on 3. position (#1212)

Browse Source
This commit is contained in:
marpio
2019-05-09 02:56:29 +02:00
committed by Aaron Schlesinger
parent 0cac0edbf1
commit b2bcdce18c
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/minio/cataloger.go
+4 -9
View File
@@ -17,14 +17,10 @@ func (s *storageImpl) Catalog(ctx context.Context, token string, pageSize int) (
const op errors.Op = "minio.Catalog" const op errors.Op = "minio.Catalog"
ctx, span := observ.StartSpan(ctx, op.String()) ctx, span := observ.StartSpan(ctx, op.String())
defer span.End() defer span.End()
queryToken := token
res := make([]paths.AllPathParams, 0) res := make([]paths.AllPathParams, 0)
startAfter := token
token = ""
count := pageSize count := pageSize
for count > 0 { for count > 0 {
loo, err := s.minioCore.ListObjectsV2(s.bucketName, token, "", false, "", 0, startAfter) loo, err := s.minioCore.ListObjectsV2(s.bucketName, "", token, false, "", 0, "")
if err != nil { if err != nil {
return nil, "", errors.E(op, err) return nil, "", errors.E(op, err)
} }
@@ -33,17 +29,16 @@ func (s *storageImpl) Catalog(ctx context.Context, token string, pageSize int) (
res = append(res, m...) res = append(res, m...)
count -= len(m) count -= len(m)
queryToken = lastKey token = lastKey
if !loo.IsTruncated { // not truncated, there is no point in asking more if !loo.IsTruncated { // not truncated, there is no point in asking more
if count > 0 { // it means we reached the end, no subsequent requests are necessary if count > 0 { // it means we reached the end, no subsequent requests are necessary
queryToken = "" token = ""
} }
break break
} }
} }
return res, queryToken, nil return res, token, nil
} }
func fetchModsAndVersions(objects []minio.ObjectInfo, elementsNum int) ([]paths.AllPathParams, string) { func fetchModsAndVersions(objects []minio.ObjectInfo, elementsNum int) ([]paths.AllPathParams, string) {