Merge branch 'scaleway:master' into master

Author: scaleway-bot

cmd/scw/testdata/test-all-usage-instance-image-list-usage.golden

@@ -11,7 +11,6 @@ EXAMPLES:
 
 ARGS:
   [name]              
-  [public]            
   [arch]              
   [project-id]        
   [tags]              

cmd/scw/testdata/test-all-usage-rdb-database-list-usage.golden

@@ -6,12 +6,13 @@ USAGE:
   scw rdb database list [arg=value ...]
 
 ARGS:
-  [name]            Name of the database
-  [managed]         Defines whether or not the database is managed
-  [owner]           User that owns this database
-  [order-by]        Criteria to use when ordering database listing (name_asc | name_desc | size_asc | size_desc)
-  instance-id       UUID of the Database Instance to list the databases of
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
+  [name]                  Name of the database
+  [managed]               Defines whether or not the database is managed
+  [owner]                 User that owns this database
+  [order-by]              Criteria to use when ordering database listing (name_asc | name_desc | size_asc | size_desc)
+  instance-id             UUID of the Database Instance to list the databases of
+  [skip-size-retrieval]   Whether to skip the retrieval of each database size. If true, the size of each returned database will be set to 0
+  [region=fr-par]         Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
 
 FLAGS:
   -h, --help   help for list

docs/commands/instance.md

@@ -249,7 +249,6 @@ scw instance image list [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | name |  |  |
-| public |  |  |
 | arch |  |  |
 | project-id |  |  |
 | tags |  |  |

docs/commands/rdb.md

@@ -501,6 +501,7 @@ scw rdb database list [arg=value ...]
 | owner |  | User that owns this database |
 | order-by | One of: `name_asc`, `name_desc`, `size_asc`, `size_desc` | Criteria to use when ordering database listing |
 | instance-id | Required | UUID of the Database Instance to list the databases of |
+| skip-size-retrieval |  | Whether to skip the retrieval of each database size. If true, the size of each returned database will be set to 0 |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
 
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/scaleway/scaleway-cli/v2
 
-go 1.24.6
+go 1.25.0
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.39.2
@@ -11,7 +11,7 @@ require (
 	github.com/chzyer/readline v1.5.1
 	github.com/containerd/console v1.0.5
 	github.com/dnaeon/go-vcr v1.2.0
-	github.com/docker/docker v28.4.0+incompatible
+	github.com/docker/docker v28.5.0+incompatible
 	github.com/dustin/go-humanize v1.0.1
 	github.com/fatih/color v1.18.0
 	github.com/getsentry/sentry-go v0.35.3
@@ -23,7 +23,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/buildkit v0.25.0
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251002152609-65aa212380b7
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251002202252-ab1363c81acf
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/pflag v1.0.10
@@ -213,3 +213,9 @@ require (
 )
 
 tool gotest.tools/gotestsum
+
+ignore (
+	./docs
+	./scripts
+	./wasm
+)

go.sum

@@ -199,8 +199,8 @@ github.com/docker/cli v28.4.0+incompatible h1:RBcf3Kjw2pMtwui5V0DIMdyeab8glEw5QY
 github.com/docker/cli v28.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v28.4.0+incompatible h1:KVC7bz5zJY/4AZe/78BIvCnPsLaC9T/zh72xnlrTTOk=
-github.com/docker/docker v28.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.5.0+incompatible h1:ZdSQoRUE9XxhFI/B8YLvhnEFMmYN9Pp8Egd2qcaFk1E=
+github.com/docker/docker v28.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
 github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
 github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
@@ -462,8 +462,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251002152609-65aa212380b7 h1:K7bf9NGVVEFqEUn7QEmHNUN0MGz+W4aAi4OSsXj7boE=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251002152609-65aa212380b7/go.mod h1:DVB9HV7nK7TdTRqlpdxw6T0Wxg+aB9xPBEpO3aM2iqQ=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251002202252-ab1363c81acf h1:mz7af7+CKpRvbZMilDwowLtNOQ0sZOYdTAjdkG9lRho=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251002202252-ab1363c81acf/go.mod h1:DVB9HV7nK7TdTRqlpdxw6T0Wxg+aB9xPBEpO3aM2iqQ=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
 github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

internal/namespaces/instance/v1/custom_image.go

@@ -37,7 +37,6 @@ func imagesMarshalerFunc(i any, _ *human.MarshalOpt) (string, error) {
 		ID               string
 		Name             string
 		State            instance.ImageState
-		Public           bool
 		Zone             scw.Zone
 		Volumes          []scw.Size
 		ServerName       string
@@ -72,7 +71,6 @@ func imagesMarshalerFunc(i any, _ *human.MarshalOpt) (string, error) {
 			ID:               image.ID,
 			Name:             image.Name,
 			State:            image.State,
-			Public:           image.Public,
 			Zone:             image.Zone,
 			Volumes:          volumes,
 			ServerName:       image.ServerName,
@@ -167,25 +165,27 @@ type imageListItem struct {
 // A call to GetServer(..) with the ID contained in Image.FromServer retrieves more information about the server.
 func imageListBuilder(c *core.Command) *core.Command {
 	type customListImageRequest struct {
-		*instance.ListImagesRequest
+		Zone           scw.Zone `json:"-"`
+		PerPage        *uint32  `json:"-"`
+		Page           *int32   `json:"-"`
+		Name           *string  `json:"-"`
+		Arch           *string  `json:"-"`
+		Tags           *string  `json:"-"`
 		OrganizationID *string
 		ProjectID      *string
 	}
 
 	renameOrganizationIDArgSpec(c.ArgSpecs)
 	renameProjectIDArgSpec(c.ArgSpecs)
+	c.ArgSpecs.DeleteByName("public")
 
 	c.ArgsType = reflect.TypeOf(customListImageRequest{})
 
 	c.Run = func(ctx context.Context, argsI any) (i any, e error) {
 		// Get images
 		args := argsI.(*customListImageRequest)
 
-		if args.ListImagesRequest == nil {
-			args.ListImagesRequest = &instance.ListImagesRequest{}
-		}
-
-		req := args.ListImagesRequest
+		req := &instance.ListImagesRequest{}
 		req.Organization = args.OrganizationID
 		req.Project = args.ProjectID
 		req.Public = scw.BoolPtr(false)