CaaS - fix cortex CLI (#2194)

Author: RobertLucian

pkg/operator/endpoints/delete.go

@@ -32,5 +32,5 @@ func Delete(w http.ResponseWriter, r *http.Request) {
 		respondError(w, r, err)
 		return
 	}
-	respond(w, response)
+	respondJSON(w, r, response)
 }

pkg/operator/endpoints/deploy.go

@@ -48,5 +48,5 @@ func Deploy(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	respond(w, response)
+	respondJSON(w, r, response)
 }

pkg/operator/endpoints/get.go

@@ -30,7 +30,7 @@ func GetAPIs(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	respond(w, response)
+	respondJSON(w, r, response)
 }
 
 func GetAPI(w http.ResponseWriter, r *http.Request) {
@@ -42,7 +42,7 @@ func GetAPI(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	respond(w, response)
+	respondJSON(w, r, response)
 }
 
 func GetAPIByID(w http.ResponseWriter, r *http.Request) {
@@ -55,5 +55,5 @@ func GetAPIByID(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	respond(w, response)
+	respondJSON(w, r, response)
 }

pkg/operator/endpoints/get_batch_job.go

@@ -86,5 +86,5 @@ func GetBatchJob(w http.ResponseWriter, r *http.Request) {
 		Endpoint:  parsedURL.String(),
 	}
 
-	respond(w, response)
+	respondJSON(w, r, response)
 }

pkg/operator/endpoints/get_task_job.go

@@ -86,5 +86,5 @@ func GetTaskJob(w http.ResponseWriter, r *http.Request) {
 		Endpoint:  parsedURL.String(),
 	}
 
-	respond(w, response)
+	respondJSON(w, r, response)
 }

pkg/operator/endpoints/info.go

@@ -48,7 +48,7 @@ func Info(w http.ResponseWriter, r *http.Request) {
 		NodeInfos:          nodeInfos,
 		NumPendingReplicas: numPendingReplicas,
 	}
-	respond(w, response)
+	respondJSON(w, r, response)
 }
 
 func getNodeInfos() ([]schema.NodeInfo, int, error) {

pkg/operator/endpoints/refresh.go

@@ -37,5 +37,5 @@ func Refresh(w http.ResponseWriter, r *http.Request) {
 	response := schema.RefreshResponse{
 		Message: msg,
 	}
-	respond(w, response)
+	respondJSON(w, r, response)
 }

pkg/operator/endpoints/respond.go

@@ -28,16 +28,12 @@ import (
 
 var operatorLogger = logging.GetLogger()
 
-func respond(w http.ResponseWriter, response interface{}) {
+func respondJSON(w http.ResponseWriter, r *http.Request, response interface{}) {
+	if err := json.NewEncoder(w).Encode(response); err != nil {
+		respondError(w, r, errors.Wrap(err, "failed to encode response"))
+	}
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(response)
-}
-
-func respondPlainText(w http.ResponseWriter, response string) {
-	w.Header().Set("Content-Type", "text/plain")
-	w.WriteHeader(http.StatusOK)
-	w.Write([]byte(response))
 }
 
 func respondError(w http.ResponseWriter, r *http.Request, err error, strs ...string) {

pkg/operator/endpoints/stop_batch_job.go

@@ -46,7 +46,7 @@ func StopBatchJob(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	respond(w, schema.DeleteResponse{
+	respondJSON(w, r, schema.DeleteResponse{
 		Message: fmt.Sprintf("stopped job %s", jobID),
 	})
 }

pkg/operator/endpoints/stop_task_job.go

@@ -46,7 +46,7 @@ func StopTaskJob(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	respond(w, schema.DeleteResponse{
+	respondJSON(w, r, schema.DeleteResponse{
 		Message: fmt.Sprintf("stopped job %s", jobID),
 	})
 }

pkg/operator/endpoints/submit_batch.go

@@ -94,5 +94,5 @@ func SubmitBatchJob(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	respond(w, jobSpec)
+	respondJSON(w, r, jobSpec)
 }

pkg/operator/endpoints/submit_task.go

@@ -74,5 +74,5 @@ func SubmitTaskJob(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	respond(w, jobSpec)
+	respondJSON(w, r, jobSpec)
 }

pkg/operator/endpoints/verify_cortex.go

@@ -23,5 +23,5 @@ import (
 )
 
 func VerifyCortex(w http.ResponseWriter, r *http.Request) {
-	respond(w, schema.VerifyCortexResponse{})
+	respondJSON(w, r, schema.VerifyCortexResponse{})
 }

pkg/operator/resources/realtimeapi/metrics.go

@@ -19,6 +19,7 @@ package realtimeapi
 import (
 	"context"
 	"fmt"
+	"math"
 	"time"
 
 	"github.com/cortexlabs/cortex/pkg/config"
@@ -152,6 +153,10 @@ func getAvgLatencyMetric(promAPIv1 promv1.API, apiSpec spec.API) (*float64, erro
 	}
 
 	avgLatency := float64(values[0].Value)
+
+	if math.IsNaN(avgLatency) {
+		return nil, nil
+	}
 	return &avgLatency, nil
 }