5 files changed, 25 insertions, 22 deletions
diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
index a46b308b5..4bcac6e72 100644
--- a/pkg/api/handlers/utils/containers.go
+++ b/pkg/api/handlers/utils/containers.go
@@ -62,7 +62,7 @@ func WaitContainer(w http.ResponseWriter, r *http.Request) (int32, error) {
 
 func CreateContainer(ctx context.Context, w http.ResponseWriter, runtime *libpod.Runtime, cc *createconfig.CreateConfig) {
 	var pod *libpod.Pod
-	ctr, err := createconfig.CreateContainerFromCreateConfig(runtime, cc, ctx, pod)
+	ctr, err := createconfig.CreateContainerFromCreateConfig(ctx, runtime, cc, pod)
 	if err != nil {
 		Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "CreateContainerFromCreateConfig()"))
 		return
diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go
index 2f4a54b98..62fdc05dd 100644
--- a/pkg/api/handlers/utils/handler.go
+++ b/pkg/api/handlers/utils/handler.go
@@ -28,27 +28,27 @@ const (
 	// CompatTree supports Libpod endpoints
 	CompatTree
 
-	// CurrentApiVersion announces what is the current API level
-	CurrentApiVersion = VersionLevel(iota)
-	// MinimalApiVersion announces what is the oldest API level supported
-	MinimalApiVersion
+	// CurrentAPIVersion announces what is the current API level
+	CurrentAPIVersion = VersionLevel(iota)
+	// MinimalAPIVersion announces what is the oldest API level supported
+	MinimalAPIVersion
 )
 
 var (
 	// See https://docs.docker.com/engine/api/v1.40/
 	// libpod compat handlers are expected to honor docker API versions
 
-	// ApiVersion provides the current and minimal API versions for compat and libpod endpoint trees
+	// APIVersion provides the current and minimal API versions for compat and libpod endpoint trees
 	// Note: GET|HEAD /_ping is never versioned and provides the API-Version and Libpod-API-Version headers to allow
 	//       clients to shop for the Version they wish to support
-	ApiVersion = map[VersionTree]map[VersionLevel]semver.Version{
+	APIVersion = map[VersionTree]map[VersionLevel]semver.Version{
 		LibpodTree: {
-			CurrentApiVersion: semver.MustParse("1.0.0"),
-			MinimalApiVersion: semver.MustParse("1.0.0"),
+			CurrentAPIVersion: semver.MustParse("1.0.0"),
+			MinimalAPIVersion: semver.MustParse("1.0.0"),
 		},
 		CompatTree: {
-			CurrentApiVersion: semver.MustParse("1.40.0"),
-			MinimalApiVersion: semver.MustParse("1.24.0"),
+			CurrentAPIVersion: semver.MustParse("1.40.0"),
+			MinimalAPIVersion: semver.MustParse("1.24.0"),
 		},
 	}
 
@@ -103,8 +103,8 @@ func SupportedVersionWithDefaults(r *http.Request) (semver.Version, error) {
 	}
 
 	return SupportedVersion(r,
-		fmt.Sprintf(">=%s <=%s", ApiVersion[tree][MinimalApiVersion].String(),
-			ApiVersion[tree][CurrentApiVersion].String()))
+		fmt.Sprintf(">=%s <=%s", APIVersion[tree][MinimalAPIVersion].String(),
+			APIVersion[tree][CurrentAPIVersion].String()))
 }
 
 // WriteResponse encodes the given value as JSON or string and renders it for http client
diff --git a/pkg/api/handlers/utils/handler_test.go b/pkg/api/handlers/utils/handler_test.go
index 6009432b5..d9fd22b80 100644
--- a/pkg/api/handlers/utils/handler_test.go
+++ b/pkg/api/handlers/utils/handler_test.go
@@ -12,12 +12,12 @@ import (
 
 func TestSupportedVersion(t *testing.T) {
 	req, err := http.NewRequest("GET",
-		fmt.Sprintf("/v%s/libpod/testing/versions", ApiVersion[LibpodTree][CurrentApiVersion]),
+		fmt.Sprintf("/v%s/libpod/testing/versions", APIVersion[LibpodTree][CurrentAPIVersion]),
 		nil)
 	if err != nil {
 		t.Fatal(err)
 	}
-	req = mux.SetURLVars(req, map[string]string{"version": ApiVersion[LibpodTree][CurrentApiVersion].String()})
+	req = mux.SetURLVars(req, map[string]string{"version": APIVersion[LibpodTree][CurrentAPIVersion].String()})
 
 	rr := httptest.NewRecorder()
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go
index 7fb31a177..521f727be 100644
--- a/pkg/api/handlers/utils/images.go
+++ b/pkg/api/handlers/utils/images.go
@@ -3,6 +3,7 @@ package utils
 import (
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/containers/image/v5/docker"
 	"github.com/containers/image/v5/storage"
@@ -77,9 +78,7 @@ func GetImages(w http.ResponseWriter, r *http.Request) ([]*image.Image, error) {
 
 	if len(query.Filters) > 0 {
 		for k, v := range query.Filters {
-			for _, val := range v {
-				filters = append(filters, fmt.Sprintf("%s=%s", k, val))
-			}
+			filters = append(filters, fmt.Sprintf("%s=%s", k, strings.Join(v, "=")))
 		}
 		images, err = runtime.ImageRuntime().GetImagesWithFilters(filters)
 		if err != nil {
@@ -94,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 5b6f6d34d..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 {
@@ -54,7 +58,7 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport
 		if err != nil {
 			return nil, err
 		}
-		infraId, err := pod.InfraContainerID()
+		infraID, err := pod.InfraContainerID()
 		if err != nil {
 			return nil, err
 		}
@@ -65,7 +69,7 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport
 			Name:      pod.Name(),
 			Namespace: pod.Namespace(),
 			Status:    status,
-			InfraId:   infraId,
+			InfraId:   infraID,
 			Labels:    pod.Labels(),
 		}
 		for _, ctr := range ctrs {