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

Trim white space from /top endpoint results

Browse Source 
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>
This commit is contained in:
Jhon Honce
2021-03-30 10:42:06 -07:00
parent f7ad9fbd9e
commit eef66973de
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/handlers/compat/containers_top.go
View File

@ -46,8 +46,16 @@ func TopContainer(w http.ResponseWriter, r *http.Request) {
var body = handlers.ContainerTopOKBody{} var body = handlers.ContainerTopOKBody{}
if len(output) > 0 { if len(output) > 0 {
body.Titles = strings.Split(output[0], "\t") 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:] { 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) utils.WriteJSON(w, http.StatusOK, body)

3
test/apiv2/25-containersMore.at
View File

@ -38,7 +38,8 @@ t GET libpod/containers/foo/json 200 \
# List processes of the container # List processes of the container
t GET libpod/containers/foo/top 200 \ t GET libpod/containers/foo/top 200 \
length=2 length=2 \
.Processes[0][7]="top"
# List processes of none such # List processes of none such
t GET libpod/containers/nonesuch/top 404 t GET libpod/containers/nonesuch/top 404