Update http client unexpected response messages (#895)

Author: deliahu

cli/cmd/errors.go

@@ -19,6 +19,7 @@ package cmd
 import (
 	"fmt"
 	"net/url"
+	"strings"
 
 	"github.com/cortexlabs/cortex/pkg/lib/errors"
 	s "github.com/cortexlabs/cortex/pkg/lib/strings"
@@ -134,24 +135,29 @@ func ErrorOperatorSocketRead(err error) error {
 	})
 }
 
-func ErrorResponseUnknown(body string) error {
+func ErrorResponseUnknown(body string, statusCode int) error {
+	msg := body
+	if strings.TrimSpace(body) == "" {
+		msg = fmt.Sprintf("empty response (status code %d)", statusCode)
+	}
+
 	return errors.WithStack(&errors.Error{
 		Kind:    ErrResponseUnknown,
-		Message: body,
+		Message: msg,
 	})
 }
 
-func ErrorOperatorResponseUnknown(body string) error {
+func ErrorOperatorResponseUnknown(body string, statusCode int) error {
 	return errors.WithStack(&errors.Error{
 		Kind:    ErrOperatorResponseUnknown,
-		Message: body,
+		Message: fmt.Sprintf("unexpected response from operator (status code %d): %s", statusCode, body),
 	})
 }
 
-func ErrorOperatorStreamResponseUnknown(body string) error {
+func ErrorOperatorStreamResponseUnknown(body string, statusCode int) error {
 	return errors.WithStack(&errors.Error{
 		Kind:    ErrOperatorStreamResponseUnknown,
-		Message: body,
+		Message: fmt.Sprintf("unexpected response from operator (status code %d): %s", statusCode, body),
 	})
 }
 

cli/cmd/lib_http_client.go

@@ -218,7 +218,7 @@ func StreamLogs(apiName string) error {
 		var output schema.ErrorResponse
 		err = json.Unmarshal(bodyBytes, &output)
 		if err != nil || output.Message == "" {
-			return ErrorOperatorStreamResponseUnknown(string(bodyBytes))
+			return ErrorOperatorStreamResponseUnknown(string(bodyBytes), response.StatusCode)
 		}
 		return errors.WithStack(&errors.Error{
 			Kind:        output.Kind,
@@ -311,7 +311,7 @@ func (client *OperatorClient) MakeRequest(request *http.Request) ([]byte, error)
 		var output schema.ErrorResponse
 		err = json.Unmarshal(bodyBytes, &output)
 		if err != nil || output.Message == "" {
-			return nil, ErrorOperatorResponseUnknown(string(bodyBytes))
+			return nil, ErrorOperatorResponseUnknown(string(bodyBytes), response.StatusCode)
 		}
 
 		return nil, errors.WithStack(&errors.Error{
@@ -340,7 +340,7 @@ func (client *GenericClient) MakeRequest(request *http.Request) ([]byte, error)
 		if err != nil {
 			return nil, errors.Wrap(err, _errStrRead)
 		}
-		return nil, ErrorResponseUnknown(string(bodyBytes))
+		return nil, ErrorResponseUnknown(string(bodyBytes), response.StatusCode)
 	}
 
 	bodyBytes, err := ioutil.ReadAll(response.Body)