update to yaml/v3, replace ioutil.ReadFile with os.ReadFile

serprex · serprex · commit b82101a27a66 · 2025-09-01T04:04:04.000Z
diff --git a/fieldpath/fromvalue_test.go b/fieldpath/fromvalue_test.go
@@ -19,7 +19,7 @@ package fieldpath
 import (
 	"testing"
 
-	yaml "go.yaml.in/yaml/v2"
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/structured-merge-diff/v6/value"
 )
 
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module sigs.k8s.io/structured-merge-diff/v6
 require (
 	github.com/google/go-cmp v0.5.9
 	github.com/json-iterator/go v1.1.12
-	go.yaml.in/yaml/v2 v2.4.2
+	go.yaml.in/yaml/v3 v3.0.4
 	sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016
 )
 
diff --git a/go.sum b/go.sum
@@ -16,8 +16,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
-go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016 h1:kXv6kKdoEtedwuqMmkqhbkgvYKeycVbC8+iPCP9j5kQ=
diff --git a/internal/cli/main_test.go b/internal/cli/main_test.go
@@ -19,7 +19,7 @@ package cli
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -130,7 +130,7 @@ func (tt *testCase) checkOutput(t *testing.T, got []byte) {
 	if tt.expectedOutputPath == "" {
 		return
 	}
-	want, err := ioutil.ReadFile(tt.expectedOutputPath)
+	want, err := os.ReadFile(tt.expectedOutputPath)
 	if err != nil {
 		t.Fatalf("couldn't read expected output %q: %v", tt.expectedOutputPath, err)
 	}
diff --git a/internal/cli/operation.go b/internal/cli/operation.go
@@ -19,7 +19,7 @@ package cli
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
+	"os"
 
 	"sigs.k8s.io/structured-merge-diff/v6/typed"
 	"sigs.k8s.io/structured-merge-diff/v6/value"
@@ -35,7 +35,7 @@ type operationBase struct {
 }
 
 func (b operationBase) parseFile(path string) (tv *typed.TypedValue, err error) {
-	bytes, err := ioutil.ReadFile(path)
+	bytes, err := os.ReadFile(path)
 	if err != nil {
 		return tv, fmt.Errorf("unable to read file %q: %v", path, err)
 	}
diff --git a/internal/cli/options.go b/internal/cli/options.go
@@ -21,7 +21,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 
 	"sigs.k8s.io/structured-merge-diff/v6/typed"
@@ -76,7 +75,7 @@ func (o *Options) Resolve() (Operation, error) {
 	if o.schemaPath == "" {
 		return nil, errors.New("a schema is required")
 	}
-	b, err := ioutil.ReadFile(o.schemaPath)
+	b, err := os.ReadFile(o.schemaPath)
 	if err != nil {
 		return nil, fmt.Errorf("unable to read schema %q: %v", o.schemaPath, err)
 	}
diff --git a/merge/multiple_appliers_test.go b/merge/multiple_appliers_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	yaml "go.yaml.in/yaml/v2"
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/structured-merge-diff/v6/fieldpath"
 	. "sigs.k8s.io/structured-merge-diff/v6/internal/fixture"
 	"sigs.k8s.io/structured-merge-diff/v6/merge"
diff --git a/merge/real_test.go b/merge/real_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package merge_test
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -30,7 +30,7 @@ func testdata(file string) string {
 }
 
 func read(file string) []byte {
-	s, err := ioutil.ReadFile(file)
+	s, err := os.ReadFile(file)
 	if err != nil {
 		panic(err)
 	}
diff --git a/typed/parser.go b/typed/parser.go
@@ -19,7 +19,7 @@ package typed
 import (
 	"fmt"
 
-	yaml "go.yaml.in/yaml/v2"
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/structured-merge-diff/v6/schema"
 	"sigs.k8s.io/structured-merge-diff/v6/value"
 )
diff --git a/typed/parser_test.go b/typed/parser_test.go
@@ -17,12 +17,12 @@ limitations under the License.
 package typed_test
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 
-	yaml "go.yaml.in/yaml/v2"
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/structured-merge-diff/v6/typed"
 )
 
@@ -31,7 +31,7 @@ func testdata(file string) string {
 }
 
 func read(file string) []byte {
-	obj, err := ioutil.ReadFile(file)
+	obj, err := os.ReadFile(file)
 	if err != nil {
 		panic(err)
 	}
@@ -65,7 +65,7 @@ func BenchmarkConvertUnstructured(b *testing.B) {
 		},
 	}
 
-	s, err := ioutil.ReadFile(testdata("k8s-schema.yaml"))
+	s, err := os.ReadFile(testdata("k8s-schema.yaml"))
 	if err != nil {
 		b.Fatal(err)
 	}
diff --git a/value/equals_test.go b/value/equals_test.go
@@ -17,11 +17,11 @@ limitations under the License.
 package value_test
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
-	yaml "go.yaml.in/yaml/v2"
+	yaml "go.yaml.in/yaml/v3"
 	"sigs.k8s.io/structured-merge-diff/v6/value"
 )
 
@@ -30,7 +30,7 @@ func testdata(file string) string {
 }
 
 func read(file string) []byte {
-	s, err := ioutil.ReadFile(file)
+	s, err := os.ReadFile(file)
 	if err != nil {
 		panic(err)
 	}
diff --git a/value/value.go b/value/value.go
@@ -24,7 +24,7 @@ import (
 
 	jsoniter "github.com/json-iterator/go"
 
-	yaml "go.yaml.in/yaml/v2"
+	yaml "go.yaml.in/yaml/v3"
 )
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package fieldpath`
`19`	`19`	`import (`
`20`	`20`	`"testing"`
`21`	`21`
`22`		`- yaml "go.yaml.in/yaml/v2"`
	`22`	`+ yaml "go.yaml.in/yaml/v3"`
`23`	`23`	`"sigs.k8s.io/structured-merge-diff/v6/value"`
`24`	`24`	`)`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module sigs.k8s.io/structured-merge-diff/v6`
`3`	`3`	`require (`
`4`	`4`	`github.com/google/go-cmp v0.5.9`
`5`	`5`	`github.com/json-iterator/go v1.1.12`
`6`		`- go.yaml.in/yaml/v2 v2.4.2`
	`6`	`+ go.yaml.in/yaml/v3 v3.0.4`
`7`	`7`	`sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package cli`
`19`	`19`	`import (`
`20`	`20`	`"bytes"`
`21`	`21`	`"encoding/json"`
`22`		`- "io/ioutil"`
	`22`	`+ "os"`
`23`	`23`	`"path/filepath"`
`24`	`24`	`"testing"`
`25`	`25`	`)`
`@@ -130,7 +130,7 @@ func (tt testCase) checkOutput(t testing.T, got []byte) {`
`130`	`130`	`if tt.expectedOutputPath == "" {`
`131`	`131`	`return`
`132`	`132`	`}`
`133`		`- want, err := ioutil.ReadFile(tt.expectedOutputPath)`
	`133`	`+ want, err := os.ReadFile(tt.expectedOutputPath)`
`134`	`134`	`if err != nil {`
`135`	`135`	`t.Fatalf("couldn't read expected output %q: %v", tt.expectedOutputPath, err)`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ limitations under the License.`
`17`	`17`	`package merge_test`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "io/ioutil"`
	`20`	`+ "os"`
`21`	`21`	`"path/filepath"`
`22`	`22`	`"testing"`
`23`	`23`
`@@ -30,7 +30,7 @@ func testdata(file string) string {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`func read(file string) []byte {`
`33`		`- s, err := ioutil.ReadFile(file)`
	`33`	`+ s, err := os.ReadFile(file)`
`34`	`34`	`if err != nil {`
`35`	`35`	`panic(err)`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package typed`
`19`	`19`	`import (`
`20`	`20`	`"fmt"`
`21`	`21`
`22`		`- yaml "go.yaml.in/yaml/v2"`
	`22`	`+ yaml "go.yaml.in/yaml/v3"`
`23`	`23`	`"sigs.k8s.io/structured-merge-diff/v6/schema"`
`24`	`24`	`"sigs.k8s.io/structured-merge-diff/v6/value"`
`25`	`25`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@ limitations under the License.`
`17`	`17`	`package typed_test`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "io/ioutil"`
	`20`	`+ "os"`
`21`	`21`	`"path/filepath"`
`22`	`22`	`"strings"`
`23`	`23`	`"testing"`
`24`	`24`
`25`		`- yaml "go.yaml.in/yaml/v2"`
	`25`	`+ yaml "go.yaml.in/yaml/v3"`
`26`	`26`	`"sigs.k8s.io/structured-merge-diff/v6/typed"`
`27`	`27`	`)`
`28`	`28`
`@@ -31,7 +31,7 @@ func testdata(file string) string {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func read(file string) []byte {`
`34`		`- obj, err := ioutil.ReadFile(file)`
	`34`	`+ obj, err := os.ReadFile(file)`
`35`	`35`	`if err != nil {`
`36`	`36`	`panic(err)`
`37`	`37`	`}`
`@@ -65,7 +65,7 @@ func BenchmarkConvertUnstructured(b *testing.B) {`
`65`	`65`	`},`
`66`	`66`	`}`
`67`	`67`
`68`		`- s, err := ioutil.ReadFile(testdata("k8s-schema.yaml"))`
	`68`	`+ s, err := os.ReadFile(testdata("k8s-schema.yaml"))`
`69`	`69`	`if err != nil {`
`70`	`70`	`b.Fatal(err)`
`71`	`71`	`}`