fcrozat/distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2687 from davidswu/remove-region-validation

Browse Source 
use aws sdk to validate regions
This commit is contained in:
Derek McGowan 2018-08-20 11:11:49 -07:00 committed by GitHub
commit 633401c9e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
registry/storage/driver/s3-aws/s3.go
View File

@ -31,6 +31,7 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds" "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
"github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
@ -105,26 +106,12 @@ type DriverParameters struct {
} }
func init() { func init() {
for _, region := range []string{ partitions := endpoints.DefaultPartitions()
"us-east-1", for _, p := range partitions {
"us-east-2", for region := range p.Regions() {
"us-west-1",
"us-west-2",
"eu-west-1",
"eu-west-2",
"eu-central-1",
"ap-south-1",
"ap-southeast-1",
"ap-southeast-2",
"ap-northeast-1",
"ap-northeast-2",
"sa-east-1",
"cn-north-1",
"us-gov-west-1",
"ca-central-1",
} {
validRegions[region] = struct{}{} validRegions[region] = struct{}{}
} }
}
for _, objectACL := range []string{ for _, objectACL := range []string{
s3.ObjectCannedACLPrivate, s3.ObjectCannedACLPrivate,