Skip to content

Commit 5d77ffd

Browse files
hmlaniganhmlanigan
committed
add EC2 regions: eu-north-1, ap-east-1, and ap-northeast-3
1 parent 8c3acb6 commit 5d77ffd

5 files changed

Lines changed: 30 additions & 1 deletion

File tree

‎cloud/fallback-public-cloud.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ clouds:
2323
endpoint: https://ec2.eu-west-3.amazonaws.com
2424
eu-central-1:
2525
endpoint: https://ec2.eu-central-1.amazonaws.com
26+
eu-north-1:
27+
endpoint: https://ec2.eu-north-1.amazonaws.com
28+
ap-east-1:
29+
endpoint: https://ec2.ap-east-1.amazonaws.com
2630
ap-south-1:
2731
endpoint: https://ec2.ap-south-1.amazonaws.com
2832
ap-southeast-1:
@@ -33,6 +37,8 @@ clouds:
3337
endpoint: https://ec2.ap-northeast-1.amazonaws.com
3438
ap-northeast-2:
3539
endpoint: https://ec2.ap-northeast-2.amazonaws.com
40+
ap-northeast-3:
41+
endpoint: https://ec2.ap-northeast-3.amazonaws.com
3642
sa-east-1:
3743
endpoint: https://ec2.sa-east-1.amazonaws.com
3844
aws-china:
@@ -51,6 +57,8 @@ clouds:
5157
regions:
5258
us-gov-west-1:
5359
endpoint: https://ec2.us-gov-west-1.amazonaws.com
60+
us-gov-east-1:
61+
endpoint: https://ec2.us-gov-east-1.amazonaws.com
5462
google:
5563
type: gce
5664
description: Google Cloud Platform

‎cloud/fallback_public_cloud.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ clouds:
3030
endpoint: https://ec2.eu-west-3.amazonaws.com
3131
eu-central-1:
3232
endpoint: https://ec2.eu-central-1.amazonaws.com
33+
eu-north-1:
34+
endpoint: https://ec2.eu-north-1.amazonaws.com
35+
ap-east-1:
36+
endpoint: https://ec2.ap-east-1.amazonaws.com
3337
ap-south-1:
3438
endpoint: https://ec2.ap-south-1.amazonaws.com
3539
ap-southeast-1:
@@ -40,6 +44,8 @@ clouds:
4044
endpoint: https://ec2.ap-northeast-1.amazonaws.com
4145
ap-northeast-2:
4246
endpoint: https://ec2.ap-northeast-2.amazonaws.com
47+
ap-northeast-3:
48+
endpoint: https://ec2.ap-northeast-3.amazonaws.com
4349
sa-east-1:
4450
endpoint: https://ec2.sa-east-1.amazonaws.com
4551
aws-china:
@@ -58,6 +64,8 @@ clouds:
5864
regions:
5965
us-gov-west-1:
6066
endpoint: https://ec2.us-gov-west-1.amazonaws.com
67+
us-gov-east-1:
68+
endpoint: https://ec2.us-gov-east-1.amazonaws.com
6169
google:
6270
type: gce
6371
description: Google Cloud Platform

‎cmd/juju/cloud/regions_test.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,14 @@ eu-west-1
4545
eu-west-2
4646
eu-west-3
4747
eu-central-1
48+
eu-north-1
49+
ap-east-1
4850
ap-south-1
4951
ap-southeast-1
5052
ap-southeast-2
5153
ap-northeast-1
5254
ap-northeast-2
55+
ap-northeast-3
5356
sa-east-1
5457
5558
`[1:])
@@ -85,6 +88,10 @@ eu-west-3:
8588
endpoint: https://ec2.eu-west-3.amazonaws.com
8689
eu-central-1:
8790
endpoint: https://ec2.eu-central-1.amazonaws.com
91+
eu-north-1:
92+
endpoint: https://ec2.eu-north-1.amazonaws.com
93+
ap-east-1:
94+
endpoint: https://ec2.ap-east-1.amazonaws.com
8895
ap-south-1:
8996
endpoint: https://ec2.ap-south-1.amazonaws.com
9097
ap-southeast-1:
@@ -95,6 +102,8 @@ ap-northeast-1:
95102
endpoint: https://ec2.ap-northeast-1.amazonaws.com
96103
ap-northeast-2:
97104
endpoint: https://ec2.ap-northeast-2.amazonaws.com
105+
ap-northeast-3:
106+
endpoint: https://ec2.ap-northeast-3.amazonaws.com
98107
sa-east-1:
99108
endpoint: https://ec2.sa-east-1.amazonaws.com
100109
`[1:])

‎cmd/juju/commands/bootstrap_test.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1853,11 +1853,14 @@ eu-west-1
18531853
eu-west-2
18541854
eu-west-3
18551855
eu-central-1
1856+
eu-north-1
1857+
ap-east-1
18561858
ap-south-1
18571859
ap-southeast-1
18581860
ap-southeast-2
18591861
ap-northeast-1
18601862
ap-northeast-2
1863+
ap-northeast-3
18611864
sa-east-1
18621865
`[1:])
18631866
}
@@ -1866,7 +1869,7 @@ func (s *BootstrapSuite) TestBootstrapInvalidRegion(c *gc.C) {
18661869
resetJujuXDGDataHome(c)
18671870
ctx, err := cmdtesting.RunCommand(c, s.newBootstrapCommand(), "aws/eu-west")
18681871
c.Assert(err, gc.ErrorMatches, `region "eu-west" for cloud "aws" not valid`)
1869-
c.Assert(cmdtesting.Stderr(ctx), gc.Equals, "Available cloud regions are ap-northeast-1, ap-northeast-2, ap-south-1, ap-southeast-1, ap-southeast-2, ca-central-1, eu-central-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")
1872+
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")
18701873
c.Assert(cmdtesting.Stdout(ctx), gc.Equals, ``)
18711874
}
18721875

‎provider/ec2/internal/ec2instancetypes/process_cost_data.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ func locationToRegion(loc string) (string, bool) {
355355
"Asia Pacific (Singapore)": "ap-southeast-1",
356356
"Asia Pacific (Sydney)": "ap-southeast-2",
357357
"Asia Pacific (Mumbai)": "ap-south-1",
358+
"Asia Pacific (Hong Kong)": "ap-east-1",
358359
"South America (Sao Paulo)": "sa-east-1",
359360
"AWS GovCloud (US-East)": "us-gov-east-1",
360361
"AWS GovCloud (US)": "us-gov-west-1",

0 commit comments

Comments
 (0)