Skip to content

Commit 5f98be2

Browse files
author
Tim McNamara
committed
Update public cloud data
Brings the list of clouds and their regions that Juju knows about up-to-date as of November 2018. - Azure - GCE - Joyent - CloudSigma - AWS EC2 China Also includes updated tests to check that the juju cli includes the updated data.
1 parent c44e316 commit 5f98be2

File tree

5 files changed

+135
-53
lines changed

5 files changed

+135
-53
lines changed

‎cloud/fallback-public-cloud.yaml‎

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ clouds:
4242
regions:
4343
cn-north-1:
4444
endpoint: https://ec2.cn-north-1.amazonaws.com.cn
45+
cn-northwest-1:
46+
endpoint: https://ec2.cn-northwest-1.amazonaws.com.cn
4547
aws-gov:
4648
type: ec2
4749
description: Amazon (USA Government)
@@ -62,22 +64,32 @@ clouds:
6264
endpoint: https://www.googleapis.com
6365
us-west1:
6466
endpoint: https://www.googleapis.com
65-
europe-west1:
66-
endpoint: https://www.googleapis.com
67-
europe-west2:
68-
endpoint: https://www.googleapis.com
69-
europe-west3:
67+
us-west2:
7068
endpoint: https://www.googleapis.com
7169
asia-east1:
7270
endpoint: https://www.googleapis.com
73-
asia-northeast1:
71+
asia-east2:
7472
endpoint: https://www.googleapis.com
75-
asia-southeast1:
73+
asia-northeast1:
7674
endpoint: https://www.googleapis.com
7775
asia-south1:
7876
endpoint: https://www.googleapis.com
77+
asia-southeast1:
78+
endpoint: https://www.googleapis.com
7979
australia-southeast1:
8080
endpoint: https://www.googleapis.com
81+
europe-north1:
82+
endpoint: https://www.googleapis.com
83+
europe-west1:
84+
endpoint: https://www.googleapis.com
85+
europe-west2:
86+
endpoint: https://www.googleapis.com
87+
europe-west3:
88+
endpoint: https://www.googleapis.com
89+
europe-west4:
90+
endpoint: https://www.googleapis.com
91+
northamerica-northeast1:
92+
endpoint: https://www.googleapis.com
8193
southamerica-east1:
8294
endpoint: https://www.googleapis.com
8395
azure:
@@ -186,6 +198,10 @@ clouds:
186198
storage-endpoint: https://core.windows.net
187199
identity-endpoint: https://graph.windows.net
188200
koreasouth:
201+
endpoint: https://management.azure.com
202+
storage-endpoint: https://core.windows.net
203+
identity-endpoint: https://graph.windows.net
204+
francecentral:
189205
endpoint: https://management.azure.com
190206
storage-endpoint: https://core.windows.net
191207
identity-endpoint: https://graph.windows.net
@@ -225,10 +241,6 @@ clouds:
225241
description: Joyent Cloud
226242
auth-types: [ userpass ]
227243
regions:
228-
eu-ams-1:
229-
endpoint: https://eu-ams-1.api.joyentcloud.com
230-
us-sw-1:
231-
endpoint: https://us-sw-1.api.joyentcloud.com
232244
us-east-1:
233245
endpoint: https://us-east-1.api.joyentcloud.com
234246
us-east-2:
@@ -237,17 +249,35 @@ clouds:
237249
endpoint: https://us-east-3.api.joyentcloud.com
238250
us-west-1:
239251
endpoint: https://us-west-1.api.joyentcloud.com
252+
us-sw-1:
253+
endpoint: https://us-sw-1.api.joyentcloud.com
254+
eu-ams-1:
255+
endpoint: https://eu-ams-1.api.joyentcloud.com
240256
cloudsigma:
241257
type: cloudsigma
242258
description: CloudSigma Cloud
243259
auth-types: [ userpass ]
244260
regions:
261+
dub:
262+
endpoint: https://dub.cloudsigma.com/api/2.0/
263+
fra:
264+
endpoint: https://fra.cloudsigma.com/api/2.0/
245265
hnl:
246266
endpoint: https://hnl.cloudsigma.com/api/2.0/
267+
mel:
268+
endpoint: https://mel.cloudsigma.com/api/2.0/
247269
mia:
248270
endpoint: https://mia.cloudsigma.com/api/2.0/
271+
mnl:
272+
endpoint: https://mnl.cloudsigma.com/api/2.0/
273+
per:
274+
endpoint: https://per.cloudsigma.com/api/2.0/
275+
ruh:
276+
endpoint: https://ruh.cloudsigma.com/api/2.0/
249277
sjc:
250278
endpoint: https://sjc.cloudsigma.com/api/2.0/
279+
waw:
280+
endpoint: https://waw.cloudsigma.com/api/2.0/
251281
wdc:
252282
endpoint: https://wdc.cloudsigma.com/api/2.0/
253283
zrh:

