feat(fip): add fr-par-1 and nl-ams-1 (#2240)

scaleway-bot · remyleone · web-flow · commit 04fda4adbbf5 · 2022-04-06T10:58:00.000+02:00
Co-authored-by: Rémy Léone &lt;rleone@scaleway.com&gt;
diff --git a/cmd/scw/testdata/test-all-usage-fip-ip-attach-usage.golden b/cmd/scw/testdata/test-all-usage-fip-ip-attach-usage.golden
@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   fips-ids.{index}   A list of Flexible IP IDs to attach
   server-id          A server ID on which to attach the Flexible IPs
-  [zone=fr-par-1]    Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [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)
 
 FLAGS:
   -h, --help   help for attach
diff --git a/cmd/scw/testdata/test-all-usage-fip-ip-create-usage.golden b/cmd/scw/testdata/test-all-usage-fip-ip-create-usage.golden
@@ -11,7 +11,7 @@ ARGS:
   [tags.{index}]    Tags to associate to the Flexible IP
   [server-id]       Server ID on which to attach the created Flexible IP
   [reverse]         Reverse DNS value
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [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)
 
 FLAGS:
   -h, --help   help for create
diff --git a/cmd/scw/testdata/test-all-usage-fip-ip-delete-usage.golden b/cmd/scw/testdata/test-all-usage-fip-ip-delete-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   fip-id            ID of the Flexible IP to delete
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [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)
 
 FLAGS:
   -h, --help   help for delete
diff --git a/cmd/scw/testdata/test-all-usage-fip-ip-detach-usage.golden b/cmd/scw/testdata/test-all-usage-fip-ip-detach-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   fips-ids.{index}   A list of Flexible IP IDs to detach
-  [zone=fr-par-1]    Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [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)
 
 FLAGS:
   -h, --help   help for detach
diff --git a/cmd/scw/testdata/test-all-usage-fip-ip-get-usage.golden b/cmd/scw/testdata/test-all-usage-fip-ip-get-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   fip-id            Flexible IP ID
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [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)
 
 FLAGS:
   -h, --help   help for get
diff --git a/cmd/scw/testdata/test-all-usage-fip-ip-list-usage.golden b/cmd/scw/testdata/test-all-usage-fip-ip-list-usage.golden
@@ -12,7 +12,7 @@ ARGS:
   [server-ids.{index}]   Filter Flexible IPs by server IDs
   [project-id]           Filter Flexible IPs by project ID
   [organization-id]      Filter Flexible IPs by organization ID
-  [zone=fr-par-1]        Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [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)
 
 FLAGS:
   -h, --help   help for list
diff --git a/cmd/scw/testdata/test-all-usage-fip-ip-update-usage.golden b/cmd/scw/testdata/test-all-usage-fip-ip-update-usage.golden
@@ -10,7 +10,7 @@ ARGS:
   [description]     Description to associate with the Flexible IP, max 255 characters
   [tags.{index}]    Tags to associate with the Flexible IP
   [reverse]         Reverse DNS value
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [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)
 
 FLAGS:
   -h, --help   help for update
diff --git a/cmd/scw/testdata/test-all-usage-fip-mac-create-usage.golden b/cmd/scw/testdata/test-all-usage-fip-mac-create-usage.golden
@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   fip-id            Flexible IP ID on which to generate a Virtual MAC
   mac-type          TODO (unknown_type | vmware | xen | kvm)
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [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)
 
 FLAGS:
   -h, --help   help for create
diff --git a/cmd/scw/testdata/test-all-usage-fip-mac-delete-usage.golden b/cmd/scw/testdata/test-all-usage-fip-mac-delete-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   fip-id            Flexible IP ID from which to delete the Virtual MAC
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [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)
 
 FLAGS:
   -h, --help   help for delete
diff --git a/cmd/scw/testdata/test-all-usage-fip-mac-duplicate-usage.golden b/cmd/scw/testdata/test-all-usage-fip-mac-duplicate-usage.golden
@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   fip-id                  Flexible IP ID on which to duplicate the Virtual MAC
   duplicate-from-fip-id   Flexible IP ID to duplicate the Virtual MAC from
-  [zone=fr-par-1]         Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [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)
 
 FLAGS:
   -h, --help   help for duplicate
diff --git a/docs/commands/fip.md b/docs/commands/fip.md
@@ -40,7 +40,7 @@ scw fip ip attach [arg=value ...]
 |------|---|-------------|
 | fips-ids.{index} | Required | A list of Flexible IP IDs to attach |
 | server-id | Required | A server ID on which to attach the Flexible IPs |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | 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` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -64,7 +64,7 @@ scw fip ip create [arg=value ...]
 | tags.{index} |  | Tags to associate to the Flexible IP |
 | server-id |  | Server ID on which to attach the created Flexible IP |
 | reverse |  | Reverse DNS value |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | 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` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -84,7 +84,7 @@ scw fip ip delete <fip-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | fip-id | Required | ID of the Flexible IP to delete |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | 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` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -104,7 +104,7 @@ scw fip ip detach [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | fips-ids.{index} | Required | A list of Flexible IP IDs to detach |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | 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` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -124,7 +124,7 @@ scw fip ip get <fip-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | fip-id | Required | Flexible IP ID |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | 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` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -149,7 +149,7 @@ scw fip ip list [arg=value ...]
 | server-ids.{index} |  | Filter Flexible IPs by server IDs |
 | project-id |  | Filter Flexible IPs by project ID |
 | organization-id |  | Filter Flexible IPs by organization ID |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | 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` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -172,7 +172,7 @@ scw fip ip update <fip-id ...> [arg=value ...]
 | description |  | Description to associate with the Flexible IP, max 255 characters |
 | tags.{index} |  | Tags to associate with the Flexible IP |
 | reverse |  | Reverse DNS value |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | 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` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -198,7 +198,7 @@ scw fip mac create [arg=value ...]
 |------|---|-------------|
 | fip-id | Required | Flexible IP ID on which to generate a Virtual MAC |
 | mac-type | Required<br />One of: `unknown_type`, `vmware`, `xen`, `kvm` | TODO |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | 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` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -218,7 +218,7 @@ scw fip mac delete [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | fip-id | Required | Flexible IP ID from which to delete the Virtual MAC |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | 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` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -239,7 +239,7 @@ scw fip mac duplicate [arg=value ...]
 |------|---|-------------|
 | fip-id | Required | Flexible IP ID on which to duplicate the Virtual MAC |
 | duplicate-from-fip-id | Required | Flexible IP ID to duplicate the Virtual MAC from |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | 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` | Zone to target. If none is passed will use default zone from the config |
 
 
 
diff --git a/internal/namespaces/flexibleip/v1alpha1/flexibleip_cli.go b/internal/namespaces/flexibleip/v1alpha1/flexibleip_cli.go
@@ -101,7 +101,7 @@ func fipIPCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*flexibleip.CreateFlexibleIPRequest)
@@ -131,7 +131,7 @@ func fipIPGet() *core.Command {
 				Deprecated: false,
 				Positional: true,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*flexibleip.GetFlexibleIPRequest)
@@ -198,7 +198,7 @@ func fipIPList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*flexibleip.ListFlexibleIPsRequest)
@@ -288,7 +288,7 @@ func fipIPUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*flexibleip.UpdateFlexibleIPRequest)
@@ -318,7 +318,7 @@ func fipIPDelete() *core.Command {
 				Deprecated: false,
 				Positional: true,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*flexibleip.DeleteFlexibleIPRequest)
@@ -361,7 +361,7 @@ func fipIPAttach() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*flexibleip.AttachFlexibleIPRequest)
@@ -391,7 +391,7 @@ func fipIPDetach() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*flexibleip.DetachFlexibleIPRequest)
@@ -429,7 +429,7 @@ func fipMacCreate() *core.Command {
 				Positional: false,
 				EnumValues: []string{"unknown_type", "vmware", "xen", "kvm"},
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*flexibleip.GenerateMACAddrRequest)
@@ -466,7 +466,7 @@ func fipMacDuplicate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*flexibleip.DuplicateMACAddrRequest)
@@ -496,7 +496,7 @@ func fipMacDelete() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*flexibleip.DeleteMACAddrRequest)
