diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-15 09:19:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 09:19:40 -0400 |
| commit | f4c3b718eb22a161a897a6ed55d10f3a07e31aa8 (patch) | |
| tree | bb453d40a50f8cef1ebfedc73e43e2c7fe7d3456 /pkg/api/handlers/utils | |
| parent | e94e3fd2e829fd2cd38428aa9d9bf68b37bb8407 (diff) | |
| parent | 200cfa41a434b7143620c2c252b3eb7ab3ef92f9 (diff) | |
| download | podman-f4c3b718eb22a161a897a6ed55d10f3a07e31aa8.tar.gz podman-f4c3b718eb22a161a897a6ed55d10f3a07e31aa8.tar.bz2 podman-f4c3b718eb22a161a897a6ed55d10f3a07e31aa8.zip | |
Merge pull request #6557 from rhatdan/lint
Turn on More linters
Diffstat (limited to 'pkg/api/handlers/utils')
| -rw-r--r-- | pkg/api/handlers/utils/images.go | 2 | ||||
| -rw-r--r-- | pkg/api/handlers/utils/pods.go | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go index 8570f66fc..521f727be 100644 --- a/pkg/api/handlers/utils/images.go +++ b/pkg/api/handlers/utils/images.go @@ -93,7 +93,7 @@ func GetImages(w http.ResponseWriter, r *http.Request) ([]*image.Image, error) { if query.All { return images, nil } - var returnImages []*image.Image + returnImages := []*image.Image{} for _, img := range images { if len(img.Names()) == 0 { parent, err := img.IsParent(r.Context()) diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go index 4a5cbd05c..0bb818c1c 100644 --- a/pkg/api/handlers/utils/pods.go +++ b/pkg/api/handlers/utils/pods.go @@ -11,7 +11,6 @@ import ( func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport, error) { var ( - lps []*entities.ListPodsReport pods []*libpod.Pod filters []libpod.PodFilter ) @@ -45,6 +44,11 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport return nil, err } + if len(pods) == 0 { + return nil, nil + } + + lps := make([]*entities.ListPodsReport, 0, len(pods)) for _, pod := range pods { status, err := pod.GetPodStatus() if err != nil { |