diff options
| author | Nikolay Edigaryev <edigaryev@gmail.com> | 2021-02-17 21:18:39 +0300 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-02-18 11:21:14 -0500 |
| commit | 3fd2d1bf709b52d1b560a722832d67ad37e09f1b (patch) | |
| tree | 1719f483a5eb36b65696aa6646cd4c619a3fafc2 | |
| parent | 873014e4eee81ab090b2c97ba0ce99be7c798b75 (diff) | |
| download | podman-3fd2d1bf709b52d1b560a722832d67ad37e09f1b.tar.gz podman-3fd2d1bf709b52d1b560a722832d67ad37e09f1b.tar.bz2 podman-3fd2d1bf709b52d1b560a722832d67ad37e09f1b.zip | |
API: fix libpod's container wait endpoint condition conversion
Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
| -rw-r--r-- | pkg/api/handlers/decoder.go | 15 | ||||
| -rw-r--r-- | test/apiv2/20-containers.at | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkg/api/handlers/decoder.go b/pkg/api/handlers/decoder.go index 54087168a..123d325aa 100644 --- a/pkg/api/handlers/decoder.go +++ b/pkg/api/handlers/decoder.go @@ -6,6 +6,7 @@ import ( "syscall" "time" + "github.com/containers/podman/v2/libpod/define" "github.com/containers/podman/v2/pkg/util" "github.com/gorilla/schema" "github.com/sirupsen/logrus" @@ -19,6 +20,7 @@ func NewAPIDecoder() *schema.Decoder { d.IgnoreUnknownKeys(true) d.RegisterConverter(map[string][]string{}, convertURLValuesString) d.RegisterConverter(time.Time{}, convertTimeString) + d.RegisterConverter(define.ContainerStatus(0), convertContainerStatusString) var Signal syscall.Signal d.RegisterConverter(Signal, convertSignal) @@ -46,6 +48,19 @@ func convertURLValuesString(query string) reflect.Value { return reflect.ValueOf(f) } +func convertContainerStatusString(query string) reflect.Value { + result, err := define.StringToContainerStatus(query) + if err != nil { + logrus.Infof("convertContainerStatusString: Failed to parse %s: %s", query, err.Error()) + + // We return nil here instead of result because reflect.ValueOf().IsValid() will be true + // in github.com/gorilla/schema's decoder, which means there's no parsing error + return reflect.ValueOf(nil) + } + + return reflect.ValueOf(result) +} + // isZero() can be used to determine if parsing failed. func convertTimeString(query string) reflect.Value { var ( diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at index 0da196e46..292562934 100644 --- a/test/apiv2/20-containers.at +++ b/test/apiv2/20-containers.at @@ -63,7 +63,7 @@ cid=$(jq -r '.Id' <<<"$output") # Prior to the fix in #6835, this would fail 500 "args must not be empty" t POST libpod/containers/${cid}/start '' 204 # Container should exit almost immediately. Wait for it, confirm successful run -t POST libpod/containers/${cid}/wait '' 200 '0' +t POST libpod/containers/${cid}/wait?condition=stopped&condition=exited '' 200 '0' t GET libpod/containers/${cid}/json 200 \ .Id=$cid \ .State.Status~\\\(exited\\\|stopped\\\) \ |