Skip to content

Commit ae5d788

Browse files
authored
feat: add support for pl-waw-1 zone and pl-waw region (#557)
1 parent 3c87d95 commit ae5d788

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

scw/client_option_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func TestClientOptions(t *testing.T) {
117117
s.token = auth.NewToken(testAccessKey, testSecretKey)
118118
s.defaultRegion = &v
119119
},
120-
errStr: "scaleway-sdk-go: invalid default region format 'invalid', available regions are: fr-par, nl-ams",
120+
errStr: "scaleway-sdk-go: invalid default region format 'invalid', available regions are: fr-par, nl-ams, pl-waw",
121121
},
122122
{
123123
name: "Should throw a zone error",
@@ -135,7 +135,7 @@ func TestClientOptions(t *testing.T) {
135135
s.token = auth.NewToken(testAccessKey, testSecretKey)
136136
s.defaultZone = &v
137137
},
138-
errStr: "scaleway-sdk-go: invalid default zone format 'invalid', available zones are: fr-par-1, fr-par-2, nl-ams-1",
138+
errStr: "scaleway-sdk-go: invalid default zone format 'invalid', available zones are: fr-par-1, fr-par-2, nl-ams-1, pl-waw-1",
139139
},
140140
}
141141

scw/locality.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ const (
2323
ZoneFrPar2 = Zone("fr-par-2")
2424
// ZoneNlAms1 represents the nl-ams-1 zone
2525
ZoneNlAms1 = Zone("nl-ams-1")
26+
// ZonePlWaw1 represents the pl-waw-1 zone
27+
ZonePlWaw1 = Zone("pl-waw-1")
2628
)
2729

2830
var (
@@ -31,6 +33,7 @@ var (
3133
ZoneFrPar1,
3234
ZoneFrPar2,
3335
ZoneNlAms1,
36+
ZonePlWaw1,
3437
}
3538
)
3639

@@ -68,13 +71,16 @@ const (
6871
RegionFrPar = Region("fr-par")
6972
// RegionNlAms represents the nl-ams region
7073
RegionNlAms = Region("nl-ams")
74+
// RegionPlWaw represents the pl-waw region
75+
RegionPlWaw = Region("pl-waw")
7176
)
7277

7378
var (
7479
// AllRegions is an array that list all regions
7580
AllRegions = []Region{
7681
RegionFrPar,
7782
RegionNlAms,
83+
RegionPlWaw,
7884
}
7985
)
8086

@@ -95,6 +101,8 @@ func (region Region) GetZones() []Zone {
95101
return []Zone{ZoneFrPar1, ZoneFrPar2}
96102
case RegionNlAms:
97103
return []Zone{ZoneNlAms1}
104+
case RegionPlWaw:
105+
return []Zone{ZonePlWaw1}
98106
default:
99107
return []Zone{}
100108
}

scw/locality_test.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ func TestParseZone(t *testing.T) {
1818
input: "fr-par-1",
1919
expected: ZoneFrPar1,
2020
},
21+
{
22+
input: "pl-waw-1",
23+
expected: ZonePlWaw1,
24+
},
2125
{
2226
input: "par1",
2327
expected: ZoneFrPar1,
@@ -33,17 +37,17 @@ func TestParseZone(t *testing.T) {
3337
{
3438
input: "fr-par",
3539
expected: "",
36-
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, nl-ams-1"),
40+
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, nl-ams-1, pl-waw-1"),
3741
},
3842
{
3943
input: "fr-par-n",
4044
expected: "",
41-
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, nl-ams-1"),
45+
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, nl-ams-1, pl-waw-1"),
4246
},
4347
{
4448
input: "fr-par-0",
4549
expected: "",
46-
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, nl-ams-1"),
50+
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, nl-ams-1, pl-waw-1"),
4751
},
4852
}
4953

@@ -96,19 +100,23 @@ func TestParseRegion(t *testing.T) {
96100
input: "ams1",
97101
expected: RegionNlAms,
98102
},
103+
{
104+
input: "pl-waw",
105+
expected: RegionPlWaw,
106+
},
99107
{
100108
input: "xx-xxx",
101109
expected: "xx-xxx",
102110
},
103111
{
104112
input: "fr-par-1",
105113
expected: "",
106-
err: errors.New("bad region format, available regions are: fr-par, nl-ams"),
114+
err: errors.New("bad region format, available regions are: fr-par, nl-ams, pl-waw"),
107115
},
108116
{
109117
input: "fr-pa1",
110118
expected: "",
111-
err: errors.New("bad region format, available regions are: fr-par, nl-ams"),
119+
err: errors.New("bad region format, available regions are: fr-par, nl-ams, pl-waw"),
112120
},
113121
}
114122

0 commit comments

Comments
 (0)