Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(baremetal): add fr-par-1 and nl-ams-1 #1949

Merged
merged 4 commits into from
Jul 7, 2021
+42 −42
Merged

feat(baremetal): add fr-par-1 and nl-ams-1 #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a6e3fb
feat: update generated cli
scaleway-bot Jul 7, 2021
10348ea
Fix
remyleone Jul 7, 2021
d905437
Fix
remyleone Jul 7, 2021
d143f7c
Fix
remyleone Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-bmc-get-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ USAGE:

ARGS:
server-id ID of the server
[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
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-bmc-start-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ USAGE:
ARGS:
server-id ID of the server
ip The IP authorized to connect to the given server
[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 start
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-bmc-stop-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ USAGE:

ARGS:
server-id ID of the server
[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 stop
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-os-get-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ EXAMPLES:

ARGS:
os-id ID of the OS
[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
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-os-list-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ USAGE:

ARGS:
[offer-id] Filter OS by offer 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
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARGS:
[install.hostname]
[install.ssh-key-ids.{index}]
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
[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
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-server-delete-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ EXAMPLES:

ARGS:
server-id ID of the server 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
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-server-get-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ EXAMPLES:

ARGS:
server-id ID of the server
[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
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-server-install-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ARGS:
hostname Hostname of the server
[all-ssh-keys] Add all SSH keys on your baremetal instance (cannot be used with ssh-key-ids)
ssh-key-ids.{index} SSH key IDs authorized on the server (cannot be used with all-ssh-keys)
[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 install
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ARGS:
[name] Filter servers by name
[project-id] Filter servers by project ID
[organization-id] Filter servers 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
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-server-reboot-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ EXAMPLES:
ARGS:
server-id ID of the server to reboot
[boot-type=normal] The type of boot (unknown_boot_type | normal | rescue)
[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 reboot
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-server-start-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ EXAMPLES:
ARGS:
server-id ID of the server to start
[boot-type] The type of boot (unknown_boot_type | normal | rescue)
[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 start
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-server-stop-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ EXAMPLES:

ARGS:
server-id ID of the server to stop
[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 stop
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARGS:
[name] Name of the server (≠hostname), not updated if null
[description] Description associated to the server, max 255 characters, not updated if null
[tags.{index}] Tags associated to the server, not updated if null
[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
Expand Down
28 changes: 14 additions & 14 deletions docs/commands/baremetal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ scw baremetal bmc get [arg=value ...]
| Name | | Description |
|------|---|-------------|
| server-id | Required | ID of the server |
| 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 |



Expand All @@ -68,7 +68,7 @@ scw baremetal bmc start [arg=value ...]
|------|---|-------------|
| server-id | Required | ID of the server |
| ip | Required | The IP authorized to connect to the given server |
| 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 |



Expand All @@ -88,7 +88,7 @@ scw baremetal bmc stop [arg=value ...]
| Name | | Description |
|------|---|-------------|
| server-id | Required | ID of the server |
| 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 |



Expand All @@ -113,7 +113,7 @@ scw baremetal os get <os-id ...> [arg=value ...]
| Name | | Description |
|------|---|-------------|
| os-id | Required | ID of the OS |
| 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 |


**Examples:**
Expand Down Expand Up @@ -143,7 +143,7 @@ scw baremetal os list [arg=value ...]
| Name | | Description |
|------|---|-------------|
| offer-id | | Filter OS by offer 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 |



Expand Down Expand Up @@ -176,7 +176,7 @@ scw baremetal server create [arg=value ...]
| install.hostname | | |
| install.ssh-key-ids.{index} | | |
| organization-id | | Organization ID to use. If none is passed the default organization ID will be used |
| 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 |


**Examples:**
Expand Down Expand Up @@ -211,7 +211,7 @@ scw baremetal server delete <server-id ...> [arg=value ...]
| Name | | Description |
|------|---|-------------|
| server-id | Required | ID of the server 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 |


**Examples:**
Expand Down Expand Up @@ -241,7 +241,7 @@ scw baremetal server get <server-id ...> [arg=value ...]
| Name | | Description |
|------|---|-------------|
| server-id | Required | ID of the server |
| 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 |


**Examples:**
Expand Down Expand Up @@ -275,7 +275,7 @@ scw baremetal server install <server-id ...> [arg=value ...]
| hostname | Required | Hostname of the server |
| all-ssh-keys | | Add all SSH keys on your baremetal instance (cannot be used with ssh-key-ids) |
| ssh-key-ids.{index} | Required | SSH key IDs authorized on the server (cannot be used with all-ssh-keys) |
| 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 |


**Examples:**
Expand Down Expand Up @@ -310,7 +310,7 @@ scw baremetal server list [arg=value ...]
| name | | Filter servers by name |
| project-id | | Filter servers by project ID |
| organization-id | | Filter servers 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 |


**Examples:**
Expand Down Expand Up @@ -341,7 +341,7 @@ scw baremetal server reboot <server-id ...> [arg=value ...]
|------|---|-------------|
| server-id | Required | ID of the server to reboot |
| boot-type | Default: `normal`<br />One of: `unknown_boot_type`, `normal`, `rescue` | The type of boot |
| 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 |


**Examples:**
Expand Down Expand Up @@ -377,7 +377,7 @@ scw baremetal server start <server-id ...> [arg=value ...]
|------|---|-------------|
| server-id | Required | ID of the server to start |
| boot-type | One of: `unknown_boot_type`, `normal`, `rescue` | The type of boot |
| 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 |


**Examples:**
Expand Down Expand Up @@ -412,7 +412,7 @@ scw baremetal server stop <server-id ...> [arg=value ...]
| Name | | Description |
|------|---|-------------|
| server-id | Required | ID of the server to stop |
| 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 |


**Examples:**
Expand Down Expand Up @@ -445,7 +445,7 @@ scw baremetal server update <server-id ...> [arg=value ...]
| name | | Name of the server (≠hostname), not updated if null |
| description | | Description associated to the server, max 255 characters, not updated if null |
| tags.{index} | | Tags associated to the server, not updated if null |
| 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 |



Expand Down
28 changes: 14 additions & 14 deletions internal/namespaces/baremetal/v1/baremetal_cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func baremetalServerList() *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.(*baremetal.ListServersRequest)
Expand Down Expand Up @@ -169,7 +169,7 @@ func baremetalServerGet() *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.(*baremetal.GetServerRequest)
Expand Down Expand Up @@ -246,7 +246,7 @@ func baremetalServerCreate() *core.Command {
Positional: false,
},
core.OrganizationIDArgSpec(),
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.(*baremetal.CreateServerRequest)
Expand Down Expand Up @@ -303,7 +303,7 @@ func baremetalServerUpdate() *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.(*baremetal.UpdateServerRequest)
Expand Down Expand Up @@ -354,7 +354,7 @@ func baremetalServerInstall() *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.(*baremetal.InstallServerRequest)
Expand Down Expand Up @@ -404,7 +404,7 @@ func baremetalServerDelete() *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.(*baremetal.DeleteServerRequest)
Expand Down Expand Up @@ -448,7 +448,7 @@ func baremetalServerReboot() *core.Command {
Positional: false,
EnumValues: []string{"unknown_boot_type", "normal", "rescue"},
},
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.(*baremetal.RebootServerRequest)
Expand Down Expand Up @@ -496,7 +496,7 @@ func baremetalServerStart() *core.Command {
Positional: false,
EnumValues: []string{"unknown_boot_type", "normal", "rescue"},
},
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.(*baremetal.StartServerRequest)
Expand Down Expand Up @@ -536,7 +536,7 @@ func baremetalServerStop() *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.(*baremetal.StopServerRequest)
Expand Down Expand Up @@ -581,7 +581,7 @@ The BMC (Baseboard Management Controller) access is available one hour after the
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.(*baremetal.StartBMCAccessRequest)
Expand Down Expand Up @@ -611,7 +611,7 @@ func baremetalBmcGet() *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.(*baremetal.GetBMCAccessRequest)
Expand Down Expand Up @@ -641,7 +641,7 @@ func baremetalBmcStop() *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.(*baremetal.StopBMCAccessRequest)
Expand Down Expand Up @@ -677,7 +677,7 @@ func baremetalOsList() *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.(*baremetal.ListOSRequest)
Expand Down Expand Up @@ -711,7 +711,7 @@ func baremetalOsGet() *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.(*baremetal.GetOSRequest)
Expand Down