Merge pull request #119 from suborbital/connor/runnable-request-input

Use CoordinatedRequest body as Runnable input

Author: cohix

rwasm/wasmrunnable.go

@@ -2,7 +2,6 @@ package rwasm
 
 import (
 	"encoding/json"
-	"fmt"
 
 	"github.com/suborbital/reactr/request"
 	"github.com/suborbital/reactr/rt"
@@ -51,11 +50,10 @@ func (w *Runner) Run(job rt.Job, ctx *rt.Ctx) (interface{}, error) {
 		jobBytes = bytes
 	} else {
 		// if the job is a request, add it to the Ctx and
-		// set the job input to be a summary of the request
+		// set the job input to be the body of the request
 		ctx.UseRequest(req)
 
-		input := fmt.Sprintf("%s %s %s", req.Method, req.URL, req.ID)
-		jobBytes = []byte(input)
+		jobBytes = req.Body
 	}
 
 	var output []byte
@@ -118,7 +116,7 @@ func (w *Runner) Run(job rt.Job, ctx *rt.Ctx) (interface{}, error) {
 	return output, nil
 }
 
-// OnChange evt ChangeEventruns when a worker starts using this Runnable
+// OnChange runs when a worker starts using this Runnable
 func (w *Runner) OnChange(evt rt.ChangeEvent) error {
 	if evt == rt.ChangeTypeStart {
 		if err := w.env.addInstance(); err != nil {

rwasm/wasmtest/rust_test.go

@@ -124,6 +124,43 @@ func TestWasmRunnerWithRequest(t *testing.T) {
 	}
 }
 
+func TestEmptyRequestBody(t *testing.T) {
+	r := rt.New()
+
+	// using a Rust module
+	doWasm := r.Register("wasm", rwasm.NewRunner("../testdata/log/log.wasm"))
+
+	req := &request.CoordinatedRequest{
+		Method: "GET",
+		URL:    "/hello/world",
+		ID:     uuid.New().String(),
+		Body:   []byte{},
+		State: map[string][]byte{
+			"hello": []byte("what is up"),
+		},
+	}
+
+	reqJSON, err := req.ToJSON()
+	if err != nil {
+		t.Error("failed to ToJSON", err)
+	}
+
+	res, err := doWasm(reqJSON).Then()
+	if err != nil {
+		t.Error(errors.Wrap(err, "failed to Then"))
+		return
+	}
+
+	resp := &request.CoordinatedResponse{}
+	if err := json.Unmarshal(res.([]byte), resp); err != nil {
+		t.Error("failed to Unmarshal response")
+	}
+
+	if string(resp.Output) != "hello what is up" {
+		t.Error(fmt.Errorf("expected 'hello, what is up', got %s", string(res.([]byte))))
+	}
+}
+
 func TestContentType(t *testing.T) {
 	body := testBody{
 		Username: "cohix",