ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4637 from discogestalt/aws-ap-northeast-2 

provider/aws: Allow ap-northeast-2 (Seoul) as valid region
This commit is contained in:
Clint 2016-01-11 16:50:55 -06:00
parent 6ee4e8597a b396bbb3e4
commit a69df4b77c
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,9 +250,9 @@ func (c *Config) Client() (interface{}, error) {
// ValidateRegion returns an error if the configured region is not a
// valid aws region and nil otherwise.
func (c *Config) ValidateRegion() error {
var regions = [11]string{"us-east-1", "us-west-2", "us-west-1", "eu-west-1",
var regions = [12]string{"us-east-1", "us-west-2", "us-west-1", "eu-west-1",
"eu-central-1", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1",
"sa-east-1", "cn-north-1", "us-gov-west-1"}
"ap-northeast-2", "sa-east-1", "cn-north-1", "us-gov-west-1"}
for _, valid := range regions {
if c.Region == valid {

1
builtin/providers/aws/hosted_zones.go
View File

@ -12,6 +12,7 @@ var hostedZoneIDsMap = map[string]string{
"ap-southeast-1": "Z3O0J2DXBE1FTB",
"ap-southeast-2": "Z1WCIGYICN2BYD",
"ap-northeast-1": "Z2M4EHUR26P7ZW",
"ap-northeast-2": "Z3W03O7B5YMIYP",
"sa-east-1": "Z7KQH4QJS55SO",
"us-gov-west-1": "Z31GFT0UA1I2HV",
}

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

@ -15,6 +15,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"},
{"sa-east-1", "bucket-name.s3-website-sa-east-1.amazonaws.com"},
}