sendnrw/pocket-id
2
0
Fork 0
mirror of https://github.com/pocket-id/pocket-id.git synced 2026-04-11 09:06:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(storage): strip Root prefix from S3 List() returned paths (#1413)

Browse Source
This commit is contained in:
Vlad Mocanu
2026-04-08 22:01:34 +03:00
committed by GitHub
parent 2b94535ade
commit 626adbf14c
2 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/internal/storage/s3.go
View File

@@ -138,7 +138,7 @@ func (s *s3Storage) List(ctx context.Context, path string) ([]ObjectInfo, error)
continue
}
objects = append(objects, ObjectInfo{
Path: aws.ToString(obj.Key),
Path: s.pathFromKey(aws.ToString(obj.Key)),
Size: aws.ToInt64(obj.Size),
ModTime: aws.ToTime(obj.LastModified),
})
@@ -147,6 +147,13 @@ func (s *s3Storage) List(ctx context.Context, path string) ([]ObjectInfo, error)
return objects, nil
}
func (s *s3Storage) pathFromKey(key string) string {
if s.prefix == "" {
return key
}
return strings.TrimPrefix(key, s.prefix+"/")
}
func (s *s3Storage) Walk(ctx context.Context, root string, fn func(ObjectInfo) error) error {
objects, err := s.List(ctx, root)
if err != nil {