File tree Expand file tree Collapse file tree 6 files changed +10
-9
lines changed Expand file tree Collapse file tree 6 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ require (
12
12
github.com/spf13/pflag v1.0.5
13
13
github.com/stretchr/testify v1.7.0
14
14
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
16
16
k8s.io/release v0.7.0
17
17
k8s.io/test-infra v0.0.0-20200813194141-e9678d500461
18
18
sigs.k8s.io/yaml v1.2.0
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ import (
34
34
"github.com/olekukonko/tablewriter"
35
35
"github.com/pkg/errors"
36
36
"golang.org/x/oauth2"
37
- "gopkg.in/yaml.v2 "
37
+ "gopkg.in/yaml.v3 "
38
38
39
39
"k8s.io/enhancements/api"
40
40
"k8s.io/enhancements/pkg/kepval/keps"
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ import (
22
22
"testing"
23
23
24
24
"github.com/stretchr/testify/require"
25
- "gopkg.in/yaml.v2 "
25
+ "gopkg.in/yaml.v3 "
26
26
27
27
"k8s.io/enhancements/api"
28
28
)
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ import (
25
25
"strings"
26
26
27
27
"github.com/pkg/errors"
28
- "gopkg.in/yaml.v2 "
28
+ "gopkg.in/yaml.v3 "
29
29
30
30
"k8s.io/enhancements/api"
31
31
"k8s.io/enhancements/pkg/kepval/keps/validations"
@@ -75,7 +75,7 @@ func (p *Parser) Parse(in io.Reader) *api.Proposal {
75
75
return proposal
76
76
}
77
77
78
- proposal .Error = yaml .UnmarshalStrict (metadata , proposal )
78
+ proposal .Error = yaml .Unmarshal (metadata , proposal )
79
79
proposal .ID = hash (proposal .OwningSIG + ":" + proposal .Title )
80
80
return proposal
81
81
}
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ import (
21
21
"html/template"
22
22
"testing"
23
23
24
- "gopkg.in/yaml.v2 "
24
+ "gopkg.in/yaml.v3 "
25
25
)
26
26
27
27
// TODO(lint): Fix field keys and flow flags
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ import (
22
22
"io"
23
23
24
24
"github.com/pkg/errors"
25
- "gopkg.in/yaml.v2 "
25
+ "gopkg.in/yaml.v3 "
26
26
27
27
"k8s.io/enhancements/pkg/kepval/prrs/validations"
28
28
)
@@ -65,15 +65,16 @@ func (p *Parser) Parse(in io.Reader) *Approval {
65
65
// First do structural checks
66
66
test := map [interface {}]interface {}{}
67
67
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" )
69
69
return approval
70
70
}
71
71
if err := validations .ValidateStructure (test ); err != nil {
72
72
approval .Error = errors .Wrap (err , "error validating PRR approval metadata" )
73
73
return approval
74
74
}
75
75
76
- approval .Error = yaml .UnmarshalStrict (body .Bytes (), approval )
76
+ approval .Error = yaml .Unmarshal (body .Bytes (), approval )
77
+
77
78
return approval
78
79
}
79
80
You can’t perform that action at this time.
0 commit comments