Skip to content

Commit f7ba3d0

Browse files
committed
fix test break for TOML JSON convertion
Based on https://github.com/pelletier/go-toml/blob/352072d51afc24d769bd644d0ee25b5f77749fa7/cmd/tomljson/main.go#L56 Commit 0f7345b updated toml library version, however, the library have changed its check logic for input. This issue is now fixed.
1 parent 054e667 commit f7ba3d0

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

infra/conf/json/toml.go

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,36 @@
11
package json
22

33
import (
4+
"bytes"
45
"encoding/json"
6+
"io"
57

68
"github.com/pelletier/go-toml"
79
)
810

911
// FromTOML convert toml to json
1012
func FromTOML(v []byte) ([]byte, error) {
11-
m := make(map[string]interface{})
12-
if err := toml.Unmarshal(v, &m); err != nil {
13+
tomlReader := bytes.NewReader(v)
14+
jsonStr, err := jsonFromTomlReader(tomlReader)
15+
if err != nil {
1316
return nil, err
1417
}
15-
j, err := json.Marshal(m)
18+
return []byte(jsonStr), nil
19+
}
20+
21+
func jsonFromTomlReader(r io.Reader) (string, error) {
22+
tree, err := toml.LoadReader(r)
1623
if err != nil {
17-
return nil, err
24+
return "", err
25+
}
26+
return mapToJSON(tree)
27+
}
28+
29+
func mapToJSON(tree *toml.Tree) (string, error) {
30+
treeMap := tree.ToMap()
31+
bytes, err := json.MarshalIndent(treeMap, "", " ")
32+
if err != nil {
33+
return "", err
1834
}
19-
return j, nil
35+
return string(bytes[:]), nil
2036
}

0 commit comments

Comments
 (0)