fix-issue-6297

Signed-off-by: Lyndon-Li <[email protected]>

pkg/repository/config/aws.go

@@ -21,6 +21,8 @@ import (
 	"context"
 	"os"
 
+	goerr "errors"
+
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -80,16 +82,20 @@ func GetS3Credentials(config map[string]string) (*credentials.Value, error) {
 // GetAWSBucketRegion returns the AWS region that a bucket is in, or an error
 // if the region cannot be determined.
 func GetAWSBucketRegion(bucket string) (string, error) {
-	var region string
-
 	sess, err := session.NewSession()
 	if err != nil {
 		return "", errors.WithStack(err)
 	}
 
+	var region string
+	var requestErrs []error
+
 	for _, partition := range endpoints.DefaultPartitions() {
 		for regionHint := range partition.Regions() {
-			region, _ = s3manager.GetBucketRegion(context.Background(), sess, bucket, regionHint)
+			region, err = s3manager.GetBucketRegion(context.Background(), sess, bucket, regionHint)
+			if err != nil {
+				requestErrs = append(requestErrs, err)
+			}
 
 			// we only need to try a single region hint per partition, so break after the first
 			break
@@ -100,5 +106,9 @@ func GetAWSBucketRegion(bucket string) (string, error) {
 		}
 	}
 
-	return "", errors.New("unable to determine bucket's region")
+	if requestErrs == nil {
+		return "", errors.New("unable to determine bucket's region")
+	} else {
+		return "", goerr.Join(requestErrs...)
+	}
 }