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

Merge pull request #9892 from jwhonce/wip/top

Browse Source 
Trim white space from /top endpoint results
This commit is contained in:
OpenShift Merge Robot
2021-03-30 21:29:26 +02:00
committed by GitHub
parent 989c8e9785 eef66973de
commit bd07179e9c
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{}
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)

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

@ -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