e1464fd317
Fixes https://github.com/docker/distribution/issues/3097 Signed-off-by: Yong Wen Chua <lawliet89@users.noreply.github.com>
107 lines
3.2 KiB
Go
107 lines
3.2 KiB
Go
package s3
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"regexp"
|
|
|
|
"github.com/aws/aws-sdk-go/aws"
|
|
"github.com/aws/aws-sdk-go/aws/awserr"
|
|
"github.com/aws/aws-sdk-go/aws/awsutil"
|
|
"github.com/aws/aws-sdk-go/aws/request"
|
|
)
|
|
|
|
var reBucketLocation = regexp.MustCompile(`>([^<>]+)<\/Location`)
|
|
|
|
// NormalizeBucketLocation is a utility function which will update the
|
|
// passed in value to always be a region ID. Generally this would be used
|
|
// with GetBucketLocation API operation.
|
|
//
|
|
// Replaces empty string with "us-east-1", and "EU" with "eu-west-1".
|
|
//
|
|
// See http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETlocation.html
|
|
// for more information on the values that can be returned.
|
|
func NormalizeBucketLocation(loc string) string {
|
|
switch loc {
|
|
case "":
|
|
loc = "us-east-1"
|
|
case "EU":
|
|
loc = "eu-west-1"
|
|
}
|
|
|
|
return loc
|
|
}
|
|
|
|
// NormalizeBucketLocationHandler is a request handler which will update the
|
|
// GetBucketLocation's result LocationConstraint value to always be a region ID.
|
|
//
|
|
// Replaces empty string with "us-east-1", and "EU" with "eu-west-1".
|
|
//
|
|
// See http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETlocation.html
|
|
// for more information on the values that can be returned.
|
|
//
|
|
// req, result := svc.GetBucketLocationRequest(&s3.GetBucketLocationInput{
|
|
// Bucket: aws.String(bucket),
|
|
// })
|
|
// req.Handlers.Unmarshal.PushBackNamed(NormalizeBucketLocationHandler)
|
|
// err := req.Send()
|
|
var NormalizeBucketLocationHandler = request.NamedHandler{
|
|
Name: "awssdk.s3.NormalizeBucketLocation",
|
|
Fn: func(req *request.Request) {
|
|
if req.Error != nil {
|
|
return
|
|
}
|
|
|
|
out := req.Data.(*GetBucketLocationOutput)
|
|
loc := NormalizeBucketLocation(aws.StringValue(out.LocationConstraint))
|
|
out.LocationConstraint = aws.String(loc)
|
|
},
|
|
}
|
|
|
|
// WithNormalizeBucketLocation is a request option which will update the
|
|
// GetBucketLocation's result LocationConstraint value to always be a region ID.
|
|
//
|
|
// Replaces empty string with "us-east-1", and "EU" with "eu-west-1".
|
|
//
|
|
// See http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETlocation.html
|
|
// for more information on the values that can be returned.
|
|
//
|
|
// result, err := svc.GetBucketLocationWithContext(ctx,
|
|
// &s3.GetBucketLocationInput{
|
|
// Bucket: aws.String(bucket),
|
|
// },
|
|
// s3.WithNormalizeBucketLocation,
|
|
// )
|
|
func WithNormalizeBucketLocation(r *request.Request) {
|
|
r.Handlers.Unmarshal.PushBackNamed(NormalizeBucketLocationHandler)
|
|
}
|
|
|
|
func buildGetBucketLocation(r *request.Request) {
|
|
if r.DataFilled() {
|
|
out := r.Data.(*GetBucketLocationOutput)
|
|
b, err := ioutil.ReadAll(r.HTTPResponse.Body)
|
|
if err != nil {
|
|
r.Error = awserr.New(request.ErrCodeSerialization,
|
|
"failed reading response body", err)
|
|
return
|
|
}
|
|
|
|
match := reBucketLocation.FindSubmatch(b)
|
|
if len(match) > 1 {
|
|
loc := string(match[1])
|
|
out.LocationConstraint = aws.String(loc)
|
|
}
|
|
}
|
|
}
|
|
|
|
func populateLocationConstraint(r *request.Request) {
|
|
if r.ParamsFilled() && aws.StringValue(r.Config.Region) != "us-east-1" {
|
|
in := r.Params.(*CreateBucketInput)
|
|
if in.CreateBucketConfiguration == nil {
|
|
r.Params = awsutil.CopyOf(r.Params)
|
|
in = r.Params.(*CreateBucketInput)
|
|
in.CreateBucketConfiguration = &CreateBucketConfiguration{
|
|
LocationConstraint: r.Config.Region,
|
|
}
|
|
}
|
|
}
|
|
}
|