diff options
| author | Jhon Honce <jhonce@redhat.com> | 2021-03-30 10:42:06 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2021-03-30 10:42:06 -0700 |
| commit | eef66973de4738536810be71b91e3503e7aa5183 (patch) | |
| tree | 4d71adeee14ebb4a2f41120e2333f771d5d82c8d | |
| parent | f7ad9fbd9e334b5daf9f3af9160cc8fab82255d6 (diff) | |
| download | podman-eef66973de4738536810be71b91e3503e7aa5183.tar.gz podman-eef66973de4738536810be71b91e3503e7aa5183.tar.bz2 podman-eef66973de4738536810be71b91e3503e7aa5183.zip | |
Trim white space from /top endpoint results
Versions of the ps command have additional spaces between fields, this
manifests as the container asking to run "top" and API reporting "top "
as a process.
Endpoint and tests updated to check that "top" is reported.
There is no libpod specialized endpoint to update.
Signed-off-by: Jhon Honce <jhonce@redhat.com>
| -rw-r--r-- | pkg/api/handlers/compat/containers_top.go | 10 | ||||
| -rw-r--r-- | test/apiv2/25-containersMore.at | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/containers_top.go b/pkg/api/handlers/compat/containers_top.go index ab9f613af..cae044a89 100644 --- a/pkg/api/handlers/compat/containers_top.go +++ b/pkg/api/handlers/compat/containers_top.go @@ -46,8 +46,16 @@ func TopContainer(w http.ResponseWriter, r *http.Request) { var body = handlers.ContainerTopOKBody{} if len(output) > 0 { body.Titles = strings.Split(output[0], "\t") + for i := range body.Titles { + body.Titles[i] = strings.TrimSpace(body.Titles[i]) + } + for _, line := range output[1:] { - body.Processes = append(body.Processes, strings.Split(line, "\t")) + process := strings.Split(line, "\t") + for i := range process { + process[i] = strings.TrimSpace(process[i]) + } + body.Processes = append(body.Processes, process) } } utils.WriteJSON(w, http.StatusOK, body) diff --git a/test/apiv2/25-containersMore.at b/test/apiv2/25-containersMore.at index 39bfa2e32..0a049d869 100644 --- a/test/apiv2/25-containersMore.at +++ b/test/apiv2/25-containersMore.at @@ -38,7 +38,8 @@ t GET libpod/containers/foo/json 200 \ # List processes of the container t GET libpod/containers/foo/top 200 \ - length=2 + length=2 \ + .Processes[0][7]="top" # List processes of none such t GET libpod/containers/nonesuch/top 404 |