Merge pull request #6420 from jwhonce/wip/json

V2 verify JSON output is consistent and doesn't drift

1 files changed, 18 insertions, 0 deletions

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