feat(block): add ams-2 in sbs localities (#4047)

scaleway-bot · web-flow · commit 3bdcce01f513 · 2024-08-21T10:01:32.000Z
diff --git a/cmd/scw/testdata/test-all-usage-block-snapshot-create-usage.golden b/cmd/scw/testdata/test-all-usage-block-snapshot-create-usage.golden
@@ -11,7 +11,7 @@ ARGS:
   [name]            Name of the snapshot
   [project-id]      Project ID to use. If none is passed the default project ID will be used
   [tags.{index}]    List of tags assigned to the snapshot
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for create
diff --git a/cmd/scw/testdata/test-all-usage-block-snapshot-delete-usage.golden b/cmd/scw/testdata/test-all-usage-block-snapshot-delete-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   snapshot-id       UUID of the snapshot
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for delete
diff --git a/cmd/scw/testdata/test-all-usage-block-snapshot-export-to-object-storage-usage.golden b/cmd/scw/testdata/test-all-usage-block-snapshot-export-to-object-storage-usage.golden
@@ -10,7 +10,7 @@ ARGS:
   snapshot-id       UUID of the snapshot
   [bucket]          Scaleway Object Storage bucket where the object is stored
   [key]             The object key inside the given bucket
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for export-to-object-storage
diff --git a/cmd/scw/testdata/test-all-usage-block-snapshot-get-usage.golden b/cmd/scw/testdata/test-all-usage-block-snapshot-get-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   snapshot-id       UUID of the snapshot
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for get
diff --git a/cmd/scw/testdata/test-all-usage-block-snapshot-list-usage.golden b/cmd/scw/testdata/test-all-usage-block-snapshot-list-usage.golden
@@ -11,7 +11,7 @@ ARGS:
   [volume-id]         Filter snapshots by the ID of the original volume
   [name]              Filter snapshots by their names
   [organization-id]   Filter by Organization ID
-  [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3 | all)
+  [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3 | all)
 
 FLAGS:
   -h, --help   help for list
diff --git a/cmd/scw/testdata/test-all-usage-block-snapshot-update-usage.golden b/cmd/scw/testdata/test-all-usage-block-snapshot-update-usage.golden
@@ -9,7 +9,7 @@ ARGS:
   snapshot-id       UUID of the snapshot
   [name]            When defined, is the name of the snapshot
   [tags.{index}]    List of tags assigned to the snapshot
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for update
diff --git a/cmd/scw/testdata/test-all-usage-block-volume-create-usage.golden b/cmd/scw/testdata/test-all-usage-block-volume-create-usage.golden
@@ -14,7 +14,7 @@ ARGS:
   [from-snapshot.size]          Volume size in bytes, with a granularity of 1 GB (10^9 bytes)
   [from-snapshot.snapshot-id]   Source snapshot from which volume will be created
   [tags.{index}]                List of tags assigned to the volume
-  [zone=fr-par-1]               Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3)
+  [zone=fr-par-1]               Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for create
diff --git a/cmd/scw/testdata/test-all-usage-block-volume-delete-usage.golden b/cmd/scw/testdata/test-all-usage-block-volume-delete-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   volume-id         UUID of the volume
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for delete
diff --git a/cmd/scw/testdata/test-all-usage-block-volume-get-usage.golden b/cmd/scw/testdata/test-all-usage-block-volume-get-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   volume-id         UUID of the volume
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for get
diff --git a/cmd/scw/testdata/test-all-usage-block-volume-list-usage.golden b/cmd/scw/testdata/test-all-usage-block-volume-list-usage.golden
@@ -11,7 +11,7 @@ ARGS:
   [name]                  Filter the return volumes by their names
   [product-resource-id]   Filter by a product resource ID linked to this volume (such as an Instance ID)
   [organization-id]       Filter by Organization ID
-  [zone=fr-par-1]         Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3 | all)
+  [zone=fr-par-1]         Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3 | all)
 
 FLAGS:
   -h, --help   help for list
diff --git a/cmd/scw/testdata/test-all-usage-block-volume-type-list-usage.golden b/cmd/scw/testdata/test-all-usage-block-volume-type-list-usage.golden
@@ -6,7 +6,7 @@ USAGE:
   scw block volume-type list [arg=value ...]
 
 ARGS:
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3 | all)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3 | all)
 
 FLAGS:
   -h, --help   help for list
