Skip to content

Commit cb69e30

Browse files
committed
Migrate to go-yaml
1 parent aa4cc21 commit cb69e30

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import (
5252
"strings"
5353
"time"
5454

55-
"github.com/cloudfoundry-incubator/candiedyaml"
55+
"github.com/go-yaml/yaml"
5656
"github.com/moriyoshi/mimetypes"
5757
"github.com/pkg/errors"
5858
)
@@ -1035,7 +1035,7 @@ func loadConfig(yamlFile string, progname string) (*Config, error) {
10351035
return nil, errors.Wrapf(err, "failed to load %s", yamlFile)
10361036
}
10371037
configMap := make(map[string]interface{})
1038-
err = candiedyaml.NewDecoder(f).Decode(&configMap)
1038+
err = yaml.NewDecoder(f).Decode(&configMap)
10391039
if err != nil {
10401040
return nil, errors.Wrapf(err, "failed to load %s", yamlFile)
10411041
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module github.com/moriyoshi/devproxy
22

33
require (
4-
github.com/cloudfoundry-incubator/candiedyaml v0.0.0-20170901234223-a41693b7b7af
4+
github.com/go-yaml/yaml v2.1.0+incompatible
55
github.com/moriyoshi/mimetypes v1.0.0
66
github.com/moriyoshi/simplefiletx v1.0.0
77
github.com/pkg/errors v0.8.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
github.com/cloudfoundry-incubator/candiedyaml v0.0.0-20170901234223-a41693b7b7af h1:6Cpkahw28+gcBdnXQL7LcMTX488+6jl6hfoTMRT6Hm4=
2-
github.com/cloudfoundry-incubator/candiedyaml v0.0.0-20170901234223-a41693b7b7af/go.mod h1:dOLSIXcRQJiDS1vlrYFNJicoHNZLsBKideE+70hGdV4=
31
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2+
github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
3+
github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
44
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
55
github.com/moriyoshi/mimetypes v0.0.0-20190202045042-755ee14f84d1 h1:bkfXqqnax2WOUl+xXFd/gxHivPUsagFtANxsgRx31Nw=
66
github.com/moriyoshi/mimetypes v0.0.0-20190202045042-755ee14f84d1/go.mod h1:BhYJSMKygU9xeSsBmDuWn+ger4JXdBwCzDazbMBPt/0=

0 commit comments

Comments
 (0)