Skip to content

feat(marketplace): add type field to LocalImage #3242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
remyleone merged 2 commits into from
Jun 28, 2023
Merged

feat(marketplace): add type field to LocalImage #3242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acfee7d
feat: update generated APIs
scaleway-bot Jun 27, 2023
3d0c019
Merge branch 'master' into v1.3716.0
remyleone Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/scw/testdata/test-all-usage-marketplace-local-image-list-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ARGS:
[order-by] (created_at_asc | created_at_desc)
[image-label]
[zone]
[type] (unknown_type | instance_local | instance_sbs)

FLAGS:
-h, --help help for list
Expand Down
1 change: 1 addition & 0 deletions docs/commands/marketplace.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ scw marketplace local-image list [arg=value ...]
| order-by | One of: `created_at_asc`, `created_at_desc` | |
| image-label | | |
| zone | | |
| type | One of: `unknown_type`, `instance_local`, `instance_sbs` | |



Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.17.0.20230621092234-e6b367eed6a4
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230626132518-b0dfa1defaaf
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.17.0.20230621092234-e6b367eed6a4 h1:qFlORTA+ndCi1IRg66KTkU0eii2EBYEpXASKyB208gc=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230621092234-e6b367eed6a4/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230626132518-b0dfa1defaaf h1:df06kcC2caUTghLW6aTSyL3GUeM79BPvbtMyng187aE=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17.0.20230626132518-b0dfa1defaaf/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=
Expand Down
7 changes: 7 additions & 0 deletions internal/namespaces/marketplace/v2/marketplace_cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,13 @@ func marketplaceLocalImageList() *core.Command {
Deprecated: false,
Positional: false,
},
{
Name: "type",
Required: false,
Deprecated: false,
Positional: false,
EnumValues: []string{"unknown_type", "instance_local", "instance_sbs"},
},
},
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
request := args.(*marketplace.ListLocalImagesRequest)
Expand Down