Skip to content

Update naming of filter containers function && container list handler #2067

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
Zheaoli merged 1 commit into from
Mar 2, 2023
Merged

Update naming of filter containers function && container list handler #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/nerdctl/container_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,5 @@ func psAction(cmd *cobra.Command, args []string) error {
}
defer cancel()

return container.ListCommandHandler(ctx, client, options)
return container.List(ctx, client, options)
}
10 changes: 5 additions & 5 deletions pkg/cmd/container/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,22 @@ import (
"github.com/sirupsen/logrus"
)

// ListCommandHandler prints containers according to `options`.
func ListCommandHandler(ctx context.Context, client *containerd.Client, options types.ContainerListOptions) error {
containers, err := List(ctx, client, options.Filters, options.LastN, options.All)
// List prints containers according to `options`.
func List(ctx context.Context, client *containerd.Client, options types.ContainerListOptions) error {
containers, err := filterContainers(ctx, client, options.Filters, options.LastN, options.All)
if err != nil {
return err
}
return printContainers(ctx, client, containers, options)
}

// List returns containers matching the filters.
// filterContainers returns containers matching the filters.
//
// - Supported filters: https://github.com/containerd/nerdctl/blob/main/docs/command-reference.md#whale-blue_square-nerdctl-ps
// - all means showing all containers (default shows just running).
// - lastN means only showing n last created containers (includes all states). Non-positive values are ignored.
// In other words, if lastN is positive, all will be set to true.
func List(ctx context.Context, client *containerd.Client, filters []string, lastN int, all bool) ([]containerd.Container, error) {
func filterContainers(ctx context.Context, client *containerd.Client, filters []string, lastN int, all bool) ([]containerd.Container, error) {
containers, err := client.Containers(ctx)
if err != nil {
return nil, err
Expand Down