‎cloud/fallback_public_cloud.go‎

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ clouds:
4949
regions:
5050
cn-north-1:
5151
endpoint: https://ec2.cn-north-1.amazonaws.com.cn
52+
cn-northwest-1:
53+
endpoint: https://ec2.cn-northwest-1.amazonaws.com.cn
5254
aws-gov:
5355
type: ec2
5456
description: Amazon (USA Government)
@@ -69,22 +71,32 @@ clouds:
6971
endpoint: https://www.googleapis.com
7072
us-west1:
7173
endpoint: https://www.googleapis.com
72-
europe-west1:
73-
endpoint: https://www.googleapis.com
74-
europe-west2:
75-
endpoint: https://www.googleapis.com
76-
europe-west3:
74+
us-west2:
7775
endpoint: https://www.googleapis.com
7876
asia-east1:
7977
endpoint: https://www.googleapis.com
80-
asia-northeast1:
78+
asia-east2:
8179
endpoint: https://www.googleapis.com
82-
asia-southeast1:
80+
asia-northeast1:
8381
endpoint: https://www.googleapis.com
8482
asia-south1:
8583
endpoint: https://www.googleapis.com
84+
asia-southeast1:
85+
endpoint: https://www.googleapis.com
8686
australia-southeast1:
8787
endpoint: https://www.googleapis.com
88+
europe-north1:
89+
endpoint: https://www.googleapis.com
90+
europe-west1:
91+
endpoint: https://www.googleapis.com
92+
europe-west2:
93+
endpoint: https://www.googleapis.com
94+
europe-west3:
95+
endpoint: https://www.googleapis.com
96+
europe-west4:
97+
endpoint: https://www.googleapis.com
98+
northamerica-northeast1:
99+
endpoint: https://www.googleapis.com
88100
southamerica-east1:
89101
endpoint: https://www.googleapis.com
90102
azure:
@@ -195,7 +207,11 @@ clouds:
195207
koreasouth:
196208
endpoint: https://management.azure.com
197209
storage-endpoint: https://core.windows.net
198-
identity-endpoint: https://graph.windows.net
210+
identity-endpoint: https://graph.windows.net
211+
francecentral:
212+
endpoint: https://management.azure.com
213+
storage-endpoint: https://core.windows.net
214+
identity-endpoint: https://graph.windows.net
199215
azure-china:
200216
type: azure
201217
description: Microsoft Azure China
@@ -232,10 +248,6 @@ clouds:
232248
description: Joyent Cloud
233249
auth-types: [ userpass ]
234250
regions:
235-
eu-ams-1:
236-
endpoint: https://eu-ams-1.api.joyentcloud.com
237-
us-sw-1:
238-
endpoint: https://us-sw-1.api.joyentcloud.com
239251
us-east-1:
240252
endpoint: https://us-east-1.api.joyentcloud.com
241253
us-east-2:
@@ -244,17 +256,35 @@ clouds:
244256
endpoint: https://us-east-3.api.joyentcloud.com
245257
us-west-1:
246258
endpoint: https://us-west-1.api.joyentcloud.com
259+
us-sw-1:
260+
endpoint: https://us-sw-1.api.joyentcloud.com
261+
eu-ams-1:
262+
endpoint: https://eu-ams-1.api.joyentcloud.com
247263
cloudsigma:
248264
type: cloudsigma
249265
description: CloudSigma Cloud
250266
auth-types: [ userpass ]
251267
regions:
268+
dub:
269+
endpoint: https://dub.cloudsigma.com/api/2.0/
270+
fra:
271+
endpoint: https://fra.cloudsigma.com/api/2.0/
252272
hnl:
253273
endpoint: https://hnl.cloudsigma.com/api/2.0/
274+
mel:
275+
endpoint: https://mel.cloudsigma.com/api/2.0/
254276
mia:
255277
endpoint: https://mia.cloudsigma.com/api/2.0/
278+
mnl:
279+
endpoint: https://mnl.cloudsigma.com/api/2.0/
280+
per:
281+
endpoint: https://per.cloudsigma.com/api/2.0/
282+
ruh:
283+
endpoint: https://ruh.cloudsigma.com/api/2.0/
256284
sjc:
257285
endpoint: https://sjc.cloudsigma.com/api/2.0/
286+
waw:
287+
endpoint: https://waw.cloudsigma.com/api/2.0/
258288
wdc:
259289
endpoint: https://wdc.cloudsigma.com/api/2.0/
260290
zrh:
@@ -272,4 +302,5 @@ clouds:
272302
endpoint: https://iaas.eu-frankfurt-1.oraclecloud.com
273303
uk-london-1:
274304
endpoint: https://iaas.uk-london-1.oraclecloud.com
305+
275306
`

‎cmd/juju/cloud/list_test.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@ func (s *listSuite) TestListPublic(c *gc.C) {
2929
c.Assert(err, jc.ErrorIsNil)
3030
out := cmdtesting.Stdout(ctx)
3131
out = strings.Replace(out, "\n", "", -1)
32-
// Just check couple of snippets of the output to make sure it looks ok.
33-
c.Assert(out, gc.Matches, `.*aws-china[ ]*1[ ]*cn-north-1[ ]*ec2.*`)
32+
// Check that we are producing the expected fields
33+
c.Assert(out, gc.Matches, `Cloud Regions Default Type Description.*`)
34+
// // Just check couple of snippets of the output to make sure it looks ok.
35+
c.Assert(out, gc.Matches, `.*aws [0-9]+ [a-z0-9-]+ ec2 Amazon Web Services.*`)
36+
c.Assert(out, gc.Matches, `.*azure [0-9]+ [a-z0-9-]+ azure Microsoft Azure.*`)
3437
// LXD should be there too.
3538
c.Assert(out, gc.Matches, `.*localhost[ ]*1[ ]*localhost[ ]*lxd.*`)
3639
}

‎cmd/juju/cloud/regions_test.go‎

Lines changed: 40 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,19 @@ us-east1
109109
us-east4
110110
us-central1
111111
us-west1
112-
europe-west1
113-
europe-west2
114-
europe-west3
112+
us-west2
115113
asia-east1
114+
asia-east2
116115
asia-northeast1
117-
asia-southeast1
118116
asia-south1
117+
asia-southeast1
119118
australia-southeast1
119+
europe-north1
120+
europe-west1
121+
europe-west2
122+
europe-west3
123+
europe-west4
124+
northamerica-northeast1
120125
southamerica-east1
121126
122127
`[1:])
@@ -135,22 +140,32 @@ us-central1:
135140
endpoint: https://www.googleapis.com
136141
us-west1:
137142
endpoint: https://www.googleapis.com
138-
europe-west1:
139-
endpoint: https://www.googleapis.com
140-
europe-west2:
141-
endpoint: https://www.googleapis.com
142-
europe-west3:
143+
us-west2:
143144
endpoint: https://www.googleapis.com
144145
asia-east1:
145146
endpoint: https://www.googleapis.com
146-
asia-northeast1:
147+
asia-east2:
147148
endpoint: https://www.googleapis.com
148-
asia-southeast1:
149+
asia-northeast1:
149150
endpoint: https://www.googleapis.com
150151
asia-south1:
151152
endpoint: https://www.googleapis.com
153+
asia-southeast1:
154+
endpoint: https://www.googleapis.com
152155
australia-southeast1:
153156
endpoint: https://www.googleapis.com
157+
europe-north1:
158+
endpoint: https://www.googleapis.com
159+
europe-west1:
160+
endpoint: https://www.googleapis.com
161+
europe-west2:
162+
endpoint: https://www.googleapis.com
163+
europe-west3:
164+
endpoint: https://www.googleapis.com
165+
europe-west4:
166+
endpoint: https://www.googleapis.com
167+
northamerica-northeast1:
168+
endpoint: https://www.googleapis.com
154169
southamerica-east1:
155170
endpoint: https://www.googleapis.com
156171
`[1:])
@@ -170,31 +185,32 @@ func (s *regionsSuite) TestListRegionsJson(c *gc.C) {
170185
err = json.Unmarshal([]byte(out), &data)
171186
c.Assert(err, jc.ErrorIsNil)
172187
c.Assert(data, jc.DeepEquals, map[string]regionDetails{
173-
"northeurope": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
174-
"eastasia": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
175-
"japanwest": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
176-
"westcentralus": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
177188
"centralus": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
178-
"westus2": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
189+
"eastus": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
179190
"eastus2": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
180-
"japaneast": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
181191
"northcentralus": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
182192
"southcentralus": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
183-
"australiaeast": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
193+
"westcentralus": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
194+
"westus": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
195+
"westus2": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
196+
"northeurope": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
197+
"westeurope": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
198+
"eastasia": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
199+
"southeastasia": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
200+
"japaneast": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
201+
"japanwest": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
184202
"brazilsouth": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
203+
"australiaeast": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
204+
"australiasoutheast": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
185205
"centralindia": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
186206
"southindia": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
187-
"westeurope": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
188207
"westindia": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
189-
"westus": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
190-
"australiasoutheast": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
191-
"eastus": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
192-
"southeastasia": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
193208
"canadacentral": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
194209
"canadaeast": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
195210
"uksouth": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
196211
"ukwest": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
197-
"koreasouth": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
198212
"koreacentral": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
213+
"koreasouth": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
214+
"francecentral": {Endpoint: "https://management.azure.com", IdentityEndpoint: "https://graph.windows.net", StorageEndpoint: "https://core.windows.net"},
199215
})
200216
}

‎cmd/juju/cloud/show_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ auth-types: [access-key]
4040
regions:
4141
cn-north-1:
4242
endpoint: https://ec2.cn-north-1.amazonaws.com.cn
43+
cn-northwest-1:
44+
endpoint: https://ec2.cn-northwest-1.amazonaws.com.cn
4345
`[1:])
4446
}
4547

@@ -157,10 +159,6 @@ type: joyent
157159
description: Joyent Cloud
158160
auth-types: [userpass]
159161
regions:
160-
eu-ams-1:
161-
endpoint: https://eu-ams-1.api.joyentcloud.com
162-
us-sw-1:
163-
endpoint: https://us-sw-1.api.joyentcloud.com
164162
us-east-1:
165163
endpoint: https://us-east-1.api.joyentcloud.com
166164
us-east-2:
@@ -169,6 +167,10 @@ regions:
169167
endpoint: https://us-east-3.api.joyentcloud.com
170168
us-west-1:
171169
endpoint: https://us-west-1.api.joyentcloud.com
170+
us-sw-1:
171+
endpoint: https://us-sw-1.api.joyentcloud.com
172+
eu-ams-1:
173+
endpoint: https://eu-ams-1.api.joyentcloud.com
172174
`[1:])
173175
}
174176

0 commit comments

Comments
 (0)