Merge pull request #9032 from AlexanderEkdahl/master

Corrected Seoul S3 Website Endpoint
hashicorp · Sep 24, 2016 · 464ea2d · 464ea2d
2 parents d642e6f + d2861be
commit 464ea2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go
@@ -1105,9 +1105,9 @@ func WebsiteEndpoint(bucket string, region string) *S3Website {
 func WebsiteDomainUrl(region string) string {
 	region = normalizeRegion(region)
 
-	// Frankfurt(and probably future) regions uses different syntax for website endpoints
+	// New regions uses different syntax for website endpoints
 	// http://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteEndpoints.html
-	if region == "eu-central-1" || region == "ap-south-1" {
+	if region == "eu-central-1" || region == "ap-south-1" || region == "ap-northeast-2" {
 		return fmt.Sprintf("s3-website.%s.amazonaws.com", region)
 	}
 

diff --git a/builtin/providers/aws/website_endpoint_url_test.go b/builtin/providers/aws/website_endpoint_url_test.go
@@ -16,7 +16,7 @@ var websiteEndpoints = []struct {
 	{"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"},
-	{"ap-northeast-2", "bucket-name.s3-website-ap-northeast-2.amazonaws.com"},
+	{"ap-northeast-2", "bucket-name.s3-website.ap-northeast-2.amazonaws.com"},
 	{"sa-east-1", "bucket-name.s3-website-sa-east-1.amazonaws.com"},
 }