From ecea46a6ccc4e9cf03afc4b6fa7b2c0f14295d16 Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Tue, 27 Oct 2020 12:54:45 +0200 Subject: [PATCH 1/3] move fuzzers Signed-off-by: Ville Aikas --- apis/duck/v1/{ => test}/fuzzer.go | 5 +++-- apis/duck/v1/{ => test}/roundtrip_test.go | 5 +++-- apis/duck/v1beta1/{ => test}/fuzzer.go | 5 +++-- apis/duck/v1beta1/{ => test}/roundtrip_test.go | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) rename apis/duck/v1/{ => test}/fuzzer.go (93%) rename apis/duck/v1/{ => test}/roundtrip_test.go (92%) rename apis/duck/v1beta1/{ => test}/fuzzer.go (93%) rename apis/duck/v1beta1/{ => test}/roundtrip_test.go (91%) diff --git a/apis/duck/v1/fuzzer.go b/apis/duck/v1/test/fuzzer.go similarity index 93% rename from apis/duck/v1/fuzzer.go rename to apis/duck/v1/test/fuzzer.go index 4ef66e589d..28e92d891f 100644 --- a/apis/duck/v1/fuzzer.go +++ b/apis/duck/v1/test/fuzzer.go @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1 +package test import ( fuzz "github.com/google/gofuzz" "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" "k8s.io/apimachinery/pkg/runtime/serializer" "knative.dev/pkg/apis" + "knative.dev/pkg/apis/duck/v1" pkgfuzzer "knative.dev/pkg/apis/testing/fuzzer" ) @@ -34,7 +35,7 @@ var testConditions = apis.Conditions{{Type: apis.ConditionReady}, {Type: apis.Co var FuzzerFuncs = fuzzer.MergeFuzzerFuncs( func(codecs serializer.CodecFactory) []interface{} { return []interface{}{ - func(status *Status, c fuzz.Continue) { + func(status *v1.Status, c fuzz.Continue) { c.FuzzNoCustom(status) // fuzz the Status status.SetConditions(testConditions) pkgfuzzer.FuzzConditions(status, c) diff --git a/apis/duck/v1/roundtrip_test.go b/apis/duck/v1/test/roundtrip_test.go similarity index 92% rename from apis/duck/v1/roundtrip_test.go rename to apis/duck/v1/test/roundtrip_test.go index 25bca151bb..d388bc3fa1 100644 --- a/apis/duck/v1/roundtrip_test.go +++ b/apis/duck/v1/test/roundtrip_test.go @@ -14,9 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1 +package test import ( + "knative.dev/pkg/apis/duck/v1" "testing" "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" @@ -28,7 +29,7 @@ import ( func TestEventingRoundTripTypesToJSON(t *testing.T) { scheme := runtime.NewScheme() - utilruntime.Must(AddToScheme(scheme)) + utilruntime.Must(v1.AddToScheme(scheme)) fuzzerFuncs := fuzzer.MergeFuzzerFuncs( pkgfuzzer.Funcs, diff --git a/apis/duck/v1beta1/fuzzer.go b/apis/duck/v1beta1/test/fuzzer.go similarity index 93% rename from apis/duck/v1beta1/fuzzer.go rename to apis/duck/v1beta1/test/fuzzer.go index efc8be9735..a1564e2736 100644 --- a/apis/duck/v1beta1/fuzzer.go +++ b/apis/duck/v1beta1/test/fuzzer.go @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package test import ( fuzz "github.com/google/gofuzz" "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" "k8s.io/apimachinery/pkg/runtime/serializer" "knative.dev/pkg/apis" + "knative.dev/pkg/apis/duck/v1beta1" pkgfuzzer "knative.dev/pkg/apis/testing/fuzzer" ) @@ -33,7 +34,7 @@ var testConditions = apis.Conditions{{Type: apis.ConditionReady}, {Type: apis.Co var FuzzerFuncs = fuzzer.MergeFuzzerFuncs( func(codecs serializer.CodecFactory) []interface{} { return []interface{}{ - func(status *Status, c fuzz.Continue) { + func(status *v1beta1.Status, c fuzz.Continue) { c.FuzzNoCustom(status) // fuzz the Status status.SetConditions(testConditions) pkgfuzzer.FuzzConditions(status, c) diff --git a/apis/duck/v1beta1/roundtrip_test.go b/apis/duck/v1beta1/test/roundtrip_test.go similarity index 91% rename from apis/duck/v1beta1/roundtrip_test.go rename to apis/duck/v1beta1/test/roundtrip_test.go index f727740ae0..97728c8857 100644 --- a/apis/duck/v1beta1/roundtrip_test.go +++ b/apis/duck/v1beta1/test/roundtrip_test.go @@ -14,9 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1beta1 +package test import ( + "knative.dev/pkg/apis/duck/v1beta1" "testing" "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" @@ -28,7 +29,7 @@ import ( func TestEventingRoundTripTypesToJSON(t *testing.T) { scheme := runtime.NewScheme() - utilruntime.Must(AddToScheme(scheme)) + utilruntime.Must(v1beta1.AddToScheme(scheme)) fuzzerFuncs := fuzzer.MergeFuzzerFuncs( pkgfuzzer.Funcs, From 88c44d06a379722f69d379c279dcf145847aca93 Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Tue, 27 Oct 2020 13:33:07 +0200 Subject: [PATCH 2/3] fix the imports Signed-off-by: Ville Aikas --- apis/duck/v1/test/roundtrip_test.go | 2 +- apis/duck/v1beta1/test/roundtrip_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apis/duck/v1/test/roundtrip_test.go b/apis/duck/v1/test/roundtrip_test.go index d388bc3fa1..8d2395de71 100644 --- a/apis/duck/v1/test/roundtrip_test.go +++ b/apis/duck/v1/test/roundtrip_test.go @@ -17,9 +17,9 @@ limitations under the License. package test import ( - "knative.dev/pkg/apis/duck/v1" "testing" + v1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" diff --git a/apis/duck/v1beta1/test/roundtrip_test.go b/apis/duck/v1beta1/test/roundtrip_test.go index 97728c8857..0d5c3c6d05 100644 --- a/apis/duck/v1beta1/test/roundtrip_test.go +++ b/apis/duck/v1beta1/test/roundtrip_test.go @@ -17,9 +17,10 @@ limitations under the License. package test import ( - "knative.dev/pkg/apis/duck/v1beta1" "testing" + "knative.dev/pkg/apis/duck/v1beta1" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" From f1f63343ae4bd468d0e175d1ecd9bc77f74b0f2a Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Tue, 27 Oct 2020 13:46:49 +0200 Subject: [PATCH 3/3] oooook --- apis/duck/v1/test/fuzzer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis/duck/v1/test/fuzzer.go b/apis/duck/v1/test/fuzzer.go index 28e92d891f..888ca9adb4 100644 --- a/apis/duck/v1/test/fuzzer.go +++ b/apis/duck/v1/test/fuzzer.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" "k8s.io/apimachinery/pkg/runtime/serializer" "knative.dev/pkg/apis" - "knative.dev/pkg/apis/duck/v1" + v1 "knative.dev/pkg/apis/duck/v1" pkgfuzzer "knative.dev/pkg/apis/testing/fuzzer" )