Skip to content

3452: Filter Volumes by name if any of the names match #3482

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 1 commit into from
Oct 2, 2024
Merged

3452: Filter Volumes by name if any of the names match #3482

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
3 changes: 0 additions & 3 deletions cmd/nerdctl/volume/volume_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,6 @@ func TestVolumeLsFilter(t *testing.T) {
},
{
Description: "Retrieving name=volume1 and name=volume2",
// FIXME: https://github.com/containerd/nerdctl/issues/3452
// Nerdctl filter behavior is broken
Require: nerdtest.Docker,
Command: func(data test.Data, helpers test.Helpers) test.Command {
return helpers.Command("volume", "ls", "--quiet", "--filter", "name="+data.Get("vol1"), "--filter", "name="+data.Get("vol2"))
},
Expand Down
21 changes: 17 additions & 4 deletions pkg/cmd/volume/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,15 +269,28 @@ func volumeMatchesFilter(vol native.Volume, labelFilterFuncs []func(*map[string]
return false
}
}
for _, nameFilterFunc := range nameFilterFuncs {
if !nameFilterFunc(vol.Name) {
return false
}

if !anyMatch(vol.Name, nameFilterFuncs) {
return false
}

for _, sizeFilterFunc := range sizeFilterFuncs {
if !sizeFilterFunc(vol.Size) {
return false
}
}

return true
}

func anyMatch[T any](vol T, filters []func(T) bool) bool {
if len(filters) == 0 {
return true
}
for _, f := range filters {
if f(vol) {
return true
}
}
return false
}