summaryrefslogtreecommitdiff
path: root/pkg/api/handlers
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-07 19:24:20 +0200
committerGitHub <noreply@github.com>2021-09-07 19:24:20 +0200
commit536f23c0b78dd8feafee4e40b743988dbb03bfa2 (patch)
treef2b1290c2cde1944729468ec574a83093bacf4dc /pkg/api/handlers
parentfbae579a31b580f45c25c2dcae87fc8a51e33009 (diff)
parentd346e6e734dbaac911de0d774a5d8703e2abc83d (diff)
downloadpodman-536f23c0b78dd8feafee4e40b743988dbb03bfa2.tar.gz
podman-536f23c0b78dd8feafee4e40b743988dbb03bfa2.tar.bz2
podman-536f23c0b78dd8feafee4e40b743988dbb03bfa2.zip
Merge pull request #11431 from jmguzik/secrets-ls-filters
Add filtering functionality to http api secrets list
Diffstat (limited to 'pkg/api/handlers')
-rw-r--r--pkg/api/handlers/compat/secrets.go22
1 files changed, 8 insertions, 14 deletions
diff --git a/pkg/api/handlers/compat/secrets.go b/pkg/api/handlers/compat/secrets.go
index 86e3887a4..7dd17ea94 100644
--- a/pkg/api/handlers/compat/secrets.go
+++ b/pkg/api/handlers/compat/secrets.go
@@ -11,31 +11,25 @@ import (
"github.com/containers/podman/v3/pkg/api/handlers/utils"
"github.com/containers/podman/v3/pkg/domain/entities"
"github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/gorilla/schema"
+ "github.com/containers/podman/v3/pkg/util"
"github.com/pkg/errors"
)
func ListSecrets(w http.ResponseWriter, r *http.Request) {
var (
runtime = r.Context().Value("runtime").(*libpod.Runtime)
- decoder = r.Context().Value("decoder").(*schema.Decoder)
)
- query := struct {
- Filters map[string][]string `schema:"filters"`
- }{}
-
- if err := decoder.Decode(&query, r.URL.Query()); err != nil {
- utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest,
+ filtersMap, err := util.PrepareFilters(r)
+ if err != nil {
+ utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError,
errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
return
}
- if len(query.Filters) > 0 {
- utils.Error(w, "filters not supported", http.StatusBadRequest,
- errors.Wrapf(errors.New("bad parameter"), "filters not supported"))
- return
- }
ic := abi.ContainerEngine{Libpod: runtime}
- reports, err := ic.SecretList(r.Context())
+ listOptions := entities.SecretListRequest{
+ Filters: *filtersMap,
+ }
+ reports, err := ic.SecretList(r.Context(), listOptions)
if err != nil {
utils.InternalServerError(w, err)
return