Initial refactor to request/response format

Signed-off-by: Alex Ellis <[email protected]>

Author: alexellis

template/golang-http/Dockerfile

@@ -7,6 +7,7 @@ RUN apk --no-cache add curl \
     && chmod +x /usr/bin/fwatchdog \
     && apk del curl --no-cache
 
+RUN mkdir -p /go/src/handler
 WORKDIR /go/src/handler
 COPY . .
 

template/golang-http/Gopkg.lock

@@ -0,0 +1,26 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/openfaas-incubator/go-function-sdk"

template/golang-http/Gopkg.toml

@@ -2,9 +2,19 @@ package function
 
 import (
 	"fmt"
+	"net/http"
+
+	"github.com/openfaas-incubator/go-function-sdk"
 )
 
-// Handle a serverless request
-func Handle(req []byte) string {
-	return fmt.Sprintf("Hello, Go. You said: %s", string(req))
+// Handle a function invocation
+func Handle(req handler.Request) (handler.Response, error) {
+	var err error
+
+	message := fmt.Sprintf("Hello world, input was: %s", string(req.Body))
+
+	return handler.Response{
+		Body:       []byte(message),
+		StatusCode: http.StatusOK,
+	}, err
 }

template/golang-http/function/handler.go

@@ -8,14 +8,15 @@ import (
 	"time"
 
 	"handler/function"
+	// "github.com/alexellis/golang-http-template/template/golang-http/function"
+	"github.com/openfaas-incubator/go-function-sdk"
 )
 
 func makeRequestHandler() func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var input []byte
 
 		if r.Body != nil {
-
 			defer r.Body.Close()
 
 			bodyBytes, bodyErr := ioutil.ReadAll(r.Body)
@@ -27,10 +28,24 @@ func makeRequestHandler() func(http.ResponseWriter, *http.Request) {
 			input = bodyBytes
 		}
 
-		result := function.Handle(input)
+		req := handler.Request{
+			Body:   input,
+			Header: r.Header,
+		}
+
+		result, resultErr := function.Handle(req)
+
+		if resultErr != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+		} else {
+			if result.StatusCode == 0 {
+				w.WriteHeader(http.StatusOK)
+			} else {
+				w.WriteHeader(result.StatusCode)
+			}
+		}
 
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(result))
+		w.Write(result.Body)
 	}
 }