From 0b0d470281967fddab5af0ee5add93298518b9a1 Mon Sep 17 00:00:00 2001 From: David Wu Date: Mon, 20 Aug 2018 08:22:09 -0700 Subject: [PATCH] use aws sdk to validate regions Signed-off-by: David Wu --- registry/storage/driver/s3-aws/s3.go | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/registry/storage/driver/s3-aws/s3.go b/registry/storage/driver/s3-aws/s3.go index 34f822456..9cd87dbab 100644 --- a/registry/storage/driver/s3-aws/s3.go +++ b/registry/storage/driver/s3-aws/s3.go @@ -31,6 +31,7 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds" "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/session" "github.com/aws/aws-sdk-go/service/s3" @@ -105,25 +106,11 @@ type DriverParameters struct { } func init() { - for _, region := range []string{ - "us-east-1", - "us-east-2", - "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{}{} + partitions := endpoints.DefaultPartitions() + for _, p := range partitions { + for region := range p.Regions() { + validRegions[region] = struct{}{} + } } for _, objectACL := range []string{