From 29bc25568eba78b65fc3f7d7231ab99d1fccf5c0 Mon Sep 17 00:00:00 2001 From: Scaleway Bot Date: Fri, 21 Oct 2022 14:38:51 +0200 Subject: [PATCH] fix(rdb): add name and version optional fields on ListDatabaseEngineRequest (#2555) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Rémy Léone --- .../test-all-usage-rdb-engine-list-usage.golden | 2 ++ docs/commands/rdb.md | 2 ++ go.mod | 2 +- go.sum | 4 ++-- internal/namespaces/rdb/v1/rdb_cli.go | 14 ++++++++++++++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/cmd/scw/testdata/test-all-usage-rdb-engine-list-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-engine-list-usage.golden index daa126a11f..c7dcae9caf 100644 --- a/cmd/scw/testdata/test-all-usage-rdb-engine-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-rdb-engine-list-usage.golden @@ -6,6 +6,8 @@ USAGE: scw rdb engine list [arg=value ...] ARGS: + [name] Name of the Database Engine + [version] Version of the Database Engine [region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw) FLAGS: diff --git a/docs/commands/rdb.md b/docs/commands/rdb.md index 3fc5e3904f..3d0a5f7cd2 100644 --- a/docs/commands/rdb.md +++ b/docs/commands/rdb.md @@ -446,6 +446,8 @@ scw rdb engine list [arg=value ...] | Name | | Description | |------|---|-------------| +| name | | Name of the Database Engine | +| version | | Version of the Database Engine | | region | Default: `fr-par`
One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config | diff --git a/go.mod b/go.mod index 8787d71b74..3e08daf024 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.16 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20221018115351-2508d848e512 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20221018125033-9a8efc64603d github.com/spf13/cobra v1.6.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.0 diff --git a/go.sum b/go.sum index 714b11d771..aa45401d35 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,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.9.0.20221018115351-2508d848e512 h1:nfobEVAnoUj78XfqBoWTxvbA4QroRrjZPZcO+I1s9F4= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20221018115351-2508d848e512/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20221018125033-9a8efc64603d h1:qzG2GUFDAjQbjY3/SQNG1gPfbUPmZBWAMAC0IQfpNjU= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20221018125033-9a8efc64603d/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.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI= diff --git a/internal/namespaces/rdb/v1/rdb_cli.go b/internal/namespaces/rdb/v1/rdb_cli.go index 4c19585098..c8fa8a5719 100644 --- a/internal/namespaces/rdb/v1/rdb_cli.go +++ b/internal/namespaces/rdb/v1/rdb_cli.go @@ -213,6 +213,20 @@ func rdbEngineList() *core.Command { // Deprecated: false, ArgsType: reflect.TypeOf(rdb.ListDatabaseEnginesRequest{}), ArgSpecs: core.ArgSpecs{ + { + Name: "name", + Short: `Name of the Database Engine`, + Required: false, + Deprecated: false, + Positional: false, + }, + { + Name: "version", + Short: `Version of the Database Engine`, + Required: false, + Deprecated: false, + Positional: false, + }, core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw), }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {