feat(marketplace): order ListLocalImages fields so that compatible_commercial_types are last (#3323)

scaleway-bot · web-flow · commit 4803fb811dcf · 2023-08-03T15:11:45.000Z
diff --git a/cmd/scw/testdata/test-all-usage-instance-ssh-add-key-usage.golden b/cmd/scw/testdata/test-all-usage-instance-ssh-add-key-usage.golden
@@ -11,7 +11,7 @@ USAGE:
 ARGS:
   [server-id]       Server to add your key to
   [public-key]      Public key you want to add to your 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 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-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 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for add-key
diff --git a/cmd/scw/testdata/test-all-usage-instance-ssh-install-config-usage.golden b/cmd/scw/testdata/test-all-usage-instance-ssh-install-config-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   [project-id]      Project ID to use. If none is passed the default project ID will be used
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | all)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3 | all)
 
 FLAGS:
   -h, --help   help for install-config
diff --git a/cmd/scw/testdata/test-all-usage-instance-ssh-list-keys-usage.golden b/cmd/scw/testdata/test-all-usage-instance-ssh-list-keys-usage.golden
@@ -9,7 +9,7 @@ USAGE:
 
 ARGS:
   server-id         Server to add your key to
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-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 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for list-keys
diff --git a/cmd/scw/testdata/test-all-usage-instance-ssh-remove-key-usage.golden b/cmd/scw/testdata/test-all-usage-instance-ssh-remove-key-usage.golden
@@ -11,7 +11,7 @@ ARGS:
   server-id         Server to add your key to
   [name]            Name of the key you want to remove, has to be the key comment or the index
   [public-key]      Public key you want to remove
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-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 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
 
 FLAGS:
   -h, --help   help for remove-key
diff --git a/docs/commands/instance.md b/docs/commands/instance.md
@@ -2702,7 +2702,7 @@ scw instance ssh add-key [arg=value ...]
 |------|---|-------------|
 | server-id |  | Server to add your key to |
 | public-key |  | Public key you want to add to your server |
-| zone | Default: `fr-par-1`<br />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` | 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`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -2723,7 +2723,7 @@ scw instance ssh install-config [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | project-id |  | Project ID to use. If none is passed the default project ID will be used |
-| zone | Default: `fr-par-1`<br />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`, `all` | 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`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3`, `all` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -2745,7 +2745,7 @@ scw instance ssh list-keys <server-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | server-id | Required | Server to add your key to |
-| zone | Default: `fr-par-1`<br />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` | 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`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -2769,7 +2769,7 @@ scw instance ssh remove-key [arg=value ...]
 | server-id | Required | Server to add your key to |
 | name |  | Name of the key you want to remove, has to be the key comment or the index |
 | public-key |  | Public key you want to remove |
-| zone | Default: `fr-par-1`<br />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` | 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`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
 
 
 
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/moby/buildkit v0.11.6
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/pkg/errors v0.9.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230801154837-a7e6dd2091a2
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230803124132-fffe86137ff6
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
diff --git a/go.sum b/go.sum
@@ -497,8 +497,8 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj
 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.20.0.20230801154837-a7e6dd2091a2 h1:m3QvKMJ1rgtAItgjEdU7diKN5ytxkSZu0sPCJrfGl1Y=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230801154837-a7e6dd2091a2/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230803124132-fffe86137ff6 h1:kCk70YzD26Ph3Yx4i+cxVM9JOGywJvJcdpgDHuOF0N4=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230803124132-fffe86137ff6/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
diff --git a/internal/namespaces/marketplace/v2/marketplace_cli.go b/internal/namespaces/marketplace/v2/marketplace_cli.go
@@ -328,6 +328,23 @@ func marketplaceLocalImageList() *core.Command {
 			return resp.LocalImages, nil
 
 		},
+		View: &core.View{Fields: []*core.ViewField{
+			{
+				FieldName: "ID",
+			},
+			{
+				FieldName: "Label",
+			},
+			{
+				FieldName: "Arch",
+			},
+			{
+				FieldName: "Zone",
+			},
+			{
+				FieldName: "CompatibleCommercialTypes",
+			},
+		}},
 	}
 }
 
