Skip to content

Commit 2fbb577

Browse files
fix(efp): add support for zone value
1 parent 583409c commit 2fbb577

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

scw/client_option_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func TestClientOptions(t *testing.T) {
143143
s.token = auth.NewToken(testAccessKey, testSecretKey)
144144
s.defaultZone = &v
145145
},
146-
errStr: "scaleway-sdk-go: invalid default zone format 'invalid', available zones are: fr-par-1, fr-par-2, fr-par-3, nl-ams-1, nl-ams-2, nl-ams-3, pl-waw-1, pl-waw-2, pl-waw-3, it-mil-1",
146+
errStr: "scaleway-sdk-go: invalid default zone format 'invalid', available zones are: fr-par-1, fr-par-2, fr-par-3, nl-ams-1, nl-ams-2, nl-ams-3, pl-waw-1, pl-waw-2, pl-waw-3, it-mil-1, multi-az",
147147
},
148148
}
149149

scw/locality.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ const (
3737
ZonePlWaw3 = Zone("pl-waw-3")
3838
// ZoneItMil1 represents the it-mil-1 zone
3939
ZoneItMil1 = Zone("it-mil-1")
40+
// ZoneMultiAZ represents multi-az (multiple zones)
41+
ZoneMultiAZ = Zone("multi-az")
4042
)
4143

4244
// AllZones is an array that list all zones
@@ -51,6 +53,7 @@ var AllZones = []Zone{
5153
ZonePlWaw2,
5254
ZonePlWaw3,
5355
ZoneItMil1,
56+
ZoneMultiAZ,
5457
}
5558

5659
// Exists checks whether a zone exists
@@ -138,6 +141,9 @@ func ParseZone(zone string) (Zone, error) {
138141
// would be triggered by API market place
139142
// logger.Warningf("ams1 is a deprecated name for zone, use nl-ams-1 instead")
140143
return ZoneNlAms1, nil
144+
case "multi-az":
145+
// would be triggered by API environmental footprint
146+
return ZoneMultiAZ, nil
141147
default:
142148
if !validation.IsZone(zone) {
143149
zones := []string(nil)

scw/locality_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ func TestParseZone(t *testing.T) {
5757
{
5858
input: "fr-par",
5959
expected: "",
60-
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, fr-par-3, nl-ams-1, nl-ams-2, nl-ams-3, pl-waw-1, pl-waw-2, pl-waw-3, it-mil-1"),
60+
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, fr-par-3, nl-ams-1, nl-ams-2, nl-ams-3, pl-waw-1, pl-waw-2, pl-waw-3, it-mil-1, multi-az"),
6161
},
6262
{
6363
input: "fr-par-n",
6464
expected: "",
65-
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, fr-par-3, nl-ams-1, nl-ams-2, nl-ams-3, pl-waw-1, pl-waw-2, pl-waw-3, it-mil-1"),
65+
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, fr-par-3, nl-ams-1, nl-ams-2, nl-ams-3, pl-waw-1, pl-waw-2, pl-waw-3, it-mil-1, multi-az"),
6666
},
6767
{
6868
input: "fr-par-200",
6969
expected: "",
70-
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, fr-par-3, nl-ams-1, nl-ams-2, nl-ams-3, pl-waw-1, pl-waw-2, pl-waw-3, it-mil-1"),
70+
err: errors.New("bad zone format, available zones are: fr-par-1, fr-par-2, fr-par-3, nl-ams-1, nl-ams-2, nl-ams-3, pl-waw-1, pl-waw-2, pl-waw-3, it-mil-1, multi-az"),
7171
},
7272
}
7373

0 commit comments

Comments
 (0)