diff --git a/cmd/scw/testdata/test-all-usage-block-volume-update-usage.golden b/cmd/scw/testdata/test-all-usage-block-volume-update-usage.golden
@@ -12,7 +12,7 @@ ARGS:
   [size]            Optional field for increasing the size of a volume (size must be equal or larger than the current one)
   [tags.{index}]    List of tags assigned to the volume
   [perf-iops]       The maximum IO/s expected, according to the different options available in stock (`5000 | 15000`)
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-3 | pl-waw-3)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for update
diff --git a/docs/commands/block.md b/docs/commands/block.md
@@ -44,7 +44,7 @@ scw block snapshot create [arg=value ...]
 | name |  | Name of the snapshot |
 | project-id |  | Project ID to use. If none is passed the default project ID will be used |
 | tags.{index} |  | List of tags assigned to the snapshot |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -64,7 +64,7 @@ scw block snapshot delete [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | snapshot-id | Required | UUID of the snapshot |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -87,7 +87,7 @@ scw block snapshot export-to-object-storage [arg=value ...]
 | snapshot-id | Required | UUID of the snapshot |
 | bucket |  | Scaleway Object Storage bucket where the object is stored |
 | key |  | The object key inside the given bucket |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -107,7 +107,7 @@ scw block snapshot get <snapshot-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | snapshot-id | Required | UUID of the snapshot |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -131,7 +131,7 @@ scw block snapshot list [arg=value ...]
 | volume-id |  | Filter snapshots by the ID of the original volume |
 | name |  | Filter snapshots by their names |
 | organization-id |  | Filter by Organization ID |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3`, `all` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3`, `all` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -153,7 +153,7 @@ scw block snapshot update <snapshot-id ...> [arg=value ...]
 | snapshot-id | Required | UUID of the snapshot |
 | name |  | When defined, is the name of the snapshot |
 | tags.{index} |  | List of tags assigned to the snapshot |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -185,7 +185,7 @@ scw block volume create [arg=value ...]
 | from-snapshot.size |  | Volume size in bytes, with a granularity of 1 GB (10^9 bytes) |
 | from-snapshot.snapshot-id |  | Source snapshot from which volume will be created |
 | tags.{index} |  | List of tags assigned to the volume |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -205,7 +205,7 @@ scw block volume delete [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | volume-id | Required | UUID of the volume |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -225,7 +225,7 @@ scw block volume get <volume-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | volume-id | Required | UUID of the volume |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -249,7 +249,7 @@ scw block volume list [arg=value ...]
 | name |  | Filter the return volumes by their names |
 | product-resource-id |  | Filter by a product resource ID linked to this volume (such as an Instance ID) |
 | organization-id |  | Filter by Organization ID |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3`, `all` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3`, `all` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -274,7 +274,7 @@ scw block volume update <volume-id ...> [arg=value ...]
 | size |  | Optional field for increasing the size of a volume (size must be equal or larger than the current one) |
 | tags.{index} |  | List of tags assigned to the volume |
 | perf-iops |  | The maximum IO/s expected, according to the different options available in stock (`5000 | 15000`) |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -298,7 +298,7 @@ scw block volume-type list [arg=value ...]
 
 | Name |   | Description |
 |------|---|-------------|
-| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-3`, `pl-waw-3`, `all` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-3`, `all` | Zone to target. If none is passed will use default zone from the config |
 
 
 
diff --git a/go.mod b/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/buildkit v0.13.2
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29.0.20240813142914-bca0b8891122
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29.0.20240820123014-cf7d79e86f7e
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
diff --git a/go.sum b/go.sum
@@ -465,8 +465,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29.0.20240813142914-bca0b8891122 h1:RSuHT+ZR1y1Jc2n8yqjzDeBsEGoY0cq2s0Pk4Ausx+U=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29.0.20240813142914-bca0b8891122/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29.0.20240820123014-cf7d79e86f7e h1:zHY4DTRBZTPm6Gm+Bs0l8xliPtuQNnha1cf2NQEWSUM=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29.0.20240820123014-cf7d79e86f7e/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
 github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=
diff --git a/internal/namespaces/block/v1alpha1/block_cli.go b/internal/namespaces/block/v1alpha1/block_cli.go
