From f265615342e5ea0554989617e3be38627b6da59b Mon Sep 17 00:00:00 2001 From: Karl Isenberg Date: Tue, 15 Feb 2022 15:17:19 -0800 Subject: [PATCH] chore: Rename fake.FakeClusterReader to fake.ClusterReader --- pkg/kstatus/polling/clusterreader/fake/fake.go | 8 ++++---- pkg/kstatus/polling/engine/engine_test.go | 2 +- pkg/kstatus/polling/statusreaders/common_test.go | 4 ++-- pkg/kstatus/polling/statusreaders/deployment_test.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/kstatus/polling/clusterreader/fake/fake.go b/pkg/kstatus/polling/clusterreader/fake/fake.go index 7ecbb603..10725be9 100644 --- a/pkg/kstatus/polling/clusterreader/fake/fake.go +++ b/pkg/kstatus/polling/clusterreader/fake/fake.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ) -type FakeClusterReader struct { +type ClusterReader struct { NoopClusterReader GetResource *unstructured.Unstructured @@ -23,21 +23,21 @@ type FakeClusterReader struct { SyncErr error } -func (f *FakeClusterReader) Get(_ context.Context, _ client.ObjectKey, u *unstructured.Unstructured) error { +func (f *ClusterReader) Get(_ context.Context, _ client.ObjectKey, u *unstructured.Unstructured) error { if f.GetResource != nil { u.Object = f.GetResource.Object } return f.GetErr } -func (f *FakeClusterReader) ListNamespaceScoped(_ context.Context, list *unstructured.UnstructuredList, _ string, _ labels.Selector) error { +func (f *ClusterReader) ListNamespaceScoped(_ context.Context, list *unstructured.UnstructuredList, _ string, _ labels.Selector) error { if f.ListResources != nil { list.Items = f.ListResources.Items } return f.ListErr } -func (f *FakeClusterReader) Sync(_ context.Context) error { +func (f *ClusterReader) Sync(_ context.Context) error { return f.SyncErr } diff --git a/pkg/kstatus/polling/engine/engine_test.go b/pkg/kstatus/polling/engine/engine_test.go index 551c59b5..955718ad 100644 --- a/pkg/kstatus/polling/engine/engine_test.go +++ b/pkg/kstatus/polling/engine/engine_test.go @@ -201,7 +201,7 @@ func TestNewStatusPollerRunnerCancellationWithMultipleResources(t *testing.T) { engine := PollerEngine{ Mapper: fakeMapper, ClusterReaderFactory: ClusterReaderFactoryFunc(func(client.Reader, meta.RESTMapper, object.ObjMetadataSet) (ClusterReader, error) { - return &fakecr.FakeClusterReader{ + return &fakecr.ClusterReader{ SyncErr: context.Canceled, }, nil }), diff --git a/pkg/kstatus/polling/statusreaders/common_test.go b/pkg/kstatus/polling/statusreaders/common_test.go index 7455ee12..6f26612a 100644 --- a/pkg/kstatus/polling/statusreaders/common_test.go +++ b/pkg/kstatus/polling/statusreaders/common_test.go @@ -80,7 +80,7 @@ func TestLookupResource(t *testing.T) { for tn, tc := range testCases { t.Run(tn, func(t *testing.T) { - fakeReader := &fakecr.FakeClusterReader{ + fakeReader := &fakecr.ClusterReader{ GetErr: tc.readerErr, } fakeMapper := fakemapper.NewFakeRESTMapper(deploymentGVK) @@ -201,7 +201,7 @@ spec: for tn, tc := range testCases { t.Run(tn, func(t *testing.T) { - fakeClusterReader := &fakecr.FakeClusterReader{ + fakeClusterReader := &fakecr.ClusterReader{ ListResources: &unstructured.UnstructuredList{ Items: tc.listObjects, }, diff --git a/pkg/kstatus/polling/statusreaders/deployment_test.go b/pkg/kstatus/polling/statusreaders/deployment_test.go index c6b0d6d0..c0680205 100644 --- a/pkg/kstatus/polling/statusreaders/deployment_test.go +++ b/pkg/kstatus/polling/statusreaders/deployment_test.go @@ -85,7 +85,7 @@ func TestReadStatus(t *testing.T) { for tn := range testCases { tc := testCases[tn] t.Run(tn, func(t *testing.T) { - fakeReader := &fakecr.FakeClusterReader{ + fakeReader := &fakecr.ClusterReader{ GetResource: tc.readerResource, GetErr: tc.readerErr, }