From 530d25026e06d0253a6c663d4dde2e35040e82da Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Wed, 30 Nov 2022 12:53:18 -0800 Subject: [PATCH] fieldmanager: remove dependencies on dummy version conversion for tests --- .../handlers/fieldmanager/fieldmanager_test.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go index 484c8df7aa5..6d5bbd40a46 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go @@ -77,6 +77,16 @@ type fakeObjectDefaulter struct{} func (d *fakeObjectDefaulter) Default(in runtime.Object) {} +type sameVersionConverter struct{} + +func (sameVersionConverter) Convert(object *typed.TypedValue, version fieldpath.APIVersion) (*typed.TypedValue, error) { + return object, nil +} + +func (sameVersionConverter) IsMissingVersionError(error) bool { + return false +} + type TestFieldManager struct { fieldManager *FieldManager apiVersion string @@ -91,9 +101,8 @@ func NewDefaultTestFieldManager(gvk schema.GroupVersionKind) TestFieldManager { func NewTestFieldManager(gvk schema.GroupVersionKind, subresource string, chainFieldManager func(Manager) Manager) TestFieldManager { m := NewFakeOpenAPIModels() typeConverter := NewFakeTypeConverter(m) - converter := newVersionConverter(typeConverter, &fakeObjectConvertor{}, gvk.GroupVersion()) apiVersion := fieldpath.APIVersion(gvk.GroupVersion().String()) - objectConverter := &fakeObjectConvertor{converter, apiVersion} + objectConverter := &fakeObjectConvertor{sameVersionConverter{}, apiVersion} f, err := NewStructuredMergeManager( typeConverter, objectConverter,