fix: Don't print value with error on invalid JSON (#503)

erezrokah · web-flow · commit 4b368246dcb4 · 2022-12-14T18:30:13.000Z
So we don't print PII

---
diff --git a/schema/json.go b/schema/json.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"reflect"
 )
 
@@ -57,7 +56,7 @@ func (dst *JSON) Set(src interface{}) error {
 			return nil
 		}
 		if !json.Valid([]byte(value)) {
-			return fmt.Errorf("invalid json: %s", value)
+			return errors.New("invalid JSON string value")
 		}
 		*dst = JSON{Bytes: []byte(value), Status: Present}
 	case *string:
@@ -69,7 +68,7 @@ func (dst *JSON) Set(src interface{}) error {
 				return nil
 			}
 			if !json.Valid([]byte(*value)) {
-				return fmt.Errorf("invalid json: %s", *value)
+				return errors.New("invalid JSON string pointer value")
 			}
 			*dst = JSON{Bytes: []byte(*value), Status: Present}
 		}
@@ -83,7 +82,7 @@ func (dst *JSON) Set(src interface{}) error {
 			}
 
 			if !json.Valid(value) {
-				return fmt.Errorf("invalid json: %s", value)
+				return errors.New("invalid JSON byte array value")
 			}
 			*dst = JSON{Bytes: value, Status: Present}
 		}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"encoding/json"`
`6`	`6`	`"errors"`
`7`		`- "fmt"`
`8`	`7`	`"reflect"`
`9`	`8`	`)`
`10`	`9`
`@@ -57,7 +56,7 @@ func (dst *JSON) Set(src interface{}) error {`
`57`	`56`	`return nil`
`58`	`57`	`}`
`59`	`58`	`if !json.Valid([]byte(value)) {`
`60`		`- return fmt.Errorf("invalid json: %s", value)`
	`59`	`+ return errors.New("invalid JSON string value")`
`61`	`60`	`}`
`62`	`61`	`*dst = JSON{Bytes: []byte(value), Status: Present}`
`63`	`62`	`case *string:`
`@@ -69,7 +68,7 @@ func (dst *JSON) Set(src interface{}) error {`
`69`	`68`	`return nil`
`70`	`69`	`}`
`71`	`70`	`if !json.Valid([]byte(*value)) {`
`72`		`- return fmt.Errorf("invalid json: %s", *value)`
	`71`	`+ return errors.New("invalid JSON string pointer value")`
`73`	`72`	`}`
`74`	`73`	`dst = JSON{Bytes: []byte(value), Status: Present}`
`75`	`74`	`}`
`@@ -83,7 +82,7 @@ func (dst *JSON) Set(src interface{}) error {`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`if !json.Valid(value) {`
`86`		`- return fmt.Errorf("invalid json: %s", value)`
	`85`	`+ return errors.New("invalid JSON byte array value")`
`87`	`86`	`}`
`88`	`87`	`*dst = JSON{Bytes: value, Status: Present}`
`89`	`88`	`}`