Skip to content

Commit 168dd97

Browse files
committed
S3 ReadFiles was missing URL path
Signed-off-by: Avi Deitcher <avi@deitcher.net>
1 parent e81302b commit 168dd97

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

pkg/storage/s3/s3.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"net/url"
88
"os"
99
"path"
10+
"path/filepath"
1011
"strings"
1112
"time"
1213

@@ -150,7 +151,9 @@ func (s *S3) ReadDir(ctx context.Context, dirname string, logger *log.Entry) ([]
150151
}
151152

152153
// Call ListObjectsV2 with your bucket and prefix
153-
result, err := client.ListObjectsV2(context.TODO(), &s3.ListObjectsV2Input{Bucket: aws.String(s.url.Hostname()), Prefix: aws.String(dirname)})
154+
// ensure that there is no leading /
155+
p := strings.TrimPrefix(filepath.Join(s.url.Path, dirname), "/")
156+
result, err := client.ListObjectsV2(context.TODO(), &s3.ListObjectsV2Input{Bucket: aws.String(s.url.Hostname()), Prefix: aws.String(filepath.Join(p, dirname))})
154157
if err != nil {
155158
return nil, fmt.Errorf("failed to list objects, %v", err)
156159
}

0 commit comments

Comments
 (0)