iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3056 from chulkilee/amazon-region 

Add ap-northeast-2: Asia Pacific (Seoul)
This commit is contained in:
Chris Bednarski 2016-01-12 18:59:07 -08:00
parent b90a5bd59a 20c0f6b02b
commit 10991af675
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builder/amazon/common/ami_config_test.go
View File

@ -30,6 +30,13 @@ func TestAMIConfigPrepare_regions(t *testing.T) {
t.Fatalf("shouldn't have err: %s", err)
}
c.AMIRegions = []string{"ap-northeast-1", "ap-northeast-2", "ap-southeast-1",
"ap-southeast-2", "cn-north-1", "eu-central-1", "eu-west-1", "sa-east-1",
"us-east-1", "us-gov-west-1", "us-west-1", "us-west-2"}
if err := c.Prepare(nil); err != nil {
t.Fatalf("shouldn't have err: %s", err)
}
c.AMIRegions = []string{"foo"}
if err := c.Prepare(nil); err == nil {
t.Fatal("should have error")

19
builder/amazon/common/regions.go
View File

@ -1,11 +1,22 @@
package common
// IsValidRegion returns true if the supplied region is a valid AWS
// ValidateRegion returns true if the supplied region is a valid AWS
// region and false if it's not.
func ValidateRegion(region string) bool {
var regions = [11]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"}
var regions = [12]string{
"ap-northeast-1",
"ap-northeast-2",
"ap-southeast-1",
"ap-southeast-2",
"cn-north-1",
"eu-central-1",
"eu-west-1",
"sa-east-1",
"us-east-1",
"us-gov-west-1",
"us-west-1",
"us-west-2",
}
for _, valid := range regions {
if region == valid {