Chore: Render JSON field as string in golden output (#501)

data/frame.go

@@ -482,10 +482,18 @@ func (f *Frame) StringTable(maxFields, maxRows int) (string, error) {
 			}
 
 			val := reflect.Indirect(reflect.ValueOf(v))
-			if val.IsValid() {
-				sRow[colIdx] = fmt.Sprintf("%v", val)
-			} else {
+			if !val.IsValid() {
 				sRow[colIdx] = "null"
+				continue
+			}
+
+			switch {
+			case f.Fields[colIdx].Type() == FieldTypeJSON:
+				sRow[colIdx] = fmt.Sprintf("%s", v.(json.RawMessage))
+			case f.Fields[colIdx].Type() == FieldTypeNullableJSON:
+				sRow[colIdx] = fmt.Sprintf("%s", *v.(*json.RawMessage))
+			default:
+				sRow[colIdx] = fmt.Sprintf("%v", val)
 			}
 		}
 		table.Append(sRow)

experimental/golden_response_checker_test.go

@@ -1,6 +1,7 @@
 package experimental
 
 import (
+	"encoding/json"
 	"flag"
 	"path/filepath"
 	"testing"
@@ -77,6 +78,23 @@ func TestGoldenResponseChecker(t *testing.T) {
 
 		require.NoError(t, err)
 	})
+
+	t.Run("should render string for JSON fields", func(t *testing.T) {
+		m := map[string]int{"a": 1, "b": 2}
+		b, err := json.Marshal(m)
+		require.NoError(t, err)
+		r := json.RawMessage(b)
+		res := &backend.DataResponse{
+			Frames: data.Frames{
+				data.NewFrame("JSON frame",
+					data.NewField("json.RawMessage", nil, []json.RawMessage{r}),
+					data.NewField("*json.RawMessage", nil, []*json.RawMessage{&r}),
+				),
+			}}
+		goldenFile := filepath.Join("testdata", "frame-json.txt")
+		err = CheckGoldenDataResponse(goldenFile, res, true)
+		require.NoError(t, err)
+	})
 }
 
 func TestReadGoldenFile(t *testing.T) {

experimental/testdata/frame-json.txt

@@ -0,0 +1,16 @@
+🌟 This was machine generated.  Do not edit. 🌟
+
+Frame[0] 
+Name: JSON frame
+Dimensions: 2 Fields by 1 Rows
++-------------------------+--------------------------+
+| Name: json.RawMessage   | Name: *json.RawMessage   |
+| Labels:                 | Labels:                  |
+| Type: []json.RawMessage | Type: []*json.RawMessage |
++-------------------------+--------------------------+
+| {"a":1,"b":2}           | {"a":1,"b":2}            |
++-------------------------+--------------------------+
+
+
+====== TEST DATA RESPONSE (arrow base64) ======
+FRAME=QVJST1cxAAD/////oAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAFgAAAACAAAAKAAAAAQAAAD4/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAABj///8IAAAAFAAAAAoAAABKU09OIGZyYW1lAAAEAAAAbmFtZQAAAAACAAAAnAAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAASAAAAEgAAAAAAAQBRAAAAAEAAAAEAAAAgP///wgAAAAcAAAAEAAAACpqc29uLlJhd01lc3NhZ2UAAAAABAAAAG5hbWUAAAAAAAAAAHz///8QAAAAKmpzb24uUmF3TWVzc2FnZQAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABMAAAAUAAAAAAAAARMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAGAAAAA8AAABqc29uLlJhd01lc3NhZ2UABAAAAG5hbWUAAAAAAAAAAAQABAAEAAAADwAAAGpzb24uUmF3TWVzc2FnZQAAAAAA/////9gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAwAAAAAAAAABQAAAAAAAADBAAKABgADAAIAAQACgAAABQAAAB4AAAAAQAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAANAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAgAAAAAAAAAIAAAAAAAAAANAAAAAAAAAAAAAAACAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAADQAAAHsiYSI6MSwiYiI6Mn0AAAAAAAAADQAAAHsiYSI6MSwiYiI6Mn0AAAAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAOAAAAAAABAABAAAAsAEAAAAAAADgAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAFgAAAACAAAAKAAAAAQAAAD4/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAABj///8IAAAAFAAAAAoAAABKU09OIGZyYW1lAAAEAAAAbmFtZQAAAAACAAAAnAAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAASAAAAEgAAAAAAAQBRAAAAAEAAAAEAAAAgP///wgAAAAcAAAAEAAAACpqc29uLlJhd01lc3NhZ2UAAAAABAAAAG5hbWUAAAAAAAAAAHz///8QAAAAKmpzb24uUmF3TWVzc2FnZQAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABMAAAAUAAAAAAAAARMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAGAAAAA8AAABqc29uLlJhd01lc3NhZ2UABAAAAG5hbWUAAAAAAAAAAAQABAAEAAAADwAAAGpzb24uUmF3TWVzc2FnZQDIAQAAQVJST1cx