From ec1ee7f2bec8bc74177c5b10798c35ab457d836c Mon Sep 17 00:00:00 2001 From: Alexander Ekdahl Date: Sat, 24 Sep 2016 17:42:52 +0900 Subject: [PATCH 1/2] Corrected Seoul S3 Website Endpoint Test --- builtin/providers/aws/website_endpoint_url_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/providers/aws/website_endpoint_url_test.go b/builtin/providers/aws/website_endpoint_url_test.go index e4cba63124..67f6b35425 100644 --- 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"}, } From d2861be48e2af019331007775d628d4f13780691 Mon Sep 17 00:00:00 2001 From: Alexander Ekdahl Date: Sat, 24 Sep 2016 17:43:58 +0900 Subject: [PATCH 2/2] Corrected Seoul S3 Website Endpoint --- builtin/providers/aws/resource_aws_s3_bucket.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go index 215721f3bf..a33c7040e8 100644 --- 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) }