Skip to content

Commit 99984a4

Browse files
authored
update yaml (#181)
1 parent 3f2daf4 commit 99984a4

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

config/parse.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
// Parse parse bytes to config
1111
func Parse(data []byte, config interface{}) error {
12-
err := yaml.Unmarshal(data, config, yaml.DecoderWithFieldNameMarshaler(FieldNameMarshaler))
12+
err := yaml.Unmarshal(data, config)
1313
if err != nil {
1414
return fmt.Errorf("invalid config: %w", err)
1515
}
@@ -18,7 +18,7 @@ func Parse(data []byte, config interface{}) error {
1818

1919
// ToString returns string representation of Config
2020
func ToString(config interface{}) string {
21-
b, _ := yaml.Marshal(config, yaml.EncoderWithFieldNameMarshaler(FieldNameMarshaler))
21+
b, _ := yaml.Marshal(config)
2222
return string(b)
2323
}
2424

go.mod

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ require (
1616
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
1717
golang.org/x/net v0.0.0-20210502030024-e5908800b52b
1818
google.golang.org/grpc v1.29.1
19-
gopkg.in/yaml.v2 v2.2.8
20-
)
21-
22-
replace gopkg.in/yaml.v2 v2.2.8 => github.com/cizmazia/yaml v0.0.0-20200220134304-2008791f5454
19+
gopkg.in/yaml.v2 v2.4.0
20+
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w
258258
gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
259259
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
260260
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
261+
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
262+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
261263
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
262264
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
263265
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

0 commit comments

Comments
 (0)