From 41bd9d49577572a46553eed84257fffbf0aa6f01 Mon Sep 17 00:00:00 2001
From: Denise Li <dli@squareup.com>
Date: Thu, 9 May 2024 16:39:35 -0400
Subject: [PATCH] fix: replace json.RawMessage with underlying []byte type in
 ingress response (#1454)

Fixes https://github.com/TBD54566975/ftl/issues/1439

Alec was right - the `[]byte` array was the right solution here! The
response does come back encoded the same way it was when it was typed
`json.RawMessage`. I confirmed in
`backend/controller/ingress/handler_test.go` (which would fail if we
made the `encoding.go` change without the `response.go` change) and also
cleaned up the test a bit.
---
 backend/controller/ingress/handler_test.go |  8 ++------
 backend/controller/ingress/response.go     |  4 ++--
 go-runtime/encoding/encoding.go            | 10 ----------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/backend/controller/ingress/handler_test.go b/backend/controller/ingress/handler_test.go
index 012571d390..c1ceb7f59b 100644
--- a/backend/controller/ingress/handler_test.go
+++ b/backend/controller/ingress/handler_test.go
@@ -85,17 +85,13 @@ func TestIngress(t *testing.T) {
 			method:     "GET",
 			path:       "/getAlias",
 			query:      url.Values{"alias": {"value"}},
-			response:   optional.Some(ingress.HTTPResponse{Body: []byte(`{}`)}),
+			response:   optional.Some(ingress.HTTPResponse{Body: []byte(`{"key":"value"}`)}),
 			statusCode: http.StatusOK},
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			rec := httptest.NewRecorder()
 			rec.Body = &bytes.Buffer{}
-			var response ingress.HTTPResponse
-			var ok bool
-			if response, ok = test.response.Get(); ok {
-				response = ingress.HTTPResponse{Body: []byte(`{}`)}
-			}
+			response, _ := test.response.Get()
 			req := httptest.NewRequest(test.method, test.path, bytes.NewBuffer(test.payload)).WithContext(ctx)
 			req.URL.RawQuery = test.query.Encode()
 			reqKey := model.NewRequestKey(model.OriginIngress, "test")
diff --git a/backend/controller/ingress/response.go b/backend/controller/ingress/response.go
index 7efe402b86..d3804799fd 100644
--- a/backend/controller/ingress/response.go
+++ b/backend/controller/ingress/response.go
@@ -16,8 +16,8 @@ import (
 type HTTPResponse struct {
 	Status  int                 `json:"status,omitempty"`
 	Headers map[string][]string `json:"headers,omitempty"`
-	Body    json.RawMessage     `json:"body,omitempty"`
-	Error   json.RawMessage     `json:"error,omitempty"`
+	Body    []byte              `json:"body,omitempty"`
+	Error   []byte              `json:"error,omitempty"`
 }
 
 // ResponseForVerb returns the HTTP response for a given verb.
diff --git a/go-runtime/encoding/encoding.go b/go-runtime/encoding/encoding.go
index 4ddf175173..40a1c8d332 100644
--- a/go-runtime/encoding/encoding.go
+++ b/go-runtime/encoding/encoding.go
@@ -59,16 +59,6 @@ func encodeValue(ctx context.Context, v reflect.Value, w *bytes.Buffer) error {
 	case t.Implements(optionMarshaler):
 		enc := v.Interface().(OptionMarshaler) //nolint:forcetypeassert
 		return enc.Marshal(ctx, w, encodeValue)
-
-	// TODO(Issue #1439): remove this special case by removing all usage of
-	// json.RawMessage, which is not a type we support.
-	case t == reflect.TypeFor[json.RawMessage]():
-		data, err := json.Marshal(v.Interface())
-		if err != nil {
-			return err
-		}
-		w.Write(data)
-		return nil
 	}
 
 	switch v.Kind() {