Merge pull request #6420 from jwhonce/wip/json

V2 verify JSON output is consistent and doesn't drift

6 files changed, 27 insertions, 5 deletions

diff --git a/pkg/api/handlers/compat/containers_attach.go b/pkg/api/handlers/compat/containers_attach.go
index 012e20daf..990140ee1 100644
--- a/pkg/api/handlers/compat/containers_attach.go
+++ b/pkg/api/handlers/compat/containers_attach.go
@@ -90,7 +90,7 @@ func AttachContainer(w http.ResponseWriter, r *http.Request) {
 	// For Docker compatibility, we need to re-initialize containers in these states.
 	if state == define.ContainerStateConfigured || state == define.ContainerStateExited {
 		if err := ctr.Init(r.Context()); err != nil {
-			utils.InternalServerError(w, errors.Wrapf(err, "error preparing container %s for attach", ctr.ID()))
+			utils.Error(w, "Container in wrong state", http.StatusConflict, errors.Wrapf(err, "error preparing container %s for attach", ctr.ID()))
 			return
 		}
 	} else if !(state == define.ContainerStateCreated || state == define.ContainerStateRunning) {
diff --git a/pkg/api/handlers/compat/containers_stats.go b/pkg/api/handlers/compat/containers_stats.go
index 62ccd2b93..048321add 100644
--- a/pkg/api/handlers/compat/containers_stats.go
+++ b/pkg/api/handlers/compat/containers_stats.go
@@ -45,8 +45,8 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) {
 		utils.InternalServerError(w, err)
 		return
 	}
-	if state != define.ContainerStateRunning && !query.Stream {
-		utils.InternalServerError(w, define.ErrCtrStateInvalid)
+	if state != define.ContainerStateRunning {
+		utils.Error(w, "Container not running and streaming requested", http.StatusConflict, define.ErrCtrStateInvalid)
 		return
 	}
 
diff --git a/pkg/api/handlers/compat/resize.go b/pkg/api/handlers/compat/resize.go
index 3ead733bc..231b53175 100644
--- a/pkg/api/handlers/compat/resize.go
+++ b/pkg/api/handlers/compat/resize.go
@@ -1,10 +1,12 @@
 package compat
 
 import (
+	"fmt"
 	"net/http"
 	"strings"
 
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
@@ -43,6 +45,14 @@ func ResizeTTY(w http.ResponseWriter, r *http.Request) {
 			utils.ContainerNotFound(w, name, err)
 			return
 		}
+		if state, err := ctnr.State(); err != nil {
+			utils.InternalServerError(w, errors.Wrapf(err, "cannot obtain container state"))
+			return
+		} else if state != define.ContainerStateRunning {
+			utils.Error(w, "Container not running", http.StatusConflict,
+				fmt.Errorf("container %q in wrong state %q", name, state.String()))
+			return
+		}
 		if err := ctnr.AttachResize(sz); err != nil {
 			utils.InternalServerError(w, errors.Wrapf(err, "cannot resize container"))
 			return
@@ -56,6 +66,14 @@ func ResizeTTY(w http.ResponseWriter, r *http.Request) {
 			utils.SessionNotFound(w, name, err)
 			return
 		}
+		if state, err := ctnr.State(); err != nil {
+			utils.InternalServerError(w, errors.Wrapf(err, "cannot obtain session container state"))
+			return
+		} else if state != define.ContainerStateRunning {
+			utils.Error(w, "Container not running", http.StatusConflict,
+				fmt.Errorf("container %q in wrong state %q", name, state.String()))
+			return
+		}
 		if err := ctnr.ExecResize(name, sz); err != nil {
 			utils.InternalServerError(w, errors.Wrapf(err, "cannot resize session"))
 			return
diff --git a/pkg/api/handlers/compat/types.go b/pkg/api/handlers/compat/types.go
index b8d06760f..6d47ede64 100644
--- a/pkg/api/handlers/compat/types.go
+++ b/pkg/api/handlers/compat/types.go
@@ -48,7 +48,7 @@ type StatsJSON struct {
 	Stats
 
 	Name string `json:"name,omitempty"`
-	ID   string `json:"id,omitempty"`
+	ID   string `json:"Id,omitempty"`
 
 	// Networks request version >=1.21
 	Networks map[string]docker.NetworkStats `json:"networks,omitempty"`
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go
index 3902bdc9b..50f6b1a38 100644
--- a/pkg/api/handlers/libpod/containers.go
+++ b/pkg/api/handlers/libpod/containers.go
@@ -66,6 +66,10 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
 		utils.InternalServerError(w, err)
 		return
 	}
+	if len(pss) == 0 {
+		utils.WriteResponse(w, http.StatusOK, "[]")
+		return
+	}
 	utils.WriteResponse(w, http.StatusOK, pss)
 }
 
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go
index d8cdd9caf..aa3d0fe91 100644
--- a/pkg/api/handlers/types.go
+++ b/pkg/api/handlers/types.go
@@ -120,7 +120,7 @@ type CreateContainerConfig struct {
 // swagger:model IDResponse
 type IDResponse struct {
 	// ID
-	ID string `json:"id"`
+	ID string `json:"Id"`
 }
 
 type ContainerTopOKBody struct {