From 5beaceb281a8194bbfe8b2d29aa2c9b102638629 Mon Sep 17 00:00:00 2001 From: lmasson Date: Thu, 27 Jun 2024 11:19:58 +0200 Subject: [PATCH 1/5] fix(dedibox): set default value project-id --- internal/namespaces/dedibox/v1/custom.go | 40 +++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/internal/namespaces/dedibox/v1/custom.go b/internal/namespaces/dedibox/v1/custom.go index 73e59a5abb..770cca1c28 100644 --- a/internal/namespaces/dedibox/v1/custom.go +++ b/internal/namespaces/dedibox/v1/custom.go @@ -1,9 +1,47 @@ package dedibox -import "github.com/scaleway/scaleway-cli/v2/internal/core" +import ( + "context" + "github.com/scaleway/scaleway-cli/v2/internal/core" +) func GetCommands() *core.Commands { cmds := GetGeneratedCommands() + for _, commandPath := range [][]string{ + {"dedibox", "server", "list"}, + {"dedibox", "service", "list"}, + {"dedibox", "offer", "list"}, + {"dedibox", "offer", "get"}, + {"dedibox", "os", "list"}, + {"dedibox", "os", "get"}, + {"dedibox", "fip", "list"}, + {"dedibox", "fip", "get-quota"}, + {"dedibox", "billing", "list-invoice"}, + {"dedibox", "billing", "list-refund"}, + {"dedibox", "ipv6-block", "get-quota"}, + {"dedibox", "ipv6-block", "create"}, + {"dedibox", "ipv6-block", "get"}, + {"dedibox", "rpn-info", "list"}, + {"dedibox", "rpn-info", "get"}, + {"dedibox", "san", "list"}, + {"dedibox", "rpn-v1", "list"}, + {"dedibox", "rpn-v1", "list-members"}, + {"dedibox", "rpn-v1", "list-capable-server"}, + {"dedibox", "rpn-v1", "list-capable-san-server"}, + {"dedibox", "rpn-v2", "list"}, + {"dedibox", "rpn-v2", "list-capable-resources"}, + } { + cmds.MustFind(commandPath...).Override(setProjectDefaultValue) + } + return cmds } + +func setProjectDefaultValue(c *core.Command) *core.Command { + c.ArgSpecs.GetByName("project-id").Default = func(ctx context.Context) (value string, doc string) { + projectID := core.GetProjectIDFromContext(ctx) + return projectID, "" + } + return c +} From be3cc19bde0cc5edfae017aa6596256151d5fa5b Mon Sep 17 00:00:00 2001 From: lmasson Date: Thu, 27 Jun 2024 11:25:05 +0200 Subject: [PATCH 2/5] add test AllUsages --- ...-dedibox-billing-list-invoice-usage.golden | 4 ++-- ...e-dedibox-billing-list-refund-usage.golden | 4 ++-- ...l-usage-dedibox-fip-get-quota-usage.golden | 4 ++-- ...st-all-usage-dedibox-fip-list-usage.golden | 10 +++++----- ...age-dedibox-ipv6-block-create-usage.golden | 2 +- ...-dedibox-ipv6-block-get-quota-usage.golden | 2 +- ...-usage-dedibox-ipv6-block-get-usage.golden | 2 +- ...t-all-usage-dedibox-offer-get-usage.golden | 6 +++--- ...-all-usage-dedibox-offer-list-usage.golden | 20 +++++++++---------- ...test-all-usage-dedibox-os-get-usage.golden | 8 ++++---- ...est-all-usage-dedibox-os-list-usage.golden | 10 +++++----- ...ll-usage-dedibox-rpn-info-get-usage.golden | 6 +++--- ...l-usage-dedibox-rpn-info-list-usage.golden | 4 ++-- ...pn-v1-list-capable-san-server-usage.golden | 4 ++-- ...ox-rpn-v1-list-capable-server-usage.golden | 4 ++-- ...e-dedibox-rpn-v1-list-members-usage.golden | 6 +++--- ...all-usage-dedibox-rpn-v1-list-usage.golden | 4 ++-- ...rpn-v2-list-capable-resources-usage.golden | 4 ++-- ...all-usage-dedibox-rpn-v2-list-usage.golden | 4 ++-- ...st-all-usage-dedibox-san-list-usage.golden | 4 ++-- ...all-usage-dedibox-server-list-usage.golden | 8 ++++---- ...ll-usage-dedibox-service-list-usage.golden | 6 +++--- 22 files changed, 63 insertions(+), 63 deletions(-) diff --git a/cmd/scw/testdata/test-all-usage-dedibox-billing-list-invoice-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-billing-list-invoice-usage.golden index e0ca53521f..fd45d28efc 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-billing-list-invoice-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-billing-list-invoice-usage.golden @@ -6,8 +6,8 @@ USAGE: scw dedibox billing list-invoice [arg=value ...] ARGS: - [order-by] (created_at_asc | created_at_desc) - [project-id] + [order-by] (created_at_asc | created_at_desc) + [project-id=] FLAGS: -h, --help help for list-invoice diff --git a/cmd/scw/testdata/test-all-usage-dedibox-billing-list-refund-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-billing-list-refund-usage.golden index b96a01d189..aede9a7dbb 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-billing-list-refund-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-billing-list-refund-usage.golden @@ -6,8 +6,8 @@ USAGE: scw dedibox billing list-refund [arg=value ...] ARGS: - [order-by] (created_at_asc | created_at_desc) - [project-id] + [order-by] (created_at_asc | created_at_desc) + [project-id=] FLAGS: -h, --help help for list-refund diff --git a/cmd/scw/testdata/test-all-usage-dedibox-fip-get-quota-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-fip-get-quota-usage.golden index 7fd6e061fd..d2e5c418b2 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-fip-get-quota-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-fip-get-quota-usage.golden @@ -6,8 +6,8 @@ USAGE: scw dedibox fip get-quota [arg=value ...] ARGS: - [project-id] Project 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) + [project-id=] Project 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) FLAGS: -h, --help help for get-quota diff --git a/cmd/scw/testdata/test-all-usage-dedibox-fip-list-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-fip-list-usage.golden index 583d28019c..0900cbb39d 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-fip-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-fip-list-usage.golden @@ -6,11 +6,11 @@ USAGE: scw dedibox fip list [arg=value ...] ARGS: - [order-by] Order of the failovers IP (ip_asc | ip_desc) - project-id Filter failovers IP by project ID - [search] Filter failovers IP which matching with this field - [only-available] True: return all failovers IP not attached on server - [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 | all) + [order-by] Order of the failovers IP (ip_asc | ip_desc) + project-id= Filter failovers IP by project ID + [search] Filter failovers IP which matching with this field + [only-available] True: return all failovers IP not attached on server + [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 | all) FLAGS: -h, --help help for list diff --git a/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-create-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-create-usage.golden index 99c4dce7fd..f87c513690 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-create-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-create-usage.golden @@ -6,7 +6,7 @@ USAGE: scw dedibox ipv6-block create [arg=value ...] ARGS: - [project-id] ID of the project + [project-id=] ID of the project FLAGS: -h, --help help for create diff --git a/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-get-quota-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-get-quota-usage.golden index 38b4316286..57d002963e 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-get-quota-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-get-quota-usage.golden @@ -9,7 +9,7 @@ USAGE: scw dedibox ipv6-block get-quota [arg=value ...] ARGS: - [project-id] ID of the project + [project-id=] ID of the project FLAGS: -h, --help help for get-quota diff --git a/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-get-usage.golden index 5d9e3bab2c..4342077525 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-get-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-ipv6-block-get-usage.golden @@ -6,7 +6,7 @@ USAGE: scw dedibox ipv6-block get [arg=value ...] ARGS: - [project-id] ID of the project + [project-id=] ID of the project FLAGS: -h, --help help for get diff --git a/cmd/scw/testdata/test-all-usage-dedibox-offer-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-offer-get-usage.golden index 0e0fb2a5d4..780fe13813 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-offer-get-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-offer-get-usage.golden @@ -6,9 +6,9 @@ USAGE: scw dedibox offer get [arg=value ...] ARGS: - offer-id ID of offer - [project-id] Project 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) + offer-id ID of offer + [project-id=] Project 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) FLAGS: -h, --help help for get diff --git a/cmd/scw/testdata/test-all-usage-dedibox-offer-list-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-offer-list-usage.golden index 039a0db63e..878217184d 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-offer-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-offer-list-usage.golden @@ -6,16 +6,16 @@ USAGE: scw dedibox offer list [arg=value ...] ARGS: - [order-by] Order of the offers (created_at_asc | created_at_desc | name_asc | name_desc | price_asc | price_desc) - [commercial-range] Filter on commercial range - [catalog] Filter on catalog (all | default | beta | reseller | premium | volume | admin | inactive) - [project-id] Project ID - [is-failover-ip] Get the current failover IP offer - [is-failover-block] Get the current failover IP block offer - [sold-in] Filter offers depending on their datacenter - [available-only] Set this filter to true to only return available offers - [is-rpn-san] Get the RPN SAN offers - [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 | all) + [order-by] Order of the offers (created_at_asc | created_at_desc | name_asc | name_desc | price_asc | price_desc) + [commercial-range] Filter on commercial range + [catalog] Filter on catalog (all | default | beta | reseller | premium | volume | admin | inactive) + [project-id=] Project ID + [is-failover-ip] Get the current failover IP offer + [is-failover-block] Get the current failover IP block offer + [sold-in] Filter offers depending on their datacenter + [available-only] Set this filter to true to only return available offers + [is-rpn-san] Get the RPN SAN offers + [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 | all) FLAGS: -h, --help help for list diff --git a/cmd/scw/testdata/test-all-usage-dedibox-os-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-os-get-usage.golden index 21f1f393ba..4890d3729d 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-os-get-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-os-get-usage.golden @@ -6,10 +6,10 @@ USAGE: scw dedibox os get [arg=value ...] ARGS: - os-id ID of the OS - [server-id] ID of the server - [project-id] Project 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) + os-id ID of the OS + [server-id] ID of the server + [project-id=] Project 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) FLAGS: -h, --help help for get diff --git a/cmd/scw/testdata/test-all-usage-dedibox-os-list-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-os-list-usage.golden index 87e3bb5a47..e09ff1672e 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-os-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-os-list-usage.golden @@ -6,11 +6,11 @@ USAGE: scw dedibox os list [arg=value ...] ARGS: - [order-by] Order of the OS (created_at_asc | created_at_desc | released_at_asc | released_at_desc) - [type] Type of the OS (unknown_type | server | virtu | panel | desktop | custom | rescue) - [server-id] Filter OS by compatible server ID - [project-id] Project 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 | all) + [order-by] Order of the OS (created_at_asc | created_at_desc | released_at_asc | released_at_desc) + [type] Type of the OS (unknown_type | server | virtu | panel | desktop | custom | rescue) + [server-id] Filter OS by compatible server ID + [project-id=] Project 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 | all) FLAGS: -h, --help help for list diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-info-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-info-get-usage.golden index 8b072f328d..3b63b66780 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-info-get-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-info-get-usage.golden @@ -6,9 +6,9 @@ USAGE: scw dedibox rpn-info get [arg=value ...] ARGS: - [project-id] A project ID - [rpnv1-group-id] An RPN v1 group ID - [rpnv2-group-id] An RPN v2 group ID + [project-id=] A project ID + [rpnv1-group-id] An RPN v1 group ID + [rpnv2-group-id] An RPN v2 group ID FLAGS: -h, --help help for get diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-info-list-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-info-list-usage.golden index 8af0a8f2f6..a05fa6b33e 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-info-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-info-list-usage.golden @@ -6,8 +6,8 @@ USAGE: scw dedibox rpn-info list [arg=value ...] ARGS: - [order-by] Order of the servers (created_at_asc | created_at_desc) - [project-id] Filter servers by project ID + [order-by] Order of the servers (created_at_asc | created_at_desc) + [project-id=] Filter servers by project ID FLAGS: -h, --help help for list diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-capable-san-server-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-capable-san-server-usage.golden index 7de3d5edcd..81abe6913d 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-capable-san-server-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-capable-san-server-usage.golden @@ -6,8 +6,8 @@ USAGE: scw dedibox rpn-v1 list-capable-san-server [arg=value ...] ARGS: - [order-by] Order of the rpn capable resources (created_at_asc | created_at_desc) - [project-id] Filter rpn capable resources by project ID + [order-by] Order of the rpn capable resources (created_at_asc | created_at_desc) + [project-id=] Filter rpn capable resources by project ID FLAGS: -h, --help help for list-capable-san-server diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-capable-server-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-capable-server-usage.golden index fb0fad6c24..772ba1c881 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-capable-server-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-capable-server-usage.golden @@ -6,8 +6,8 @@ USAGE: scw dedibox rpn-v1 list-capable-server [arg=value ...] ARGS: - [order-by] Order of the rpn capable resources (created_at_asc | created_at_desc) - [project-id] Filter rpn capable resources by project ID + [order-by] Order of the rpn capable resources (created_at_asc | created_at_desc) + [project-id=] Filter rpn capable resources by project ID FLAGS: -h, --help help for list-capable-server diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-members-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-members-usage.golden index 90ca8922f5..3dfc1b53a4 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-members-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-members-usage.golden @@ -6,9 +6,9 @@ USAGE: scw dedibox rpn-v1 list-members [arg=value ...] ARGS: - [order-by] Order of the rpn v1 group members (created_at_asc | created_at_desc) - group-id Filter rpn v1 group members by group ID - [project-id] A project ID + [order-by] Order of the rpn v1 group members (created_at_asc | created_at_desc) + group-id Filter rpn v1 group members by group ID + [project-id=] A project ID FLAGS: -h, --help help for list-members diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-usage.golden index 306078de06..daafa2622e 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-list-usage.golden @@ -6,8 +6,8 @@ USAGE: scw dedibox rpn-v1 list [arg=value ...] ARGS: - [order-by] Order of the rpn v1 groups (created_at_asc | created_at_desc) - [project-id] Filter rpn v1 groups by project ID + [order-by] Order of the rpn v1 groups (created_at_asc | created_at_desc) + [project-id=] Filter rpn v1 groups by project ID FLAGS: -h, --help help for list diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-list-capable-resources-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-list-capable-resources-usage.golden index 73516cc2e8..7f208654ba 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-list-capable-resources-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-list-capable-resources-usage.golden @@ -6,8 +6,8 @@ USAGE: scw dedibox rpn-v2 list-capable-resources [arg=value ...] ARGS: - [order-by] Order of the rpn v2 capable resources (created_at_asc | created_at_desc) - [project-id] Filter rpn v2 capable resources by project ID + [order-by] Order of the rpn v2 capable resources (created_at_asc | created_at_desc) + [project-id=] Filter rpn v2 capable resources by project ID FLAGS: -h, --help help for list-capable-resources diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-list-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-list-usage.golden index 7bc39d020c..ecda6c2424 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-list-usage.golden @@ -6,8 +6,8 @@ USAGE: scw dedibox rpn-v2 list [arg=value ...] ARGS: - [order-by] Order of the rpn v2 groups (created_at_asc | created_at_desc) - [project-id] Filter rpn v2 groups by project ID + [order-by] Order of the rpn v2 groups (created_at_asc | created_at_desc) + [project-id=] Filter rpn v2 groups by project ID FLAGS: -h, --help help for list diff --git a/cmd/scw/testdata/test-all-usage-dedibox-san-list-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-san-list-usage.golden index e7b0396ada..d5ff88181a 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-san-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-san-list-usage.golden @@ -6,8 +6,8 @@ USAGE: scw dedibox san list [arg=value ...] ARGS: - [order-by] Order of the RPN SANs (created_at_asc | created_at_desc) - [project-id] Filter RPN SANs by project ID + [order-by] Order of the RPN SANs (created_at_asc | created_at_desc) + [project-id=] Filter RPN SANs by project ID FLAGS: -h, --help help for list diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-list-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-list-usage.golden index 8fc95773f8..404cf698f3 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-server-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-server-list-usage.golden @@ -6,10 +6,10 @@ USAGE: scw dedibox server list [arg=value ...] ARGS: - [order-by] Order of the servers (created_at_asc | created_at_desc) - project-id Filter servers by project ID - [search] Filter servers by hostname - [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 | all) + [order-by] Order of the servers (created_at_asc | created_at_desc) + project-id= Filter servers by project ID + [search] Filter servers by hostname + [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 | all) FLAGS: -h, --help help for list diff --git a/cmd/scw/testdata/test-all-usage-dedibox-service-list-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-service-list-usage.golden index cdec544854..27b2dc032d 100644 --- a/cmd/scw/testdata/test-all-usage-dedibox-service-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dedibox-service-list-usage.golden @@ -6,9 +6,9 @@ USAGE: scw dedibox service list [arg=value ...] ARGS: - [order-by] Order of the services (created_at_asc | created_at_desc) - [project-id] Project 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 | all) + [order-by] Order of the services (created_at_asc | created_at_desc) + [project-id=] Project 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 | all) FLAGS: -h, --help help for list From 9ffa1f37dac6874f44cae8cc5ca581bcce049ee8 Mon Sep 17 00:00:00 2001 From: lmasson Date: Thu, 27 Jun 2024 11:28:59 +0200 Subject: [PATCH 3/5] lint --- internal/namespaces/dedibox/v1/custom.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/namespaces/dedibox/v1/custom.go b/internal/namespaces/dedibox/v1/custom.go index 770cca1c28..0c5b4f3aa3 100644 --- a/internal/namespaces/dedibox/v1/custom.go +++ b/internal/namespaces/dedibox/v1/custom.go @@ -2,6 +2,7 @@ package dedibox import ( "context" + "github.com/scaleway/scaleway-cli/v2/internal/core" ) From e28023668db42536fb903f30eed568d99d7aad0d Mon Sep 17 00:00:00 2001 From: lmasson Date: Thu, 27 Jun 2024 11:38:34 +0200 Subject: [PATCH 4/5] fix issue doc --- docs/commands/autocomplete.md | 2 +- docs/commands/dedibox.md | 44 +++++++++++++++++------------------ internal/core/context.go | 5 +--- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/docs/commands/autocomplete.md b/docs/commands/autocomplete.md index 95f1777fb1..bb92628259 100644 --- a/docs/commands/autocomplete.md +++ b/docs/commands/autocomplete.md @@ -45,7 +45,7 @@ scw autocomplete script [arg=value ...] | Name | | Description | |------|---|-------------| -| shell | Default: `/bin/bash` | | +| shell | Default: `/bin/zsh` | | | basename | Default: `` | | diff --git a/docs/commands/dedibox.md b/docs/commands/dedibox.md index 416fc26ada..2f83fdbf2c 100644 --- a/docs/commands/dedibox.md +++ b/docs/commands/dedibox.md @@ -230,7 +230,7 @@ scw dedibox billing list-invoice [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | | -| project-id | | | +| project-id | Default: `` | | @@ -250,7 +250,7 @@ scw dedibox billing list-refund [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | | -| project-id | | | +| project-id | Default: `` | | @@ -486,7 +486,7 @@ scw dedibox fip get-quota [arg=value ...] | Name | | Description | |------|---|-------------| -| project-id | | Project ID | +| project-id | Default: `` | Project ID | | zone | Default: `fr-par-1`
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 | @@ -507,7 +507,7 @@ scw dedibox fip list [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `ip_asc`, `ip_desc` | Order of the failovers IP | -| project-id | Required | Filter failovers IP by project ID | +| project-id | Required
Default: `` | Filter failovers IP by project ID | | search | | Filter failovers IP which matching with this field | | only-available | | True: return all failovers IP not attached on server | | zone | Default: `fr-par-1`
One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `all` | Zone to target. If none is passed will use default zone from the config | @@ -534,7 +534,7 @@ scw dedibox ipv6-block create [arg=value ...] | Name | | Description | |------|---|-------------| -| project-id | | ID of the project | +| project-id | Default: `` | ID of the project | @@ -595,7 +595,7 @@ scw dedibox ipv6-block get [arg=value ...] | Name | | Description | |------|---|-------------| -| project-id | | ID of the project | +| project-id | Default: `` | ID of the project | @@ -617,7 +617,7 @@ scw dedibox ipv6-block get-quota [arg=value ...] | Name | | Description | |------|---|-------------| -| project-id | | ID of the project | +| project-id | Default: `` | ID of the project | @@ -682,7 +682,7 @@ scw dedibox offer get [arg=value ...] | Name | | Description | |------|---|-------------| | offer-id | Required | ID of offer | -| project-id | | Project ID | +| project-id | Default: `` | Project ID | | zone | Default: `fr-par-1`
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 | @@ -705,7 +705,7 @@ scw dedibox offer list [arg=value ...] | order-by | One of: `created_at_asc`, `created_at_desc`, `name_asc`, `name_desc`, `price_asc`, `price_desc` | Order of the offers | | commercial-range | | Filter on commercial range | | catalog | One of: `all`, `default`, `beta`, `reseller`, `premium`, `volume`, `admin`, `inactive` | Filter on catalog | -| project-id | | Project ID | +| project-id | Default: `` | Project ID | | is-failover-ip | | Get the current failover IP offer | | is-failover-block | | Get the current failover IP block offer | | sold-in | | Filter offers depending on their datacenter | @@ -804,7 +804,7 @@ scw dedibox os get [arg=value ...] |------|---|-------------| | os-id | Required | ID of the OS | | server-id | | ID of the server | -| project-id | | Project ID | +| project-id | Default: `` | Project ID | | zone | Default: `fr-par-1`
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 | @@ -827,7 +827,7 @@ scw dedibox os list [arg=value ...] | order-by | One of: `created_at_asc`, `created_at_desc`, `released_at_asc`, `released_at_desc` | Order of the OS | | type | One of: `unknown_type`, `server`, `virtu`, `panel`, `desktop`, `custom`, `rescue` | Type of the OS | | server-id | | Filter OS by compatible server ID | -| project-id | | Project ID | +| project-id | Default: `` | Project ID | | zone | Default: `fr-par-1`
One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `all` | Zone to target. If none is passed will use default zone from the config | @@ -991,7 +991,7 @@ scw dedibox rpn-info get [arg=value ...] | Name | | Description | |------|---|-------------| -| project-id | | A project ID | +| project-id | Default: `` | A project ID | | rpnv1-group-id | | An RPN v1 group ID | | rpnv2-group-id | | An RPN v2 group ID | @@ -1013,7 +1013,7 @@ scw dedibox rpn-info list [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | Order of the servers | -| project-id | | Filter servers by project ID | +| project-id | Default: `` | Filter servers by project ID | @@ -1200,7 +1200,7 @@ scw dedibox rpn-v1 list [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | Order of the rpn v1 groups | -| project-id | | Filter rpn v1 groups by project ID | +| project-id | Default: `` | Filter rpn v1 groups by project ID | @@ -1220,7 +1220,7 @@ scw dedibox rpn-v1 list-capable-san-server [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | Order of the rpn capable resources | -| project-id | | Filter rpn capable resources by project ID | +| project-id | Default: `` | Filter rpn capable resources by project ID | @@ -1240,7 +1240,7 @@ scw dedibox rpn-v1 list-capable-server [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | Order of the rpn capable resources | -| project-id | | Filter rpn capable resources by project ID | +| project-id | Default: `` | Filter rpn capable resources by project ID | @@ -1281,7 +1281,7 @@ scw dedibox rpn-v1 list-members [arg=value ...] |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | Order of the rpn v1 group members | | group-id | Required | Filter rpn v1 group members by group ID | -| project-id | | A project ID | +| project-id | Default: `` | A project ID | @@ -1484,7 +1484,7 @@ scw dedibox rpn-v2 list [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | Order of the rpn v2 groups | -| project-id | | Filter rpn v2 groups by project ID | +| project-id | Default: `` | Filter rpn v2 groups by project ID | @@ -1504,7 +1504,7 @@ scw dedibox rpn-v2 list-capable-resources [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | Order of the rpn v2 capable resources | -| project-id | | Filter rpn v2 capable resources by project ID | +| project-id | Default: `` | Filter rpn v2 capable resources by project ID | @@ -1689,7 +1689,7 @@ scw dedibox san list [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | Order of the RPN SANs | -| project-id | | Filter RPN SANs by project ID | +| project-id | Default: `` | Filter RPN SANs by project ID | @@ -1932,7 +1932,7 @@ scw dedibox server list [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | Order of the servers | -| project-id | Required | Filter servers by project ID | +| project-id | Required
Default: `` | Filter servers by project ID | | search | | Filter servers by hostname | | zone | Default: `fr-par-1`
One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `all` | Zone to target. If none is passed will use default zone from the config | @@ -2123,7 +2123,7 @@ scw dedibox service list [arg=value ...] | Name | | Description | |------|---|-------------| | order-by | One of: `created_at_asc`, `created_at_desc` | Order of the services | -| project-id | | Project ID | +| project-id | Default: `` | Project ID | | zone | Default: `fr-par-1`
One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `all` | Zone to target. If none is passed will use default zone from the config | diff --git a/internal/core/context.go b/internal/core/context.go index b1bb1473b7..488416a1dd 100644 --- a/internal/core/context.go +++ b/internal/core/context.go @@ -89,10 +89,7 @@ func GetOrganizationIDFromContext(ctx context.Context) string { func GetProjectIDFromContext(ctx context.Context) string { client := ExtractClient(ctx) - projectID, exists := client.GetDefaultProjectID() - if !exists { - panic("no default project ID found") - } + projectID, _ := client.GetDefaultProjectID() return projectID } From ed4a1cee4cb59558e4bff95f6dc8f85339cb4b36 Mon Sep 17 00:00:00 2001 From: Laure-di <62625835+Laure-di@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:47:23 +0200 Subject: [PATCH 5/5] Update autocomplete.md --- docs/commands/autocomplete.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/commands/autocomplete.md b/docs/commands/autocomplete.md index bb92628259..95f1777fb1 100644 --- a/docs/commands/autocomplete.md +++ b/docs/commands/autocomplete.md @@ -45,7 +45,7 @@ scw autocomplete script [arg=value ...] | Name | | Description | |------|---|-------------| -| shell | Default: `/bin/zsh` | | +| shell | Default: `/bin/bash` | | | basename | Default: `` | |