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

Swith s3 ListObjects api to ListObjectsV2 (#2006)

Browse Source 
Switch the ListObjects API used in s3 storage to ListObjectsV2
This commit is contained in:
yatesliang
2024-11-25 19:08:21 -08:00
committed by GitHub
parent bf38a47902
commit 8f0ee5e52f
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/s3/cataloger.go
+4 -4
View File
@@ -24,12 +24,12 @@ func (s *Storage) Catalog(ctx context.Context, token string, pageSize int) ([]pa
res := make([]paths.AllPathParams, 0) res := make([]paths.AllPathParams, 0)
count := pageSize count := pageSize
for count > 0 { for count > 0 {
lsParams := &s3.ListObjectsInput{ lsParams := &s3.ListObjectsV2Input{
Bucket: aws.String(s.bucket), Bucket: aws.String(s.bucket),
Marker: &queryToken, StartAfter: &queryToken,
} }
loo, err := s.s3API.ListObjects(ctx, lsParams) loo, err := s.s3API.ListObjectsV2(ctx, lsParams)
if err != nil { if err != nil {
return nil, "", errors.E(op, err) return nil, "", errors.E(op, err)
} }
pkg/storage/s3/lister.go
+3 -2
View File
@@ -19,12 +19,13 @@ func (s *Storage) List(ctx context.Context, module string) ([]string, error) {
defer span.End() defer span.End()
modulePrefix := strings.TrimSuffix(module, "/") + "/@v" modulePrefix := strings.TrimSuffix(module, "/") + "/@v"
lsParams := &s3.ListObjectsInput{
lsParams := &s3.ListObjectsV2Input{
Bucket: aws.String(s.bucket), Bucket: aws.String(s.bucket),
Prefix: aws.String(modulePrefix), Prefix: aws.String(modulePrefix),
} }
loo, err := s.s3API.ListObjects(ctx, lsParams) loo, err := s.s3API.ListObjectsV2(ctx, lsParams)
if err != nil { if err != nil {
return nil, errors.E(op, err, errors.M(module)) return nil, errors.E(op, err, errors.M(module))
} }
pkg/storage/s3/s3_test.go
+1 -1
View File
@@ -30,7 +30,7 @@ func (s *Storage) clear() error {
ctx, cancel := context.WithTimeout(context.Background(), s.timeout) ctx, cancel := context.WithTimeout(context.Background(), s.timeout)
defer cancel() defer cancel()
objects, err := s.s3API.ListObjects(ctx, &s3.ListObjectsInput{Bucket: aws.String(s.bucket)}) objects, err := s.s3API.ListObjectsV2(ctx, &s3.ListObjectsV2Input{Bucket: aws.String(s.bucket)})
if err != nil { if err != nil {
return err return err
} }