From 1aa24035fcd287f7ad00f0366f4617b9230b3ddd Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 11 Jan 2016 13:05:18 -0800 Subject: [PATCH] add ap-northeast-2: Asia Pacific (Seoul) --- builder/amazon/common/ami_config_test.go | 4 ++-- builder/amazon/common/regions.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/builder/amazon/common/ami_config_test.go b/builder/amazon/common/ami_config_test.go index e08d5d531..1e8ecc9f1 100644 --- a/builder/amazon/common/ami_config_test.go +++ b/builder/amazon/common/ami_config_test.go @@ -30,8 +30,8 @@ func TestAMIConfigPrepare_regions(t *testing.T) { t.Fatalf("shouldn't have err: %s", err) } - c.AMIRegions = []string{"ap-northeast-1", "ap-southeast-1", "ap-southeast-2", - "cn-north-1", "eu-central-1", "eu-west-1", "sa-east-1", + 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) diff --git a/builder/amazon/common/regions.go b/builder/amazon/common/regions.go index a8846a43e..42d59ac81 100644 --- a/builder/amazon/common/regions.go +++ b/builder/amazon/common/regions.go @@ -3,8 +3,9 @@ package common // IsValidRegion 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{ + var regions = [12]string{ "ap-northeast-1", + "ap-northeast-2", "ap-southeast-1", "ap-southeast-2", "cn-north-1",