From 7f3f5f4bfaf630a9a6d2e0fb329bc290547af5aa Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 11 Jan 2016 13:02:38 -0800 Subject: [PATCH 1/5] add tests for all ami regions --- builder/amazon/common/ami_config_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/builder/amazon/common/ami_config_test.go b/builder/amazon/common/ami_config_test.go index 9e2baa41d..e08d5d531 100644 --- a/builder/amazon/common/ami_config_test.go +++ b/builder/amazon/common/ami_config_test.go @@ -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-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") From 3f0795b23c8c91dd7b9ade7e65e54e4b32141290 Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 11 Jan 2016 13:04:00 -0800 Subject: [PATCH 2/5] sort regions by name --- builder/amazon/common/regions.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/amazon/common/regions.go b/builder/amazon/common/regions.go index 4d3762465..e524a1cdd 100644 --- a/builder/amazon/common/regions.go +++ b/builder/amazon/common/regions.go @@ -3,9 +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{"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 = [11]string{"ap-northeast-1", "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 { From 7018517374a3be807452e73f52197ff47adf7e10 Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 11 Jan 2016 13:04:35 -0800 Subject: [PATCH 3/5] one region per line, sorted --- builder/amazon/common/regions.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/builder/amazon/common/regions.go b/builder/amazon/common/regions.go index e524a1cdd..a8846a43e 100644 --- a/builder/amazon/common/regions.go +++ b/builder/amazon/common/regions.go @@ -3,9 +3,19 @@ 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{"ap-northeast-1", "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"} + var regions = [11]string{ + "ap-northeast-1", + "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 { From 1aa24035fcd287f7ad00f0366f4617b9230b3ddd Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 11 Jan 2016 13:05:18 -0800 Subject: [PATCH 4/5] 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", From 20c0f6b02b6d6d85a037ea4ec37904775069b7a9 Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 11 Jan 2016 13:06:34 -0800 Subject: [PATCH 5/5] fix doc: wrong function name --- builder/amazon/common/regions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/amazon/common/regions.go b/builder/amazon/common/regions.go index 42d59ac81..2096a715a 100644 --- a/builder/amazon/common/regions.go +++ b/builder/amazon/common/regions.go @@ -1,6 +1,6 @@ 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 = [12]string{