From 10c884552caab3d3d8484ed3401e94f983a23f93 Mon Sep 17 00:00:00 2001
From: Anthony Pessy <anthony@cogniteev.com>
Date: Sat, 29 Oct 2022 09:37:08 +0200
Subject: [PATCH] s3: use different strategy to resolve s3 region
The API endpoint GetBucketLocation requires
top level permission.
If we do an authenticated head request to a bucket, the bucket location will be returned in the HTTP headers.
Fixes #5066
---
backend/s3/s3.go | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/backend/s3/s3.go b/backend/s3/s3.go
index c0fc888fc..c13a78a37 100644
--- a/backend/s3/s3.go
+++ b/backend/s3/s3.go
@@ -26,6 +26,8 @@ import (
"sync"
"time"
+ "github.com/aws/aws-sdk-go/service/s3/s3manager"
+
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/corehandlers"
@@ -2992,19 +2994,13 @@ func (f *Fs) NewObject(ctx context.Context, remote string) (fs.Object, error) {
// Gets the bucket location
func (f *Fs) getBucketLocation(ctx context.Context, bucket string) (string, error) {
- req := s3.GetBucketLocationInput{
- Bucket: &bucket,
- }
- var resp *s3.GetBucketLocationOutput
- var err error
- err = f.pacer.Call(func() (bool, error) {
- resp, err = f.c.GetBucketLocation(&req)
- return f.shouldRetry(ctx, err)
+ region, err := s3manager.GetBucketRegion(ctx, f.ses, bucket, "", func(r *request.Request) {
+ r.Config.S3ForcePathStyle = aws.Bool(f.opt.ForcePathStyle)
})
if err != nil {
return "", err
}
- return s3.NormalizeBucketLocation(aws.StringValue(resp.LocationConstraint)), nil
+ return region, nil
}
// Updates the region for the bucket by reading the region from the