Update tests to work with option.Option

Author: eandre

e2e-tests/testdata/echo/endtoend/endtoend.go

@@ -19,6 +19,7 @@ import (
 	"encore.dev/rlog"
 	"encore.dev/types/option"
 	"encore.dev/types/uuid"
+	"github.com/google/go-cmp/cmp"
 )
 
 var assertNumber = 0
@@ -136,7 +137,10 @@ func GeneratedWrappersEndToEndTest(ctx context.Context) (err error) {
 	assert(err, nil, "unable to marshal response to JSON")
 	reqAsJSON, err := json.Marshal(params)
 	assert(err, nil, "unable to marshal response to JSON")
-	assert(respAsJSON, reqAsJSON, "Expected the same response from the marshaller test")
+	if diff := cmp.Diff(string(respAsJSON), string(reqAsJSON)); diff != "" {
+		assertNumber++
+		panic(fmt.Sprintf("Assertion Failure %d: %s", assertNumber, diff))
+	}
 
 	// Test the raw endpoint (Unsupported currently in service to service calls)
 	// {

e2e-tests/testdata/echo/go.mod

@@ -1,5 +1,8 @@
 module encore.app
 
-go 1.21.0
+go 1.24.0
 
-require encore.dev v1.9.3
+require (
+	encore.dev v1.52.0
+	github.com/google/go-cmp v0.7.0
+)

e2e-tests/testdata/echo/go.sum

@@ -1,2 +1,4 @@
-encore.dev v1.9.3 h1:EyAw58b7lBRQipL/p27gRXKwyopwyGsUuIpqZpTIOzw=
-encore.dev v1.9.3/go.mod h1:AyQpBJoalNCFScvYfjzLtOJh/KEYue/pNljoz/aA6UQ=
+encore.dev v1.52.0 h1:e8LbHiccXLI3M4Oc3HbvWoVy8AyNyBJm7wY7NsPwCd4=
+encore.dev v1.52.0/go.mod h1:lK8vSJG6uhYeUwT87/FEpcLdiN98QUcotd3gxRX0xDw=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=

e2e-tests/testdata/echo_client/go.mod

@@ -1,3 +1,5 @@
 module echo_client
 
-go 1.18
+go 1.21
+
+require github.com/google/go-cmp v0.7.0

e2e-tests/testdata/echo_client/go.sum

@@ -0,0 +1,2 @@
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=

e2e-tests/testdata/echo_client/golang/client/goclient.go

@@ -456,7 +456,7 @@ class TestServiceClient {
         rtn.HeaderJson = JSON.parse(mustBeSet("Header `x-json`", resp.headers.get("x-json")))
         rtn.HeaderUUID = mustBeSet("Header `x-uuid`", resp.headers.get("x-uuid"))
         rtn.HeaderUserID = mustBeSet("Header `x-user-id`", resp.headers.get("x-user-id"))
-        rtn.HeaderOption = mustBeSet("Header `x-option`", resp.headers.get("x-option"))
+        rtn.HeaderOption = resp.headers.get("x-option")
         return rtn
     }