Use randfill, do API renames

Author: thockin

cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go

@@ -17,7 +17,7 @@ limitations under the License.
 package fuzzer
 
 import (
-	fuzz "github.com/google/gofuzz"
+	"sigs.k8s.io/randfill"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -46,8 +46,8 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} {
 	}
 }
 
-func fuzzInitConfiguration(obj *kubeadm.InitConfiguration, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzInitConfiguration(obj *kubeadm.InitConfiguration, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	// Pinning values for fields that get defaults if fuzz value is empty string or nil (thus making the round trip test fail)
 
@@ -71,16 +71,16 @@ func fuzzInitConfiguration(obj *kubeadm.InitConfiguration, c fuzz.Continue) {
 	kubeadm.SetDefaultTimeouts(&obj.Timeouts)
 }
 
-func fuzzNodeRegistration(obj *kubeadm.NodeRegistrationOptions, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzNodeRegistration(obj *kubeadm.NodeRegistrationOptions, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	// Pinning values for fields that get defaults if fuzz value is empty string or nil (thus making the round trip test fail)
 	obj.IgnorePreflightErrors = nil
 	obj.ImagePullSerial = ptr.To(true)
 }
 
-func fuzzClusterConfiguration(obj *kubeadm.ClusterConfiguration, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzClusterConfiguration(obj *kubeadm.ClusterConfiguration, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	// Pinning values for fields that get defaults if fuzz value is empty string or nil (thus making the round trip test fail)
 	obj.CertificatesDir = "foo"
@@ -100,33 +100,33 @@ func fuzzClusterConfiguration(obj *kubeadm.ClusterConfiguration, c fuzz.Continue
 	obj.CACertificateValidityPeriod = &metav1.Duration{Duration: constants.CACertificateValidityPeriod}
 }
 
-func fuzzDNS(obj *kubeadm.DNS, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzDNS(obj *kubeadm.DNS, c randfill.Continue) {
+	c.FillNoCustom(obj)
 	obj.Disabled = false
 }
 
-func fuzzComponentConfigMap(obj *kubeadm.ComponentConfigMap, c fuzz.Continue) {
+func fuzzComponentConfigMap(obj *kubeadm.ComponentConfigMap, c randfill.Continue) {
 	// This is intentionally empty because component config does not exists in the public api
 	// (empty mean all ComponentConfigs fields nil, and this is necessary for getting roundtrip passing)
 }
 
-func fuzzLocalEtcd(obj *kubeadm.LocalEtcd, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzLocalEtcd(obj *kubeadm.LocalEtcd, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	// Pinning values for fields that get defaults if fuzz value is empty string or nil (thus making the round trip test fail)
 	obj.DataDir = "foo"
 }
 
-func fuzzNetworking(obj *kubeadm.Networking, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzNetworking(obj *kubeadm.Networking, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	// Pinning values for fields that get defaults if fuzz value is empty string or nil (thus making the round trip test fail)
 	obj.DNSDomain = "foo"
 	obj.ServiceSubnet = "bar"
 }
 
-func fuzzJoinConfiguration(obj *kubeadm.JoinConfiguration, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzJoinConfiguration(obj *kubeadm.JoinConfiguration, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	// Pinning values for fields that get defaults if fuzz value is empty string or nil (thus making the round trip test fail)
 	obj.CACertPath = "foo"
@@ -143,20 +143,20 @@ func fuzzJoinConfiguration(obj *kubeadm.JoinConfiguration, c fuzz.Continue) {
 	kubeadm.SetDefaultTimeouts(&obj.Timeouts)
 }
 
-func fuzzJoinControlPlane(obj *kubeadm.JoinControlPlane, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzJoinControlPlane(obj *kubeadm.JoinControlPlane, c randfill.Continue) {
+	c.FillNoCustom(obj)
 }
 
-func fuzzResetConfiguration(obj *kubeadm.ResetConfiguration, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzResetConfiguration(obj *kubeadm.ResetConfiguration, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	// Pinning values for fields that get defaults if fuzz value is empty string or nil (thus making the round trip test fail)
 	obj.CertificatesDir = "/tmp"
 	kubeadm.SetDefaultTimeouts(&obj.Timeouts)
 }
 
-func fuzzUpgradeConfiguration(obj *kubeadm.UpgradeConfiguration, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzUpgradeConfiguration(obj *kubeadm.UpgradeConfiguration, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	// Pinning values for fields that get defaults if fuzz value is empty string or nil (thus making the round trip test fail)
 	obj.Node.EtcdUpgrade = ptr.To(true)

cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go

@@ -19,7 +19,7 @@ package fuzzer
 import (
 	"time"
 
-	fuzz "github.com/google/gofuzz"
+	"sigs.k8s.io/randfill"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
@@ -36,8 +36,8 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} {
 	}
 }
 
-func fuzzBootstrapToken(obj *output.BootstrapToken, c fuzz.Continue) {
-	c.FuzzNoCustom(obj)
+func fuzzBootstrapToken(obj *output.BootstrapToken, c randfill.Continue) {
+	c.FillNoCustom(obj)
 
 	obj.Token = &bootstraptokenv1.BootstrapTokenString{ID: "uvxdac", Secret: "fq35fuyue3kd4gda"}
 	obj.Description = ""

pkg/api/testing/applyconfiguration_test.go

@@ -22,7 +22,6 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	fuzz "github.com/google/gofuzz"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,6 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/client-go/applyconfigurations"
 	v1mf "k8s.io/client-go/applyconfigurations/core/v1"
+	"sigs.k8s.io/randfill"
 
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	api "k8s.io/kubernetes/pkg/apis/core"
@@ -166,22 +166,22 @@ func fuzzObject(t *testing.T, gvk schema.GroupVersionKind) runtime.Object {
 			// Ensure that InitContainers and their statuses are not generated. This
 			// is because in this test we are simply doing json operations, in which
 			// those disappear.
-			func(s *api.PodSpec, c fuzz.Continue) {
-				c.FuzzNoCustom(s)
+			func(s *api.PodSpec, c randfill.Continue) {
+				c.FillNoCustom(s)
 				s.InitContainers = nil
 			},
-			func(s *api.PodStatus, c fuzz.Continue) {
-				c.FuzzNoCustom(s)
+			func(s *api.PodStatus, c randfill.Continue) {
+				c.FillNoCustom(s)
 				s.InitContainerStatuses = nil
 			},
 			// Apply configuration types do not have managed fields, so we exclude
 			// them in our fuzz test cases.
-			func(s *v1.ObjectMeta, c fuzz.Continue) {
-				c.FuzzNoCustom(s)
+			func(s *v1.ObjectMeta, c randfill.Continue) {
+				c.FillNoCustom(s)
 				s.ManagedFields = nil
 				s.SelfLink = ""
 			},
-		).Fuzz(internalObj)
+		).Fill(internalObj)
 
 	item, err := legacyscheme.Scheme.New(externalVersion.WithKind(kind))
 	if err != nil {

pkg/api/testing/conversion_test.go

@@ -36,7 +36,7 @@ func BenchmarkPodConversion(b *testing.B) {
 	apiObjectFuzzer := fuzzer.FuzzerFor(FuzzerFuncs, rand.NewSource(benchmarkSeed), legacyscheme.Codecs)
 	items := make([]api.Pod, 4)
 	for i := range items {
-		apiObjectFuzzer.Fuzz(&items[i])
+		apiObjectFuzzer.Fill(&items[i])
 		items[i].Spec.InitContainers = nil
 		items[i].Status.InitContainerStatuses = nil
 	}

pkg/api/testing/copy_test.go

@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	fuzz "github.com/google/gofuzz"
+	"sigs.k8s.io/randfill"
 
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
@@ -43,12 +43,12 @@ func TestDeepCopyApiObjects(t *testing.T) {
 	}
 }
 
-func doDeepCopyTest(t *testing.T, kind schema.GroupVersionKind, f *fuzz.Fuzzer) {
+func doDeepCopyTest(t *testing.T, kind schema.GroupVersionKind, f *randfill.Filler) {
 	item, err := legacyscheme.Scheme.New(kind)
 	if err != nil {
 		t.Fatalf("Could not create a %v: %s", kind, err)
 	}
-	f.Fuzz(item)
+	f.Fill(item)
 	itemCopy := item.DeepCopyObject()
 	if !reflect.DeepEqual(item, itemCopy) {
 		t.Errorf("\nexpected: %#v\n\ngot:      %#v\n\ndiff:      %v", item, itemCopy, cmp.Diff(item, itemCopy))
@@ -61,7 +61,7 @@ func doDeepCopyTest(t *testing.T, kind schema.GroupVersionKind, f *fuzz.Fuzzer)
 	}
 
 	// Refuzz the copy, which should have no effect on the original
-	f.Fuzz(itemCopy)
+	f.Fill(itemCopy)
 
 	postfuzzData := &bytes.Buffer{}
 	if err := legacyscheme.Codecs.LegacyCodec(kind.GroupVersion()).Encode(item, postfuzzData); err != nil {

pkg/api/testing/defaulting_test.go

@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	fuzz "github.com/google/gofuzz"
+	"sigs.k8s.io/randfill"
 
 	apiv1 "k8s.io/api/core/v1"
 	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
@@ -219,20 +219,20 @@ func TestDefaulting(t *testing.T) {
 		t.Run(gvk.String(), func(t *testing.T) {
 			// Each sub-tests gets its own fuzzer instance to make running it independent
 			// from what other tests ran before.
-			f := fuzz.New().NilChance(.5).NumElements(1, 1).RandSource(rand.NewSource(1))
+			f := randfill.New().NilChance(.5).NumElements(1, 1).RandSource(rand.NewSource(1))
 			f.Funcs(
-				func(s *runtime.RawExtension, c fuzz.Continue) {},
-				func(s *metav1.LabelSelector, c fuzz.Continue) {
-					c.FuzzNoCustom(s)
+				func(s *runtime.RawExtension, c randfill.Continue) {},
+				func(s *metav1.LabelSelector, c randfill.Continue) {
+					c.FillNoCustom(s)
 					s.MatchExpressions = nil // need to fuzz this specially
 				},
-				func(s *metav1.ListOptions, c fuzz.Continue) {
-					c.FuzzNoCustom(s)
+				func(s *metav1.ListOptions, c randfill.Continue) {
+					c.FillNoCustom(s)
 					s.LabelSelector = "" // need to fuzz requirement strings specially
 					s.FieldSelector = "" // need to fuzz requirement strings specially
 				},
-				func(s *extensionsv1beta1.ScaleStatus, c fuzz.Continue) {
-					c.FuzzNoCustom(s)
+				func(s *extensionsv1beta1.ScaleStatus, c randfill.Continue) {
+					c.FillNoCustom(s)
 					s.TargetSelector = "" // need to fuzz requirement strings specially
 				},
 			)
@@ -262,7 +262,7 @@ func TestDefaulting(t *testing.T) {
 				if err != nil {
 					t.Fatal(err)
 				}
-				f.Fuzz(src)
+				f.Fill(src)
 
 				src.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{})
 
@@ -289,10 +289,10 @@ func TestDefaulting(t *testing.T) {
 }
 
 func BenchmarkPodDefaulting(b *testing.B) {
-	f := fuzz.New().NilChance(.5).NumElements(1, 1).RandSource(rand.NewSource(1))
+	f := randfill.New().NilChance(.5).NumElements(1, 1).RandSource(rand.NewSource(1))
 	items := make([]apiv1.Pod, 100)
 	for i := range items {
-		f.Fuzz(&items[i])
+		f.Fill(&items[i])
 	}
 
 	scheme := legacyscheme.Scheme

pkg/api/testing/fuzzer.go

@@ -19,7 +19,7 @@ package testing
 import (
 	"fmt"
 
-	fuzz "github.com/google/gofuzz"
+	"sigs.k8s.io/randfill"
 
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
@@ -51,9 +51,9 @@ import (
 // values in a Kubernetes context.
 func overrideGenericFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
-		func(j *runtime.Object, c fuzz.Continue) {
+		func(j *runtime.Object, c randfill.Continue) {
 			// TODO: uncomment when round trip starts from a versioned object
-			if true { //c.RandBool() {
+			if true { // c.Bool() {
 				*j = &runtime.Unknown{
 					// We do not set TypeMeta here because it is not carried through a round trip
 					Raw:         []byte(`{"apiVersion":"unknown.group/unknown","kind":"Something","someKey":"someValue"}`),
@@ -62,15 +62,15 @@ func overrideGenericFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
 			} else {
 				types := []runtime.Object{&api.Pod{}, &api.ReplicationController{}}
 				t := types[c.Rand.Intn(len(types))]
-				c.Fuzz(t)
+				c.Fill(t)
 				*j = t
 			}
 		},
-		func(r *runtime.RawExtension, c fuzz.Continue) {
+		func(r *runtime.RawExtension, c randfill.Continue) {
 			// Pick an arbitrary type and fuzz it
 			types := []runtime.Object{&api.Pod{}, &apps.Deployment{}, &api.Service{}}
 			obj := types[c.Rand.Intn(len(types))]
-			c.Fuzz(obj)
+			c.Fill(obj)
 
 			var codec runtime.Codec
 			switch obj.(type) {

pkg/api/testing/serialization_proto_test.go

@@ -99,7 +99,7 @@ func fieldsHaveProtobufTags(obj reflect.Type) error {
 
 func TestProtobufRoundTrip(t *testing.T) {
 	obj := &v1.Pod{}
-	fuzzer.FuzzerFor(FuzzerFuncs, rand.NewSource(benchmarkSeed), legacyscheme.Codecs).Fuzz(obj)
+	fuzzer.FuzzerFor(FuzzerFuncs, rand.NewSource(benchmarkSeed), legacyscheme.Codecs).Fill(obj)
 	// InitContainers are turned into annotations by conversion.
 	obj.Spec.InitContainers = nil
 	obj.Status.InitContainerStatuses = nil

pkg/api/testing/serialization_test.go

@@ -51,7 +51,7 @@ import (
 // fuzzInternalObject fuzzes an arbitrary runtime object using the appropriate
 // fuzzer registered with the apitesting package.
 func fuzzInternalObject(t *testing.T, forVersion schema.GroupVersion, item runtime.Object, seed int64) runtime.Object {
-	fuzzer.FuzzerFor(FuzzerFuncs, rand.NewSource(seed), legacyscheme.Codecs).Fuzz(item)
+	fuzzer.FuzzerFor(FuzzerFuncs, rand.NewSource(seed), legacyscheme.Codecs).Fill(item)
 
 	j, err := meta.TypeAccessor(item)
 	if err != nil {
@@ -331,7 +331,7 @@ func TestUnversionedTypes(t *testing.T) {
 func TestObjectWatchFraming(t *testing.T) {
 	f := fuzzer.FuzzerFor(FuzzerFuncs, rand.NewSource(benchmarkSeed), legacyscheme.Codecs)
 	secret := &api.Secret{}
-	f.Fuzz(secret)
+	f.Fill(secret)
 	if secret.Data == nil {
 		secret.Data = map[string][]byte{}
 	}
@@ -418,7 +418,7 @@ func benchmarkItems(b *testing.B) []v1.Pod {
 	items := make([]v1.Pod, 10)
 	for i := range items {
 		var pod api.Pod
-		apiObjectFuzzer.Fuzz(&pod)
+		apiObjectFuzzer.Fill(&pod)
 		pod.Spec.InitContainers, pod.Status.InitContainerStatuses = nil, nil
 		out, err := legacyscheme.Scheme.ConvertToVersion(&pod, v1.SchemeGroupVersion)
 		if err != nil {
@@ -434,7 +434,7 @@ func benchmarkItemsList(b *testing.B, numItems int) v1.PodList {
 	items := make([]v1.Pod, numItems)
 	for i := range items {
 		var pod api.Pod
-		apiObjectFuzzer.Fuzz(&pod)
+		apiObjectFuzzer.Fill(&pod)
 		pod.Spec.InitContainers, pod.Status.InitContainerStatuses = nil, nil
 		out, err := legacyscheme.Scheme.ConvertToVersion(&pod, v1.SchemeGroupVersion)
 		if err != nil {

pkg/api/testing/unstructured_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	fuzz "github.com/google/gofuzz"
+	"sigs.k8s.io/randfill"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
@@ -54,15 +54,15 @@ func doRoundTrip(t *testing.T, internalVersion schema.GroupVersion, externalVers
 		// because in this test we are simply doing json operations, in which
 		// those disappear.
 		Funcs(
-			func(s *api.PodSpec, c fuzz.Continue) {
-				c.FuzzNoCustom(s)
+			func(s *api.PodSpec, c randfill.Continue) {
+				c.FillNoCustom(s)
 				s.InitContainers = nil
 			},
-			func(s *api.PodStatus, c fuzz.Continue) {
-				c.FuzzNoCustom(s)
+			func(s *api.PodStatus, c randfill.Continue) {
+				c.FillNoCustom(s)
 				s.InitContainerStatuses = nil
 			},
-		).Fuzz(internalObj)
+		).Fill(internalObj)
 
 	item, err := legacyscheme.Scheme.New(externalVersion.WithKind(kind))
 	if err != nil {