opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 08:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Volumes prune endpoint should use only prune filters

Browse Source 
Volumes endpoints for HTTP compat and libpod APIs allowed
usage of list HTTP endpoint filter funcs. Documentation in
case of compat API does not allow that. This commit aligns
code with the documentation and also ligns libpod with compat API.

Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
This commit is contained in:
Jakub Guzik
2021-04-07 00:02:12 +02:00
parent d83f49ef6b
commit 84907324fa
4 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/handlers/compat/volumes.go
View File

@ -266,7 +266,7 @@ func PruneVolumes(w http.ResponseWriter, r *http.Request) {
}
f := (url.Values)(*filterMap)
filterFuncs, err := filters.GenerateVolumeFilters(f)
filterFuncs, err := filters.GeneratePruneVolumeFilters(f)
if err != nil {
utils.Error(w, "Something when wrong.", http.StatusInternalServerError, errors.Wrapf(err, "failed to parse filters for %s", f.Encode()))
return

2
pkg/api/handlers/libpod/volumes.go
View File

@ -150,7 +150,7 @@ func pruneVolumesHelper(r *http.Request) ([]*reports.PruneReport, error) {
}
f := (url.Values)(*filterMap)
filterFuncs, err := filters.GenerateVolumeFilters(f)
filterFuncs, err := filters.GeneratePruneVolumeFilters(f)
if err != nil {
return nil, err
}

20
pkg/domain/filters/volumes.go
View File

@ -75,7 +75,25 @@ func GenerateVolumeFilters(filters url.Values) ([]libpod.VolumeFilter, error) {
return dangling
})
default:
return nil, errors.Errorf("%q is in an invalid volume filter", filter)
return nil, errors.Errorf("%q is an invalid volume filter", filter)
}
}
}
return vf, nil
}
func GeneratePruneVolumeFilters(filters url.Values) ([]libpod.VolumeFilter, error) {
var vf []libpod.VolumeFilter
for filter, v := range filters {
for _, val := range v {
switch filter {
case "label":
filter := val
vf = append(vf, func(v *libpod.Volume) bool {
return util.MatchLabelFilters([]string{filter}, v.Labels())
})
default:
return nil, errors.Errorf("%q is an invalid volume filter", filter)
}
}
}

16
test/apiv2/30-volumes.at
View File

@ -123,4 +123,20 @@ t POST libpod/volumes/prune 200
#After prune volumes, there should be no volume existing
t GET libpod/volumes/json 200 length=0
# libpod api: do not use list filters for prune
t POST libpod/volumes/prune?filters='{"name":["anyname"]}' 500 \
.cause="\"name\" is an invalid volume filter"
t POST libpod/volumes/prune?filters='{"driver":["anydriver"]}' 500 \
.cause="\"driver\" is an invalid volume filter"
t POST libpod/volumes/prune?filters='{"scope":["anyscope"]}' 500 \
.cause="\"scope\" is an invalid volume filter"
# compat api: do not use list filters for prune
t POST volumes/prune?filters='{"name":["anyname"]}' 500 \
.cause="\"name\" is an invalid volume filter"
t POST volumes/prune?filters='{"driver":["anydriver"]}' 500 \
.cause="\"driver\" is an invalid volume filter"
t POST volumes/prune?filters='{"scope":["anyscope"]}' 500 \
.cause="\"scope\" is an invalid volume filter"
# vim: filetype=sh