Skip to content

fix: ps --filter #422

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
merged 2 commits into from
Oct 25, 2016
Merged

fix: ps --filter #422

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
c1b3bd0
fix: ps --filter
Oct 24, 2016
0d4fd27
README: update
Oct 24, 2016
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
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,10 @@ $ scw inspect myserver | jq '.[0].public_ip.address'

## Changelog

### master (unreleased)

* `scw ps` do not display empty server with --filter

### v1.10.1 (2016-10-24)

* `scw login` fix CheckCredentials ([418](https://github.com/scaleway/scaleway-cli/issues/418))
Expand Down
6 changes: 2 additions & 4 deletions pkg/commands/ps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ func RunPs(ctx CommandContext, args PsArgs) error {
logrus.Warnf("Unknown filter: '%s=%s'", key, value)
}
}
filtered := make([]api.ScalewayServer, len(*servers))
index := 0
filtered := make([]api.ScalewayServer, 0, len(*servers))
for _, server := range *servers {
// filtering
for key, value := range args.Filters {
Expand Down Expand Up @@ -100,8 +99,7 @@ func RunPs(ctx CommandContext, args PsArgs) error {
}
}
}
filtered[index] = server
index++
filtered = append(filtered, server)
skipServer:
continue
}
Expand Down