From e577b8d0b86f9d516fe45766327c423d394f7420 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Tue, 19 Aug 2025 22:50:50 +0300 Subject: [PATCH] rename ListDataSources --- pkg/registry/apis/datasource/legacy_store.go | 4 ++-- pkg/registry/apis/datasource/plugincontext.go | 4 ++-- pkg/registry/apis/datasource/sub_query_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/registry/apis/datasource/legacy_store.go b/pkg/registry/apis/datasource/legacy_store.go index 66b3bebc9a7..bcd7b171240 100644 --- a/pkg/registry/apis/datasource/legacy_store.go +++ b/pkg/registry/apis/datasource/legacy_store.go @@ -53,7 +53,7 @@ func (s *legacyStorage) ConvertToTable(ctx context.Context, object runtime.Objec } func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) { - return s.datasources.ListDataSource(ctx) + return s.datasources.ListDataSources(ctx) } func (s *legacyStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { @@ -113,7 +113,7 @@ func (s *legacyStorage) Delete(ctx context.Context, name string, deleteValidatio // DeleteCollection implements rest.CollectionDeleter. func (s *legacyStorage) DeleteCollection(ctx context.Context, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions, listOptions *internalversion.ListOptions) (runtime.Object, error) { - dss, err := s.datasources.ListDataSource(ctx) + dss, err := s.datasources.ListDataSources(ctx) if err != nil { return nil, err } diff --git a/pkg/registry/apis/datasource/plugincontext.go b/pkg/registry/apis/datasource/plugincontext.go index 4ba32534ddd..8648b2cbaab 100644 --- a/pkg/registry/apis/datasource/plugincontext.go +++ b/pkg/registry/apis/datasource/plugincontext.go @@ -22,7 +22,7 @@ type PluginDatasourceProvider interface { GetDataSource(ctx context.Context, uid string) (*datasourceV0.DataSource, error) // List all datasources (any type) - ListDataSource(ctx context.Context) (*datasourceV0.DataSourceList, error) + ListDataSources(ctx context.Context) (*datasourceV0.DataSourceList, error) // Create a data source CreateDataSource(ctx context.Context, ds *datasourceV0.DataSource) (*datasourceV0.DataSource, error) @@ -164,7 +164,7 @@ func (q *scopedDatasourceProvider) GetDataSource(ctx context.Context, uid string } // ListDataSource implements PluginDatasourceProvider. -func (q *scopedDatasourceProvider) ListDataSource(ctx context.Context) (*datasourceV0.DataSourceList, error) { +func (q *scopedDatasourceProvider) ListDataSources(ctx context.Context) (*datasourceV0.DataSourceList, error) { info, err := request.NamespaceInfoFrom(ctx, true) if err != nil { return nil, err diff --git a/pkg/registry/apis/datasource/sub_query_test.go b/pkg/registry/apis/datasource/sub_query_test.go index 706ffedabff..6147a704cb6 100644 --- a/pkg/registry/apis/datasource/sub_query_test.go +++ b/pkg/registry/apis/datasource/sub_query_test.go @@ -143,7 +143,7 @@ func (m mockDatasources) GetDataSource(ctx context.Context, uid string) (*v0alph } // ListDataSource implements PluginDatasourceProvider. -func (m mockDatasources) ListDataSource(ctx context.Context) (*v0alpha1.DataSourceList, error) { +func (m mockDatasources) ListDataSources(ctx context.Context) (*v0alpha1.DataSourceList, error) { return nil, nil }