fix: allow specifying end of stream for OnHttpRequestBody & OnHttpRequestHeaders (#83)

Co-authored-by: Wim Spaargaren <[email protected]>

Author: wimspaargaren

proxytest/http.go

@@ -310,18 +310,28 @@ func (h *httpHostEmulator) HttpFilterInitContext() (contextID uint32) {
 
 // impl HostEmulator
 func (h *httpHostEmulator) HttpFilterPutRequestHeaders(contextID uint32, headers [][2]string) {
+	h.HttpFilterPutRequestHeadersEndOfStream(contextID, headers, false)
+}
+
+// impl HostEmulator
+func (h *httpHostEmulator) HttpFilterPutRequestHeadersEndOfStream(contextID uint32, headers [][2]string, endOfStream bool) {
 	cs, ok := h.httpStreams[contextID]
 	if !ok {
 		log.Fatalf("invalid context id: %d", contextID)
 	}
 
 	cs.requestHeaders = headers
 	cs.action = proxywasm.ProxyOnRequestHeaders(contextID,
-		len(headers), false) // TODO: allow for specifying end_of_stream
+		len(headers), endOfStream)
 }
 
 // impl HostEmulator
 func (h *httpHostEmulator) HttpFilterPutResponseHeaders(contextID uint32, headers [][2]string) {
+	h.HttpFilterPutResponseHeadersEndOfStream(contextID, headers, false)
+}
+
+// impl HostEmulator
+func (h *httpHostEmulator) HttpFilterPutResponseHeadersEndOfStream(contextID uint32, headers [][2]string, endOfStream bool) {
 	cs, ok := h.httpStreams[contextID]
 	if !ok {
 		log.Fatalf("invalid context id: %d", contextID)
@@ -330,7 +340,7 @@ func (h *httpHostEmulator) HttpFilterPutResponseHeaders(contextID uint32, header
 	cs.responseHeaders = headers
 
 	cs.action = proxywasm.ProxyOnResponseHeaders(contextID,
-		len(headers), false) // TODO: allow for specifying end_of_stream
+		len(headers), endOfStream)
 }
 
 // impl HostEmulator
@@ -357,16 +367,22 @@ func (h *httpHostEmulator) HttpFilterPutResponseTrailers(contextID uint32, heade
 
 // impl HostEmulator
 func (h *httpHostEmulator) HttpFilterPutRequestBody(contextID uint32, body []byte) {
+	h.HttpFilterPutRequestBodyEndOfStream(contextID, body, false)
+}
+
+// impl HostEmulator
+func (h *httpHostEmulator) HttpFilterPutRequestBodyEndOfStream(contextID uint32, body []byte, endOfStream bool) {
 	cs, ok := h.httpStreams[contextID]
 	if !ok {
 		log.Fatalf("invalid context id: %d", contextID)
 	}
 
 	cs.requestBody = body
 	cs.action = proxywasm.ProxyOnRequestBody(contextID,
-		len(body), false) // TODO: allow for specifying end_of_stream
+		len(body), endOfStream)
 }
 
+// impl HostEmulator
 func (h *httpHostEmulator) HttpFilterGetRequestBody(contextID uint32) []byte {
 	cs, ok := h.httpStreams[contextID]
 	if !ok {
@@ -378,16 +394,21 @@ func (h *httpHostEmulator) HttpFilterGetRequestBody(contextID uint32) []byte {
 
 // impl HostEmulator
 func (h *httpHostEmulator) HttpFilterPutResponseBody(contextID uint32, body []byte) {
+	h.HttpFilterPutResponseBodyEndOfStream(contextID, body, false)
+}
+
+func (h *httpHostEmulator) HttpFilterPutResponseBodyEndOfStream(contextID uint32, body []byte, endOfStream bool) {
 	cs, ok := h.httpStreams[contextID]
 	if !ok {
 		log.Fatalf("invalid context id: %d", contextID)
 	}
 
 	cs.responseBody = body
 	cs.action = proxywasm.ProxyOnResponseBody(contextID,
-		len(body), false) // TODO: allow for specifying end_of_stream
+		len(body), endOfStream)
 }
 
+// impl HostEmulator
 func (h *httpHostEmulator) HttpFilterGetResponseBody(contextID uint32) []byte {
 	cs, ok := h.httpStreams[contextID]
 	if !ok {

proxytest/proxytest.go

@@ -37,12 +37,16 @@ type HostEmulator interface {
 	// http
 	HttpFilterInitContext() (contextID uint32)
 	HttpFilterPutRequestHeaders(contextID uint32, headers [][2]string)
+	HttpFilterPutRequestHeadersEndOfStream(contextID uint32, headers [][2]string, endOfStream bool)
 	HttpFilterPutResponseHeaders(contextID uint32, headers [][2]string)
+	HttpFilterPutResponseHeadersEndOfStream(contextID uint32, headers [][2]string, endOfStream bool)
 	HttpFilterPutRequestTrailers(contextID uint32, headers [][2]string)
 	HttpFilterPutResponseTrailers(contextID uint32, headers [][2]string)
 	HttpFilterPutRequestBody(contextID uint32, body []byte)
+	HttpFilterPutRequestBodyEndOfStream(contextID uint32, body []byte, endOfStream bool)
 	HttpFilterGetRequestBody(contextID uint32) []byte
 	HttpFilterPutResponseBody(contextID uint32, body []byte)
+	HttpFilterPutResponseBodyEndOfStream(contextID uint32, body []byte, endOfStream bool)
 	HttpFilterGetResponseBody(contextID uint32) []byte
 	HttpFilterCompleteHttpStream(contextID uint32)
 	HttpFilterGetCurrentStreamAction(contextID uint32) types.Action