From 9634e7eef77abbba2584b8e78daf9c76cfdcedd9 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Thu, 23 Jan 2020 16:13:47 -0700
Subject: Add query parameter converters for complex types

* Add converter for URL query parameters of type map[string][]string
* Add converter for URL query parameters of type time.Time
* Added function to allocate and configure schema.Decoder for API use
* Updated API handlers to leverage new converters, and correct handler
  code for filter type

An encoding example for a client using filters:

  v := map[string][]string{
      "dangling": {"true"},
  }
  payload, err := jsoniter.MarshalToString(v)
  if err != nil {
    panic(err)
  }
  payload = "?filters=" + url.QueryEscape(payload)

Signed-off-by: Jhon Honce <jhonce@redhat.com>
---
 pkg/api/handlers/events.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'pkg/api/handlers/events.go')

diff --git a/pkg/api/handlers/events.go b/pkg/api/handlers/events.go
index 900efa3da..44bf35254 100644
--- a/pkg/api/handlers/events.go
+++ b/pkg/api/handlers/events.go
@@ -1,9 +1,10 @@
 package handlers
 
 import (
-	"encoding/json"
 	"fmt"
 	"net/http"
+	"strings"
+	"time"
 
 	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/pkg/errors"
@@ -11,30 +12,24 @@ import (
 
 func GetEvents(w http.ResponseWriter, r *http.Request) {
 	query := struct {
-		Since   string `json:"since"`
-		Until   string `json:"until"`
-		Filters string `json:"filters"`
+		Since   time.Time           `schema:"since"`
+		Until   time.Time           `schema:"until"`
+		Filters map[string][]string `schema:"filters"`
 	}{}
 	if err := decodeQuery(r, &query); err != nil {
 		utils.Error(w, "Failed to parse parameters", http.StatusBadRequest, errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
 	}
 
-	var filters = map[string][]string{}
-	if found := hasVar(r, "filters"); found {
-		if err := json.Unmarshal([]byte(query.Filters), &filters); err != nil {
-			utils.BadRequest(w, "filters", query.Filters, err)
-			return
+	var libpodFilters = []string{}
+	if _, found := r.URL.Query()["filters"]; found {
+		for k, v := range query.Filters {
+			libpodFilters = append(libpodFilters, fmt.Sprintf("%s=%s", k, v[0]))
 		}
 	}
 
-	var libpodFilters = make([]string, len(filters))
-	for k, v := range filters {
-		libpodFilters = append(libpodFilters, fmt.Sprintf("%s=%s", k, v[0]))
-	}
-
 	libpodEvents, err := getRuntime(r).GetEvents(libpodFilters)
 	if err != nil {
-		utils.BadRequest(w, "filters", query.Filters, err)
+		utils.BadRequest(w, "filters", strings.Join(r.URL.Query()["filters"], ", "), err)
 		return
 	}
 
-- 
cgit v1.2.3-54-g00ecf