mirror of
https://github.com/opentofu/opentofu.git
synced 2024-12-28 01:41:48 -06:00
6fe2703665
* Remove `make updatedeps` from Travis build. We'll follow up with more specific plans around dependency updating in subsequent PRs. * Update all `make` targets to set `GO15VENDOREXPERIMENT=1` and to filter out `/vendor/` from `./...` where appropriate. * Temporarily remove `vet` from the `make test` target until we can figure out how to get it to not vet `vendor/`. (Initial experimentation failed to yield the proper incantation.) Everything is pinned to current master, with the exception of: * Azure/azure-sdk-for-go which is pinned before the breaking change today * aws/aws-sdk-go which is pinned to the most recent tag The documentation still needs to be updated, which we can do in a follow up PR. The goal here is to unblock release.
44 lines
1.1 KiB
Go
44 lines
1.1 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`)
|
|
|
|
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("SerializationError", "failed reading response body", err)
|
|
return
|
|
}
|
|
|
|
match := reBucketLocation.FindSubmatch(b)
|
|
if len(match) > 1 {
|
|
loc := string(match[1])
|
|
out.LocationConstraint = &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,
|
|
}
|
|
}
|
|
}
|
|
}
|