fix: Validate json strings and handle empty strings (#497)

yevgenypats · web-flow · commit dd5f008ee465 · 2022-12-13T22:07:04.000Z
Continuation of the work here https://github.com/cloudquery/plugin-sdk/pull/479/files
diff --git a/schema/json.go b/schema/json.go
@@ -51,17 +51,45 @@ func (dst *JSON) Set(src interface{}) error {
 
 	switch value := src.(type) {
 	case string:
+		if value == "" {
+			*dst = JSON{Bytes: []byte(""), Status: Null}
+			return nil
+		}
+		// validate this is a valid json string
+		err := json.Unmarshal([]byte(value), &struct{}{})
+		if err != nil {
+			return err
+		}
 		*dst = JSON{Bytes: []byte(value), Status: Present}
 	case *string:
 		if value == nil {
 			*dst = JSON{Status: Null}
 		} else {
+			if *value == "" {
+				*dst = JSON{Bytes: []byte(""), Status: Null}
+				return nil
+			}
+			// validate this is a valid json
+			err := json.Unmarshal([]byte(*value), &struct{}{})
+			if err != nil {
+				return err
+			}
 			*dst = JSON{Bytes: []byte(*value), Status: Present}
 		}
 	case []byte:
 		if value == nil {
 			*dst = JSON{Status: Null}
 		} else {
+			if string(value) == "" {
+				*dst = JSON{Bytes: []byte(""), Status: Null}
+				return nil
+			}
+
+			// validate this is a valid json
+			err := json.Unmarshal(value, &struct{}{})
+			if err != nil {
+				return err
+			}
 			*dst = JSON{Bytes: value, Status: Present}
 		}
 
diff --git a/schema/json_test.go b/schema/json_test.go
@@ -13,6 +13,7 @@ func TestJSONSet(t *testing.T) {
 		source interface{}
 		result JSON
 	}{
+		{source: "", result: JSON{Bytes: []byte(""), Status: Null}},
 		{source: "{}", result: JSON{Bytes: []byte("{}"), Status: Present}},
 		{source: []byte("{}"), result: JSON{Bytes: []byte("{}"), Status: Present}},
 		{source: ([]byte)(nil), result: JSON{Status: Null}},
