fix flatten json assign with error

amyangfei · Jan 1, 2019 · e357bb3 · e357bb3
1 parent ee9ff40
commit e357bb3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/plugins/parser/json/flatten.go b/plugins/parser/json/flatten.go
@@ -74,12 +74,18 @@ func flatten(top bool, flatMap map[string]interface{}, nested interface{}, prefi
 		case map[string]interface{}:
 			for k, v := range nested.(map[string]interface{}) {
 				newKey := enkey(top, prefix, k, separator)
-				assign(newKey, v)
+				err := assign(newKey, v)
+				if err != nil {
+					return errors.Trace(err)
+				}
 			}
 		case []interface{}:
 			for i, v := range nested.([]interface{}) {
 				newKey := enkey(top, prefix, strconv.Itoa(i), separator)
-				assign(newKey, v)
+				err := assign(newKey, v)
+				if err != nil {
+					return errors.Trace(err)
+				}
 			}
 		default:
 			return ErrorInvalidInput

diff --git a/plugins/parser/json/flatten_test.go b/plugins/parser/json/flatten_test.go
@@ -132,7 +132,8 @@ func TestFlattenError(t *testing.T) {
 	_, err = FlattenString(`{"a": "b"}`, prefix, separator)
 	assert.Equal(t, ErrorInvalidInput, errors.Cause(err))
 
+	gofail.Enable("github.com/amyangfei/go-logster/plugins/parser/json/FlattenError1", `return(false)`)
 	gofail.Enable("github.com/amyangfei/go-logster/plugins/parser/json/FlattenError2", `return(true)`)
-	_, err = FlattenString(`{"a": "b"}`, prefix, separator)
+	_, err = Flatten(map[string]interface{}{"a": []interface{}{1, 2}}, prefix, separator)
 	assert.Equal(t, ErrorInvalidInput, errors.Cause(err))
 }