Skip to content

Commit 0ee1c65

Browse files
authored
Merge pull request #283 from thockin/master
Switch from gofuzz to randfill
2 parents 1d759a2 + 1ae718b commit 0ee1c65

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ module sigs.k8s.io/structured-merge-diff/v4
22

33
require (
44
github.com/google/go-cmp v0.5.9
5-
github.com/google/gofuzz v1.0.0
65
github.com/json-iterator/go v1.1.12
76
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7+
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016
88
sigs.k8s.io/yaml v1.4.0
99
)
1010

Diff for: go.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
44
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
55
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
6-
github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
76
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
87
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
98
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
1918
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
2019
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2120
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
21+
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016 h1:kXv6kKdoEtedwuqMmkqhbkgvYKeycVbC8+iPCP9j5kQ=
22+
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
2223
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
2324
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

Diff for: schema/equals_test.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,47 @@ import (
2222
"testing"
2323
"testing/quick"
2424

25-
fuzz "github.com/google/gofuzz"
25+
"sigs.k8s.io/randfill"
2626
)
2727

28-
func fuzzInterface(i *interface{}, c fuzz.Continue) {
28+
func fuzzInterface(i *interface{}, c randfill.Continue) {
2929
m := map[string]string{}
30-
c.Fuzz(&m)
30+
c.Fill(&m)
3131
*i = &m
3232
}
3333

3434
func (*Schema) Generate(rand *rand.Rand, size int) reflect.Value {
3535
s := Schema{}
36-
f := fuzz.New().RandSource(rand).MaxDepth(4)
37-
f.Fuzz(&s)
36+
f := randfill.New().RandSource(rand).MaxDepth(4)
37+
f.Fill(&s)
3838
return reflect.ValueOf(&s)
3939
}
4040

4141
func (*Map) Generate(rand *rand.Rand, size int) reflect.Value {
4242
m := Map{}
43-
f := fuzz.New().RandSource(rand).MaxDepth(4).Funcs(fuzzInterface)
44-
f.Fuzz(&m)
43+
f := randfill.New().RandSource(rand).MaxDepth(4).Funcs(fuzzInterface)
44+
f.Fill(&m)
4545
return reflect.ValueOf(&m)
4646
}
4747

4848
func (TypeDef) Generate(rand *rand.Rand, size int) reflect.Value {
4949
td := TypeDef{}
50-
f := fuzz.New().RandSource(rand).MaxDepth(4)
51-
f.Fuzz(&td)
50+
f := randfill.New().RandSource(rand).MaxDepth(4)
51+
f.Fill(&td)
5252
return reflect.ValueOf(td)
5353
}
5454

5555
func (Atom) Generate(rand *rand.Rand, size int) reflect.Value {
5656
a := Atom{}
57-
f := fuzz.New().RandSource(rand).MaxDepth(4)
58-
f.Fuzz(&a)
57+
f := randfill.New().RandSource(rand).MaxDepth(4)
58+
f.Fill(&a)
5959
return reflect.ValueOf(a)
6060
}
6161

6262
func (StructField) Generate(rand *rand.Rand, size int) reflect.Value {
6363
a := StructField{}
64-
f := fuzz.New().RandSource(rand).MaxDepth(4).Funcs(fuzzInterface)
65-
f.Fuzz(&a)
64+
f := randfill.New().RandSource(rand).MaxDepth(4).Funcs(fuzzInterface)
65+
f.Fill(&a)
6666
return reflect.ValueOf(a)
6767
}
6868

0 commit comments

Comments
 (0)