Skip to content

fixes path issue when reading dumps from s3 #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fixes path issue when reading dumps from s3 #435

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ac9adb
fixes path issue when reading dumps from s3. fixes https://github.com…
shaunakv1 Apr 30, 2025
7626f46
formtting fix
shaunakv1 May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions pkg/storage/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ func (s *S3) Pull(ctx context.Context, source, target string, logger *log.Entry)

bucket, path := s.url.Hostname(), path.Join(s.url.Path, source)

path = strings.TrimPrefix(path, "/")

// Create a downloader with the session and default options
downloader := manager.NewDownloader(client)

Expand All @@ -86,7 +88,7 @@ func (s *S3) Pull(ctx context.Context, source, target string, logger *log.Entry)
defer func() { _ = f.Close() }()

// Write the contents of S3 Object to the file
n, err := downloader.Download(context.TODO(), f, &s3.GetObjectInput{
n, err := downloader.Download(context.TODO(), f, &s3.GetObjectInput{
Bucket: aws.String(bucket),
Key: aws.String(path),
})
Expand Down Expand Up @@ -194,7 +196,7 @@ func (s *S3) getClient(logger *log.Entry) (*s3.Client, error) {
// Get the AWS config
var configOpts []func(*config.LoadOptions) error // global client options
if logger.Level == log.TraceLevel {
configOpts = append(configOpts, config.WithClientLogMode(aws.LogRequestWithBody|aws.LogResponse))
configOpts = append(configOpts, config.WithClientLogMode(aws.LogRequestWithBody|aws.LogResponse))
}
if s.region != "" {
configOpts = append(configOpts, config.WithRegion(s.region))
Expand All @@ -206,7 +208,7 @@ func (s *S3) getClient(logger *log.Entry) (*s3.Client, error) {
"",
)))
}
cfg, err := config.LoadDefaultConfig(context.TODO(),
cfg, err := config.LoadDefaultConfig(context.TODO(),
configOpts...,
)
if err != nil {
Expand All @@ -215,7 +217,7 @@ func (s *S3) getClient(logger *log.Entry) (*s3.Client, error) {

// Get the S3 client
var s3opts []func(*s3.Options) // s3 client options
if s.endpoint != "" {
if s.endpoint != "" {
cleanEndpoint := getEndpoint(s.endpoint)
s3opts = append(s3opts,
func(o *s3.Options) {
Expand All @@ -231,7 +233,7 @@ func (s *S3) getClient(logger *log.Entry) (*s3.Client, error) {
)
}

// Create a new S3 service client
// Create a new S3 service client
return s3.NewFromConfig(cfg, s3opts...), nil
}

Expand Down