Skip to content

Commit 11540ea

Browse files
wy65701436wy65701436
authored
Merge pull request #12 from chlins/chore/downgrade-go-yaml
fix(configuration): restore yaml v2 parsing
2 parents a684c56 + 6ce74a4 commit 11540ea

25 files changed

Lines changed: 1084 additions & 2544 deletions

‎configuration/configuration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
. "gopkg.in/check.v1"
13-
"gopkg.in/yaml.v3"
13+
"gopkg.in/yaml.v2"
1414
)
1515

1616
// Hook up gocheck into the "go test" runner

‎configuration/parser.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010

1111
"github.com/sirupsen/logrus"
12-
"gopkg.in/yaml.v3"
12+
"gopkg.in/yaml.v2"
1313
)
1414

1515
// Version is a major/minor version pair of the form Major.Minor

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff
2929
google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8
3030
gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789
31-
gopkg.in/yaml.v3 v3.0.1
31+
gopkg.in/yaml.v2 v2.4.0
3232
rsc.io/letsencrypt v0.0.0-20161112011014-e770c10b0f1a
3333
)
3434

@@ -64,6 +64,7 @@ require (
6464
google.golang.org/appengine v0.0.0-20160301025000-12d5545dc1cf // indirect
6565
google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a // indirect
6666
gopkg.in/square/go-jose.v1 v1.0.1 // indirect
67+
gopkg.in/yaml.v3 v3.0.1 // indirect
6768
)
6869

6970
replace rsc.io/letsencrypt => github.com/dmcgowan/letsencrypt v0.0.0-20161112011014-e770c10b0f1a

‎go.sum‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789 h1:NMiUjDZiD6qDVeBOzpImftxX
127127
gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
128128
gopkg.in/square/go-jose.v1 v1.0.1 h1:jVeiLyj8z2C00p+KFfRmVWhqXQEnwoMDLt3fJEodlPY=
129129
gopkg.in/square/go-jose.v1 v1.0.1/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
130-
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
131130
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
131+
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
132+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
132133
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
133134
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
134135
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎vendor/gopkg.in/yaml.v2/.travis.yml‎

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/yaml.v2/LICENSE‎

Lines changed: 201 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/yaml.v3/LICENSE renamed to vendor/gopkg.in/yaml.v2/LICENSE.libyaml

Lines changed: 10 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/yaml.v3/NOTICE renamed to vendor/gopkg.in/yaml.v2/NOTICE

File renamed without changes.

vendor/gopkg.in/yaml.v3/README.md renamed to vendor/gopkg.in/yaml.v2/README.md

Lines changed: 7 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)