Skip to content

Commit 8c22160

Browse files
scaleway-botremyleone
scaleway-bot
and
remyleone
authored
feat(vpc): add support for nl-ams-3 (#3216)
Co-authored-by: Rémy Léone <rleone@scaleway.com>
1 parent d567ec3 commit 8c22160

9 files changed

Lines changed: 18 additions & 18 deletions

‎cmd/scw/testdata/test-all-usage-vpc-private-network-create-usage.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARGS:
1010
[project-id] Project ID to use. If none is passed the default project ID will be used
1111
[tags.{index}] Tags for the Private Network
1212
[subnets.{index}] Private Network subnets CIDR
13-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | pl-waw-1 | pl-waw-2)
13+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2)
1414

1515
FLAGS:
1616
-h, --help help for create

‎cmd/scw/testdata/test-all-usage-vpc-private-network-delete-usage.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ USAGE:
77

88
ARGS:
99
private-network-id Private Network ID
10-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | pl-waw-1 | pl-waw-2)
10+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2)
1111

1212
FLAGS:
1313
-h, --help help for delete

‎cmd/scw/testdata/test-all-usage-vpc-private-network-get-usage.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ USAGE:
77

88
ARGS:
99
private-network-id Private Network ID
10-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | pl-waw-1 | pl-waw-2)
10+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2)
1111

1212
FLAGS:
1313
-h, --help help for get

‎cmd/scw/testdata/test-all-usage-vpc-private-network-list-usage.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARGS:
1313
[private-network-ids.{index}] Private Network IDs to filter for. Only Private Networks with one of these IDs will be returned
1414
[include-regional] Defines whether to include regional Private Networks in the response
1515
[organization-id] Organization ID to filter for. Only Private Networks belonging to this Organization will be returned
16-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | pl-waw-1 | pl-waw-2 | all)
16+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | all)
1717

1818
FLAGS:
1919
-h, --help help for list

‎cmd/scw/testdata/test-all-usage-vpc-private-network-update-usage.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARGS:
99
private-network-id Private Network ID
1010
[name] Name of the private network
1111
[tags.{index}] Tags for the Private Network
12-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | pl-waw-1 | pl-waw-2)
12+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2)
1313

1414
DEPRECATED ARGS:
1515
[subnets.{index}] Private Network subnets CIDR (deprecated)

‎docs/commands/vpc.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ scw vpc private-network create [arg=value ...]
3838
| project-id | | Project ID to use. If none is passed the default project ID will be used |
3939
| tags.{index} | | Tags for the Private Network |
4040
| subnets.{index} | | Private Network subnets CIDR |
41-
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `pl-waw-1`, `pl-waw-2` | Zone to target. If none is passed will use default zone from the config |
41+
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2` | Zone to target. If none is passed will use default zone from the config |
4242

4343

4444

@@ -58,7 +58,7 @@ scw vpc private-network delete <private-network-id ...> [arg=value ...]
5858
| Name | | Description |
5959
|------|---|-------------|
6060
| private-network-id | Required | Private Network ID |
61-
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `pl-waw-1`, `pl-waw-2` | Zone to target. If none is passed will use default zone from the config |
61+
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2` | Zone to target. If none is passed will use default zone from the config |
6262

6363

6464

@@ -78,7 +78,7 @@ scw vpc private-network get <private-network-id ...> [arg=value ...]
7878
| Name | | Description |
7979
|------|---|-------------|
8080
| private-network-id | Required | Private Network ID |
81-
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `pl-waw-1`, `pl-waw-2` | Zone to target. If none is passed will use default zone from the config |
81+
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2` | Zone to target. If none is passed will use default zone from the config |
8282

8383

8484

@@ -104,7 +104,7 @@ scw vpc private-network list [arg=value ...]
104104
| private-network-ids.{index} | | Private Network IDs to filter for. Only Private Networks with one of these IDs will be returned |
105105
| include-regional | | Defines whether to include regional Private Networks in the response |
106106
| organization-id | | Organization ID to filter for. Only Private Networks belonging to this Organization will be returned |
107-
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `pl-waw-1`, `pl-waw-2`, `all` | Zone to target. If none is passed will use default zone from the config |
107+
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `all` | Zone to target. If none is passed will use default zone from the config |
108108

109109

110110

@@ -127,7 +127,7 @@ scw vpc private-network update <private-network-id ...> [arg=value ...]
127127
| name | | Name of the private network |
128128
| tags.{index} | | Tags for the Private Network |
129129
| ~~subnets.{index}~~ | Deprecated | Private Network subnets CIDR (deprecated) |
130-
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `pl-waw-1`, `pl-waw-2` | Zone to target. If none is passed will use default zone from the config |
130+
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2` | Zone to target. If none is passed will use default zone from the config |
131131

132132

133133

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/moby/buildkit v0.11.6
2525
github.com/opencontainers/go-digest v1.0.0
2626
github.com/pkg/errors v0.9.1
27-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230614082651-fe2d7c3919ef
27+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230614162946-6279e7999742
2828
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2929
github.com/spf13/cobra v1.7.0
3030
github.com/spf13/pflag v1.0.5

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,8 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj
497497
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
498498
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
499499
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
500-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230614082651-fe2d7c3919ef h1:Smd/J3crAmvykVQjq3Qe+1rX9LnW2uaNUDZailS+pbI=
501-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230614082651-fe2d7c3919ef/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
500+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230614162946-6279e7999742 h1:tYilRVnAW/yYmlMOmMrU1zZuIPcCuNmpLmnHXMZV1vs=
501+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230614162946-6279e7999742/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
502502
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
503503
github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=
504504
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=

‎internal/namespaces/vpc/v1/vpc_cli.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func vpcPrivateNetworkList() *core.Command {
109109
Deprecated: false,
110110
Positional: false,
111111
},
112-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.Zone(core.AllLocalities)),
112+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.Zone(core.AllLocalities)),
113113
},
114114
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
115115
request := args.(*vpc.ListPrivateNetworksRequest)
@@ -164,7 +164,7 @@ func vpcPrivateNetworkCreate() *core.Command {
164164
Deprecated: false,
165165
Positional: false,
166166
},
167-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZonePlWaw1, scw.ZonePlWaw2),
167+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2),
168168
},
169169
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
170170
request := args.(*vpc.CreatePrivateNetworkRequest)
@@ -194,7 +194,7 @@ func vpcPrivateNetworkGet() *core.Command {
194194
Deprecated: false,
195195
Positional: true,
196196
},
197-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZonePlWaw1, scw.ZonePlWaw2),
197+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2),
198198
},
199199
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
200200
request := args.(*vpc.GetPrivateNetworkRequest)
@@ -245,7 +245,7 @@ func vpcPrivateNetworkUpdate() *core.Command {
245245
Deprecated: true,
246246
Positional: false,
247247
},
248-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZonePlWaw1, scw.ZonePlWaw2),
248+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2),
249249
},
250250
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
251251
request := args.(*vpc.UpdatePrivateNetworkRequest)
@@ -275,7 +275,7 @@ func vpcPrivateNetworkDelete() *core.Command {
275275
Deprecated: false,
276276
Positional: true,
277277
},
278-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZonePlWaw1, scw.ZonePlWaw2),
278+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2),
279279
},
280280
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
281281
request := args.(*vpc.DeletePrivateNetworkRequest)

0 commit comments

Comments
 (0)