Merge pull request #283 from thockin/master

Switch from gofuzz to randfill

Author: k8s-ci-robot

go.mod

@@ -2,9 +2,9 @@ module sigs.k8s.io/structured-merge-diff/v4
 
 require (
 	github.com/google/go-cmp v0.5.9
-	github.com/google/gofuzz v1.0.0
 	github.com/json-iterator/go v1.1.12
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016
 	sigs.k8s.io/yaml v1.4.0
 )
 

go.sum

@@ -3,7 +3,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@@ -19,5 +18,7 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 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=
+sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

schema/equals_test.go

@@ -22,47 +22,47 @@ import (
 	"testing"
 	"testing/quick"
 
-	fuzz "github.com/google/gofuzz"
+	"sigs.k8s.io/randfill"
 )
 
-func fuzzInterface(i *interface{}, c fuzz.Continue) {
+func fuzzInterface(i *interface{}, c randfill.Continue) {
 	m := map[string]string{}
-	c.Fuzz(&m)
+	c.Fill(&m)
 	*i = &m
 }
 
 func (*Schema) Generate(rand *rand.Rand, size int) reflect.Value {
 	s := Schema{}
-	f := fuzz.New().RandSource(rand).MaxDepth(4)
-	f.Fuzz(&s)
+	f := randfill.New().RandSource(rand).MaxDepth(4)
+	f.Fill(&s)
 	return reflect.ValueOf(&s)
 }
 
 func (*Map) Generate(rand *rand.Rand, size int) reflect.Value {
 	m := Map{}
-	f := fuzz.New().RandSource(rand).MaxDepth(4).Funcs(fuzzInterface)
-	f.Fuzz(&m)
+	f := randfill.New().RandSource(rand).MaxDepth(4).Funcs(fuzzInterface)
+	f.Fill(&m)
 	return reflect.ValueOf(&m)
 }
 
 func (TypeDef) Generate(rand *rand.Rand, size int) reflect.Value {
 	td := TypeDef{}
-	f := fuzz.New().RandSource(rand).MaxDepth(4)
-	f.Fuzz(&td)
+	f := randfill.New().RandSource(rand).MaxDepth(4)
+	f.Fill(&td)
 	return reflect.ValueOf(td)
 }
 
 func (Atom) Generate(rand *rand.Rand, size int) reflect.Value {
 	a := Atom{}
-	f := fuzz.New().RandSource(rand).MaxDepth(4)
-	f.Fuzz(&a)
+	f := randfill.New().RandSource(rand).MaxDepth(4)
+	f.Fill(&a)
 	return reflect.ValueOf(a)
 }
 
 func (StructField) Generate(rand *rand.Rand, size int) reflect.Value {
 	a := StructField{}
-	f := fuzz.New().RandSource(rand).MaxDepth(4).Funcs(fuzzInterface)
-	f.Fuzz(&a)
+	f := randfill.New().RandSource(rand).MaxDepth(4).Funcs(fuzzInterface)
+	f.Fill(&a)
 	return reflect.ValueOf(a)
 }