diff --git a/cmd/scw/testdata/test-all-usage-config-set-usage.golden b/cmd/scw/testdata/test-all-usage-config-set-usage.golden index 8cc638ed38..00a045f72f 100644 --- a/cmd/scw/testdata/test-all-usage-config-set-usage.golden +++ b/cmd/scw/testdata/test-all-usage-config-set-usage.golden @@ -21,7 +21,7 @@ ARGS: [default-organization-id] A default Scaleway organization id [default-project-id] A default Scaleway project id [default-region] A default Scaleway region (fr-par | nl-ams | pl-waw) - [default-zone] A default Scaleway zone (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | pl-waw-1 | pl-waw-2) + [default-zone] A default Scaleway zone (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2) [send-telemetry] Set to false to disable telemetry FLAGS: diff --git a/cmd/scw/testdata/test-all-usage-webhosting-offer-list-usage.golden b/cmd/scw/testdata/test-all-usage-webhosting-offer-list-usage.golden index d7418ae399..c95c3de927 100644 --- a/cmd/scw/testdata/test-all-usage-webhosting-offer-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-webhosting-offer-list-usage.golden @@ -19,6 +19,7 @@ ARGS: [order-by] Define the order of the returned hostings (price_asc) [without-options] Select only offers, no options [only-options] Select only options + [hosting-id] Define a specific hosting id (optional) [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par) FLAGS: diff --git a/docs/commands/config.md b/docs/commands/config.md index 836697b8ed..644f2226d3 100644 --- a/docs/commands/config.md +++ b/docs/commands/config.md @@ -214,7 +214,7 @@ scw config set [arg=value ...] | default-organization-id | | A default Scaleway organization id | | default-project-id | | A default Scaleway project id | | default-region | One of: `fr-par`, `nl-ams`, `pl-waw` | A default Scaleway region | -| default-zone | One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `pl-waw-1`, `pl-waw-2` | A default Scaleway zone | +| default-zone | 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` | A default Scaleway zone | | send-telemetry | | Set to false to disable telemetry | diff --git a/docs/commands/webhosting.md b/docs/commands/webhosting.md index c116777913..5de4e80703 100644 --- a/docs/commands/webhosting.md +++ b/docs/commands/webhosting.md @@ -213,6 +213,7 @@ scw webhosting offer list [arg=value ...] | order-by | One of: `price_asc` | Define the order of the returned hostings | | without-options | | Select only offers, no options | | only-options | | Select only options | +| hosting-id | | Define a specific hosting id (optional) | | region | Default: `fr-par`
One of: `fr-par` | Region to target. If none is passed will use default region from the config | diff --git a/go.mod b/go.mod index 682dbb2153..55b2643834 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/kubernetes-client/go-base v0.0.0-20190205182333-3d0e39759d98 github.com/mattn/go-colorable v0.1.13 github.com/mattn/go-isatty v0.0.17 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.13.0.20230306133533-4d68c6d85168 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14 github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.2 diff --git a/go.sum b/go.sum index fc122a9676..d89982ecff 100644 --- a/go.sum +++ b/go.sum @@ -70,8 +70,8 @@ github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.13.0.20230306133533-4d68c6d85168 h1:bUf4bR8Ye8gjF6i7ZyPLmmIQ9C4U2G/5PopVCY0LYUo= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.13.0.20230306133533-4d68c6d85168/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14 h1:yFl3jyaSVLNYXlnNYM5z2pagEk1dYQhfr1p20T1NyKY= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= diff --git a/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go b/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go index b937ae7bb6..4baa7ff49a 100644 --- a/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go +++ b/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go @@ -386,6 +386,13 @@ func webhostingOfferList() *core.Command { Deprecated: false, Positional: false, }, + { + Name: "hosting-id", + Short: `Define a specific hosting id (optional)`, + Required: false, + Deprecated: false, + Positional: false, + }, core.RegionArgSpec(scw.RegionFrPar), }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) { @@ -399,7 +406,7 @@ func webhostingOfferList() *core.Command { Examples: []*core.Example{ { Short: "List all offers available for purchase", - ArgsJSON: `{"only_options":false,"without_options":false}`, + ArgsJSON: `{"hosting_id":"a3244331-5d32-4e36-9bf9-b60233e201c7","only_options":false,"without_options":false}`, }, { Short: "List only offers, no options",