From 82bce7d906c5b5aa1d98782bed8d5e77637fc0ef Mon Sep 17 00:00:00 2001
From: Paul Holzinger <paul.holzinger@web.de>
Date: Sat, 9 Jan 2021 23:38:26 +0100
Subject: Use abi PodPs implementation for libpod/pods/json endpoint

This removes unnecessary code duplication.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
---
 pkg/api/handlers/libpod/pods.go |  7 +++-
 pkg/api/handlers/utils/pods.go  | 87 -----------------------------------------
 2 files changed, 6 insertions(+), 88 deletions(-)
 delete mode 100644 pkg/api/handlers/utils/pods.go

(limited to 'pkg/api')

diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index de373f05f..2409d3a20 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -43,6 +43,7 @@ func PodCreate(w http.ResponseWriter, r *http.Request) {
 }
 
 func Pods(w http.ResponseWriter, r *http.Request) {
+	runtime := r.Context().Value("runtime").(*libpod.Runtime)
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
 	query := struct {
 		Filters map[string][]string `schema:"filters"`
@@ -55,7 +56,11 @@ func Pods(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	pods, err := utils.GetPods(w, r)
+	containerEngine := abi.ContainerEngine{Libpod: runtime}
+	podPSOptions := entities.PodPSOptions{
+		Filters: query.Filters,
+	}
+	pods, err := containerEngine.PodPs(r.Context(), podPSOptions)
 	if err != nil {
 		utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
 		return
diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go
deleted file mode 100644
index 0fe3a308b..000000000
--- a/pkg/api/handlers/utils/pods.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package utils
-
-import (
-	"net/http"
-
-	"github.com/containers/podman/v2/libpod"
-	"github.com/containers/podman/v2/pkg/domain/entities"
-	dfilters "github.com/containers/podman/v2/pkg/domain/filters"
-	"github.com/gorilla/schema"
-)
-
-func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport, error) {
-	var (
-		pods []*libpod.Pod
-	)
-	runtime := r.Context().Value("runtime").(*libpod.Runtime)
-	decoder := r.Context().Value("decoder").(*schema.Decoder)
-
-	query := struct {
-		All     bool
-		Filters map[string][]string `schema:"filters"`
-		Digests bool
-	}{}
-
-	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
-		return nil, err
-	}
-	if _, found := r.URL.Query()["digests"]; found && query.Digests {
-		UnSupportedParameter("digests")
-	}
-
-	filters := make([]libpod.PodFilter, 0, len(query.Filters))
-	for k, v := range query.Filters {
-		f, err := dfilters.GeneratePodFilterFunc(k, v)
-		if err != nil {
-			return nil, err
-		}
-		filters = append(filters, f)
-	}
-	pods, err := runtime.Pods(filters...)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(pods) == 0 {
-		return []*entities.ListPodsReport{}, nil
-	}
-
-	lps := make([]*entities.ListPodsReport, 0, len(pods))
-	for _, pod := range pods {
-		status, err := pod.GetPodStatus()
-		if err != nil {
-			return nil, err
-		}
-		ctrs, err := pod.AllContainers()
-		if err != nil {
-			return nil, err
-		}
-		infraID, err := pod.InfraContainerID()
-		if err != nil {
-			return nil, err
-		}
-		lp := entities.ListPodsReport{
-			Cgroup:    pod.CgroupParent(),
-			Created:   pod.CreatedTime(),
-			Id:        pod.ID(),
-			Name:      pod.Name(),
-			Namespace: pod.Namespace(),
-			Status:    status,
-			InfraId:   infraID,
-			Labels:    pod.Labels(),
-		}
-		for _, ctr := range ctrs {
-			state, err := ctr.State()
-			if err != nil {
-				return nil, err
-			}
-			lp.Containers = append(lp.Containers, &entities.ListPodContainer{
-				Id:     ctr.ID(),
-				Names:  ctr.Name(),
-				Status: state.String(),
-			})
-		}
-		lps = append(lps, &lp)
-	}
-	return lps, nil
-}
-- 
cgit v1.2.3-54-g00ecf