Skip to content

Commit e8122df

Browse files
committed
go.mod: Upgrade to gopkg.in/yaml.v3
Signed-off-by: Stephen Augustus <[email protected]>
1 parent da87f82 commit e8122df

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/spf13/pflag v1.0.5
1313
github.com/stretchr/testify v1.7.0
1414
golang.org/x/oauth2 v0.0.0-20210112200429-01de73cf58bd
15-
gopkg.in/yaml.v2 v2.4.0
15+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
1616
k8s.io/release v0.7.0
1717
k8s.io/test-infra v0.0.0-20200813194141-e9678d500461
1818
sigs.k8s.io/yaml v1.2.0

pkg/kepctl/kepctl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"github.com/olekukonko/tablewriter"
3535
"github.com/pkg/errors"
3636
"golang.org/x/oauth2"
37-
"gopkg.in/yaml.v2"
37+
"gopkg.in/yaml.v3"
3838

3939
"k8s.io/enhancements/api"
4040
"k8s.io/enhancements/pkg/kepval/keps"

pkg/kepctl/kepctl_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"testing"
2323

2424
"github.com/stretchr/testify/require"
25-
"gopkg.in/yaml.v2"
25+
"gopkg.in/yaml.v3"
2626

2727
"k8s.io/enhancements/api"
2828
)

pkg/kepval/keps/proposals.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"strings"
2626

2727
"github.com/pkg/errors"
28-
"gopkg.in/yaml.v2"
28+
"gopkg.in/yaml.v3"
2929

3030
"k8s.io/enhancements/api"
3131
"k8s.io/enhancements/pkg/kepval/keps/validations"
@@ -75,7 +75,7 @@ func (p *Parser) Parse(in io.Reader) *api.Proposal {
7575
return proposal
7676
}
7777

78-
proposal.Error = yaml.UnmarshalStrict(metadata, proposal)
78+
proposal.Error = yaml.Unmarshal(metadata, proposal)
7979
proposal.ID = hash(proposal.OwningSIG + ":" + proposal.Title)
8080
return proposal
8181
}

pkg/kepval/keps/validations/yaml_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"html/template"
2222
"testing"
2323

24-
"gopkg.in/yaml.v2"
24+
"gopkg.in/yaml.v3"
2525
)
2626

2727
// TODO(lint): Fix field keys and flow flags

pkg/kepval/prrs/approvals.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"io"
2323

2424
"github.com/pkg/errors"
25-
"gopkg.in/yaml.v2"
25+
"gopkg.in/yaml.v3"
2626

2727
"k8s.io/enhancements/pkg/kepval/prrs/validations"
2828
)
@@ -65,15 +65,16 @@ func (p *Parser) Parse(in io.Reader) *Approval {
6565
// First do structural checks
6666
test := map[interface{}]interface{}{}
6767
if err := yaml.Unmarshal(body.Bytes(), test); err != nil {
68-
approval.Error = errors.Wrap(err, "error unmarshaling YAML")
68+
approval.Error = errors.Wrap(err, "error unmarshalling YAML")
6969
return approval
7070
}
7171
if err := validations.ValidateStructure(test); err != nil {
7272
approval.Error = errors.Wrap(err, "error validating PRR approval metadata")
7373
return approval
7474
}
7575

76-
approval.Error = yaml.UnmarshalStrict(body.Bytes(), approval)
76+
approval.Error = yaml.Unmarshal(body.Bytes(), approval)
77+
7778
return approval
7879
}
7980

0 commit comments

Comments
 (0)