Allowing ap-south-1 (Mumbai) as valid AWS region (#7688)

* Update website_endpoint_url_test.go

Allow ap-south-1 (Mumbai) as valid region

* Update hosted_zones.go

Allowing ap-south-1 (Mumbai) as valid region

* Update website_endpoint_url_test.go

reformatting

* Update hosted_zones.go

reformatting

* Update resource_aws_s3_bucket.go

making changes for ap-south-1 (Mumbai) region
This commit is contained in:
avichalbadaya 2016-07-19 04:01:49 -04:00 committed by Paul Stack
parent 565733398d
commit 7369c1c9f4
3 changed files with 3 additions and 1 deletions

View File

@ -9,6 +9,7 @@ var hostedZoneIDsMap = map[string]string{
"us-west-1": "Z2F56UZL2M1ACD",
"eu-west-1": "Z1BKCTXD74EZPE",
"eu-central-1": "Z21DNDUVLTQW6Q",
"ap-south-1": "Z11RGJOFQNVJUP",
"ap-southeast-1": "Z3O0J2DXBE1FTB",
"ap-southeast-2": "Z1WCIGYICN2BYD",
"ap-northeast-1": "Z2M4EHUR26P7ZW",

View File

@ -1029,7 +1029,7 @@ func WebsiteDomainUrl(region string) string {
// Frankfurt(and probably future) regions uses different syntax for website endpoints
// http://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteEndpoints.html
if region == "eu-central-1" {
if region == "eu-central-1" || region == "ap-south-1" {
return fmt.Sprintf("s3-website.%s.amazonaws.com", region)
}

View File

@ -12,6 +12,7 @@ var websiteEndpoints = []struct {
{"us-west-1", "bucket-name.s3-website-us-west-1.amazonaws.com"},
{"eu-west-1", "bucket-name.s3-website-eu-west-1.amazonaws.com"},
{"eu-central-1", "bucket-name.s3-website.eu-central-1.amazonaws.com"},
{"ap-south-1", "bucket-name.s3-website.ap-south-1.amazonaws.com"},
{"ap-southeast-1", "bucket-name.s3-website-ap-southeast-1.amazonaws.com"},
{"ap-northeast-1", "bucket-name.s3-website-ap-northeast-1.amazonaws.com"},
{"ap-southeast-2", "bucket-name.s3-website-ap-southeast-2.amazonaws.com"},