fix: trigger result json unmarshal

server/test/test_json.go

@@ -180,7 +180,9 @@ func (output *RunOutput) UnmarshalJSON(data []byte) error {
 	output.Value = obj.Value
 	output.SpanID = obj.SpanID
 	output.Resolved = obj.Resolved
-	output.Error = fmt.Errorf(obj.Error)
+	if err = stringToErr(obj.Error); err != nil {
+		output.Error = err
+	}
 	return nil
 }
 

server/test/trigger/trigger_json.go

@@ -2,6 +2,7 @@ package trigger
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/fluidtruck/deepcopy"
 	jsoniter "github.com/json-iterator/go"
@@ -104,3 +105,53 @@ func (t *Trigger) UnmarshalJSON(data []byte) error {
 
 	return nil
 }
+
+type triggerResultV1 struct {
+	Type    TriggerType      `json:"type"`
+	HTTP    *HTTPResponse    `json:"http,omitempty"`
+	GRPC    *GRPCResponse    `json:"grpc,omitempty"`
+	TraceID *TraceIDResponse `json:"traceid,omitempty"`
+}
+
+func (tr *triggerResultV1) valid() bool {
+	return tr.Type != "" && (tr.HTTP != nil || tr.GRPC != nil || tr.TraceID != nil)
+}
+
+type triggerResultV2 struct {
+	Type    TriggerType      `json:"type"`
+	HTTP    *HTTPResponse    `json:"httpRequest,omitempty"`
+	GRPC    *GRPCResponse    `json:"grpc,omitempty"`
+	TraceID *TraceIDResponse `json:"traceid,omitempty"`
+}
+
+func (tr *triggerResultV2) valid() bool {
+	return tr.Type != "" && (tr.HTTP != nil || tr.GRPC != nil || tr.TraceID != nil)
+}
+
+func (t *TriggerResult) UnmarshalJSON(data []byte) error {
+	v2 := triggerResultV2{}
+	json.Unmarshal(data, &v2)
+
+	if v2.valid() {
+		t.Type = v2.Type
+		t.HTTP = v2.HTTP
+		t.GRPC = v2.GRPC
+		t.TraceID = v2.TraceID
+
+		return nil
+	}
+
+	v1 := triggerResultV1{}
+	json.Unmarshal(data, &v1)
+
+	if v1.valid() {
+		t.Type = v1.Type
+		t.HTTP = v1.HTTP
+		t.GRPC = v1.GRPC
+		t.TraceID = v1.TraceID
+
+		return nil
+	}
+
+	return fmt.Errorf("invalid version of TriggerResult. Expected 1 or 2")
+}

server/test/trigger/trigger_json_test.go

@@ -104,3 +104,83 @@ func TestTriggerFormatV3(t *testing.T) {
 
 	assert.Equal(t, expected, current)
 }
+
+func TestTriggerResultV1(t *testing.T) {
+	v1 := struct {
+		Type    trigger.TriggerType
+		HTTP    *trigger.HTTPResponse
+		GRPC    *trigger.GRPCResponse
+		TraceID *trigger.TraceIDResponse
+	}{
+		Type: trigger.TriggerTypeHTTP,
+		HTTP: &trigger.HTTPResponse{
+			Status:     "200",
+			StatusCode: 200,
+			Headers: []trigger.HTTPHeader{
+				{Key: "Content-Type", Value: "application/json"},
+			},
+			Body: "this is a body",
+		},
+	}
+
+	expected := trigger.TriggerResult{
+		Type: trigger.TriggerTypeHTTP,
+		HTTP: &trigger.HTTPResponse{
+			Status:     "200",
+			StatusCode: 200,
+			Headers: []trigger.HTTPHeader{
+				{Key: "Content-Type", Value: "application/json"},
+			},
+			Body: "this is a body",
+		},
+	}
+
+	v1Json, err := json.Marshal(v1)
+	require.NoError(t, err)
+
+	current := trigger.TriggerResult{}
+	err = json.Unmarshal(v1Json, &current)
+	require.NoError(t, err)
+
+	assert.Equal(t, expected, current)
+}
+
+func TestTriggerResultV2(t *testing.T) {
+	v2 := struct {
+		Type    trigger.TriggerType      `json:"type,omitEmpty"`
+		HTTP    *trigger.HTTPResponse    `json:"httpRequest,omitEmpty"`
+		GRPC    *trigger.GRPCResponse    `json:"grpc,omitEmpty"`
+		TraceID *trigger.TraceIDResponse `json:"traceid,omitEmpty"`
+	}{
+		Type: trigger.TriggerTypeHTTP,
+		HTTP: &trigger.HTTPResponse{
+			Status:     "200",
+			StatusCode: 200,
+			Headers: []trigger.HTTPHeader{
+				{Key: "Content-Type", Value: "application/json"},
+			},
+			Body: "this is a body",
+		},
+	}
+
+	expected := trigger.TriggerResult{
+		Type: trigger.TriggerTypeHTTP,
+		HTTP: &trigger.HTTPResponse{
+			Status:     "200",
+			StatusCode: 200,
+			Headers: []trigger.HTTPHeader{
+				{Key: "Content-Type", Value: "application/json"},
+			},
+			Body: "this is a body",
+		},
+	}
+
+	v1Json, err := json.Marshal(v2)
+	require.NoError(t, err)
+
+	current := trigger.TriggerResult{}
+	err = json.Unmarshal(v1Json, &current)
+	require.NoError(t, err)
+
+	assert.Equal(t, expected, current)
+}