IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9032 from AlexanderEkdahl/master

Browse Source 
Corrected Seoul S3 Website Endpoint
This commit is contained in:
Paul Stack 2016-09-24 09:55:29 +01:00 committed by GitHub
commit 464ea2d12a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/aws/resource_aws_s3_bucket.go
View File

@ -1105,9 +1105,9 @@ func WebsiteEndpoint(bucket string, region string) *S3Website {
func WebsiteDomainUrl(region string) string { func WebsiteDomainUrl(region string) string {
region = normalizeRegion(region) 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 // 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) return fmt.Sprintf("s3-website.%s.amazonaws.com", region)
} }

2
builtin/providers/aws/website_endpoint_url_test.go
View File

@ -16,7 +16,7 @@ var websiteEndpoints = []struct {
{"ap-southeast-1", "bucket-name.s3-website-ap-southeast-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-northeast-1", "bucket-name.s3-website-ap-northeast-1.amazonaws.com"},
{"ap-southeast-2", "bucket-name.s3-website-ap-southeast-2.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"}, {"sa-east-1", "bucket-name.s3-website-sa-east-1.amazonaws.com"},
} }