Propagate Context to the handler.Request

alexellis · alexellis · commit 3411110a58cb · 2020-04-05T09:42:09.000+01:00
This change makes the Context available for use or cancellation
within the handler.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) &lt;alexellis2@gmail.com&gt;
diff --git a/template/golang-http/function/handler.go b/template/golang-http/function/handler.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/openfaas-incubator/go-function-sdk"
+	handler "github.com/openfaas-incubator/go-function-sdk"
 )
 
 // Handle a function invocation
diff --git a/template/golang-http/go.mod b/template/golang-http/go.mod
@@ -4,4 +4,6 @@ go 1.13
 
 replace handler/function => ./function
 
-require github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921
+// require github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921
+
+require github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33
diff --git a/template/golang-http/go.sum b/template/golang-http/go.sum
@@ -1,2 +1,2 @@
-github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921 h1:IGP0tlTdv6r/zy3Kw61EhiXao61krCUs5KRHWSzCdxM=
-github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921/go.mod h1:F37Kp+hwdHP+o3UKjkGzikQg4weKiMvcegT9vCQjvjE=
+github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33 h1:KhbcrtXR+IO7IWF08RzKpgMudBhEeRRqNmRurE1iph4=
+github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33/go.mod h1:F37Kp+hwdHP+o3UKjkGzikQg4weKiMvcegT9vCQjvjE=
diff --git a/template/golang-http/main.go b/template/golang-http/main.go
@@ -97,6 +97,7 @@ func makeRequestHandler() func(http.ResponseWriter, *http.Request) {
 			Method:      r.Method,
 			QueryString: r.URL.RawQuery,
 		}
+		req.WithContext(r.Context())
 
 		result, resultErr := function.Handle(req)
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"net/http"`
`6`	`6`
`7`		`- "github.com/openfaas-incubator/go-function-sdk"`
	`7`	`+ handler "github.com/openfaas-incubator/go-function-sdk"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// Handle a function invocation`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ func makeRequestHandler() func(http.ResponseWriter, *http.Request) {`
`97`	`97`	`Method: r.Method,`
`98`	`98`	`QueryString: r.URL.RawQuery,`
`99`	`99`	`}`
	`100`	`+ req.WithContext(r.Context())`
`100`	`101`
`101`	`102`	`result, resultErr := function.Handle(req)`
`102`	`103`