fix runner response (#517)

Makefile

@@ -1,4 +1,5 @@
 # Just builds
+.PHONY: all test dep build
 
 DIR := ${CURDIR}
 

api/models/error_body.go

@@ -1,8 +1,8 @@
 package models
 
 type ErrorBody struct {
-	Message   string `json:"message,omitempty"`
+	Message string `json:"message,omitempty"`
-	RequestID string `json:"request_id,omitempty"`
+	Fields  string `json:"fields,omitempty"`
 }
 
 // Validate validates this error body

api/server/runner.go

@@ -12,8 +12,6 @@ import (
 	"strings"
 	"time"
 
-	"encoding/json"
-
 	"github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	"github.com/iron-io/functions/api"
@@ -24,6 +22,11 @@ import (
 	uuid "github.com/satori/go.uuid"
 )
 
+type runnerResponse struct {
+	RequestID string            `json:"request_id,omitempty"`
+	Error     *models.ErrorBody `json:"error,omitempty"`
+}
+
 func (s *Server) handleSpecial(c *gin.Context) {
 	ctx := c.MustGet("ctx").(context.Context)
 	log := common.Logger(ctx)
@@ -232,19 +235,19 @@ func (s *Server) serve(ctx context.Context, c *gin.Context, appName string, foun
 		case "success":
 			c.Data(http.StatusOK, "", stdout.Bytes())
 		case "timeout":
-			c.AbortWithStatus(http.StatusGatewayTimeout)
+			c.JSON(http.StatusGatewayTimeout, runnerResponse{
-		default:
-			errMsg := &models.ErrorBody{
-				Message:   result.Error(),
 				RequestID: cfg.ID,
-			}
+				Error: &models.ErrorBody{
-
+					Message: models.ErrRunnerTimeout.Error(),
-			errStr, err := json.Marshal(errMsg)
+				},
-			if err != nil {
+			})
-				c.AbortWithStatus(http.StatusInternalServerError)
+		default:
-			}
+			c.JSON(http.StatusInternalServerError, runnerResponse{
-
+				RequestID: cfg.ID,
-			c.Data(http.StatusInternalServerError, "", errStr)
+				Error: &models.ErrorBody{
+					Message: result.Error(),
+				},
+			})
 		}
 	}