Add me-south-1 ec2 region.

sdg0919 · Aug 8, 2019 · 9ee824d · 9ee824d
1 parent 21ac99c
commit 9ee824d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/cloud/fallback-public-cloud.yaml b/cloud/fallback-public-cloud.yaml
@@ -39,6 +39,8 @@ clouds:
         endpoint: https://ec2.ap-northeast-2.amazonaws.com
       ap-northeast-3:
         endpoint: https://ec2.ap-northeast-3.amazonaws.com
+      me-south-1:
+        endpoint: https://ec2.me-south-1.amazonaws.com
       sa-east-1:
         endpoint: https://ec2.sa-east-1.amazonaws.com
   aws-china:

diff --git a/cloud/fallback_public_cloud.go b/cloud/fallback_public_cloud.go
@@ -46,6 +46,8 @@ clouds:
         endpoint: https://ec2.ap-northeast-2.amazonaws.com
       ap-northeast-3:
         endpoint: https://ec2.ap-northeast-3.amazonaws.com
+      me-south-1:
+        endpoint: https://ec2.me-south-1.amazonaws.com
       sa-east-1:
         endpoint: https://ec2.sa-east-1.amazonaws.com
   aws-china:

diff --git a/cmd/juju/cloud/regions_test.go b/cmd/juju/cloud/regions_test.go
@@ -53,6 +53,7 @@ ap-southeast-2
 ap-northeast-1
 ap-northeast-2
 ap-northeast-3
+me-south-1
 sa-east-1
 
 `[1:])
@@ -104,6 +105,8 @@ ap-northeast-2:
   endpoint: https://ec2.ap-northeast-2.amazonaws.com
 ap-northeast-3:
   endpoint: https://ec2.ap-northeast-3.amazonaws.com
+me-south-1:
+  endpoint: https://ec2.me-south-1.amazonaws.com
 sa-east-1:
   endpoint: https://ec2.sa-east-1.amazonaws.com
 `[1:])

diff --git a/cmd/juju/commands/bootstrap_test.go b/cmd/juju/commands/bootstrap_test.go
@@ -1861,6 +1861,7 @@ ap-southeast-2
 ap-northeast-1
 ap-northeast-2
 ap-northeast-3
+me-south-1
 sa-east-1
 `[1:])
 }
@@ -1869,7 +1870,7 @@ func (s *BootstrapSuite) TestBootstrapInvalidRegion(c *gc.C) {
 	resetJujuXDGDataHome(c)
 	ctx, err := cmdtesting.RunCommand(c, s.newBootstrapCommand(), "aws/eu-west")
 	c.Assert(err, gc.ErrorMatches, `region "eu-west" for cloud "aws" not valid`)
-	c.Assert(cmdtesting.Stderr(ctx), gc.Equals, "Available cloud regions are ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, eu-central-1, eu-north-1, eu-west-1, eu-west-2, eu-west-3, sa-east-1, us-east-1, us-east-2, us-west-1, us-west-2\n")
+	c.Assert(cmdtesting.Stderr(ctx), gc.Equals, "Available cloud regions are ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, eu-central-1, eu-north-1, eu-west-1, eu-west-2, eu-west-3, me-south-1, sa-east-1, us-east-1, us-east-2, us-west-1, us-west-2\n")
 	c.Assert(cmdtesting.Stdout(ctx), gc.Equals, ``)
 }
 

diff --git a/provider/ec2/internal/ec2instancetypes/process_cost_data.go b/provider/ec2/internal/ec2instancetypes/process_cost_data.go
@@ -356,6 +356,7 @@ func locationToRegion(loc string) (string, bool) {
 		"Asia Pacific (Sydney)":      "ap-southeast-2",
 		"Asia Pacific (Mumbai)":      "ap-south-1",
 		"Asia Pacific (Hong Kong)":   "ap-east-1",
+		"Middle East (Bahrain)":      "me-south-1",
 		"South America (Sao Paulo)":  "sa-east-1",
 		"AWS GovCloud (US-East)":     "us-gov-east-1",
 		"AWS GovCloud (US)":          "us-gov-west-1",