diff --git a/pkg/aggregator/apis/aggregation/v0alpha1/register.go b/pkg/aggregator/apis/aggregation/v0alpha1/register.go index 7d1ac05cc2b..f9a075b023d 100644 --- a/pkg/aggregator/apis/aggregation/v0alpha1/register.go +++ b/pkg/aggregator/apis/aggregation/v0alpha1/register.go @@ -5,7 +5,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" ) @@ -15,7 +14,7 @@ const ( APIVERSION = GROUP + "/" + VERSION ) -var DataPlaneServiceResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var DataPlaneServiceResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "dataplaneservices", "dataplaneservice", "DataPlaneService", func() runtime.Object { return &DataPlaneService{} }, func() runtime.Object { return &DataPlaneServiceList{} }, diff --git a/pkg/apimachinery/apis/common/v0alpha1/resource.go b/pkg/apimachinery/utils/resource.go similarity index 90% rename from pkg/apimachinery/apis/common/v0alpha1/resource.go rename to pkg/apimachinery/utils/resource.go index 6ccebac6175..17725db2c0c 100644 --- a/pkg/apimachinery/apis/common/v0alpha1/resource.go +++ b/pkg/apimachinery/utils/resource.go @@ -1,7 +1,6 @@ -package v0alpha1 +package utils import ( - "github.com/grafana/grafana/pkg/apimachinery/utils" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -9,7 +8,6 @@ import ( ) // ResourceInfo helps define a k8s resource -// +k8s:openapi-gen=false type ResourceInfo struct { group string version string @@ -19,11 +17,11 @@ type ResourceInfo struct { kind string newObj func() runtime.Object newList func() runtime.Object - columns utils.TableColumns + columns TableColumns } func NewResourceInfo(group, version, resourceName, singularName, kind string, - newObj func() runtime.Object, newList func() runtime.Object, columns utils.TableColumns) ResourceInfo { + newObj func() runtime.Object, newList func() runtime.Object, columns TableColumns) ResourceInfo { shortName := "" // an optional alias helpful in kubectl eg ("sa" for serviceaccounts) return ResourceInfo{group, version, resourceName, singularName, shortName, kind, newObj, newList, columns} } @@ -116,8 +114,8 @@ func (info *ResourceInfo) NewListFunc() runtime.Object { return info.newList() } -func (info *ResourceInfo) TableConverter() utils.TableConvertor { - return utils.NewTableConverter(info.GroupResource(), info.columns) +func (info *ResourceInfo) TableConverter() TableConvertor { + return NewTableConverter(info.GroupResource(), info.columns) } func (info *ResourceInfo) NewNotFound(name string) *errors.StatusError { diff --git a/pkg/apis/alerting_notifications/v0alpha1/register.go b/pkg/apis/alerting_notifications/v0alpha1/register.go index b18547aa181..3e6b1d29125 100644 --- a/pkg/apis/alerting_notifications/v0alpha1/register.go +++ b/pkg/apis/alerting_notifications/v0alpha1/register.go @@ -9,7 +9,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/registry/generic" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" scope "github.com/grafana/grafana/pkg/apis/scope/v0alpha1" ) @@ -25,7 +24,7 @@ const ( ) var ( - TimeIntervalResourceInfo = common.NewResourceInfo(GROUP, VERSION, + TimeIntervalResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "timeintervals", "timeinterval", "TimeInterval", func() runtime.Object { return &TimeInterval{} }, func() runtime.Object { return &TimeIntervalList{} }, @@ -46,7 +45,7 @@ var ( }, }, ) - ReceiverResourceInfo = common.NewResourceInfo(GROUP, VERSION, + ReceiverResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "receivers", "receiver", "Receiver", func() runtime.Object { return &Receiver{} }, func() runtime.Object { return &ReceiverList{} }, diff --git a/pkg/apis/dashboard/v0alpha1/register.go b/pkg/apis/dashboard/v0alpha1/register.go index c7c4b742432..9b8fe08536d 100644 --- a/pkg/apis/dashboard/v0alpha1/register.go +++ b/pkg/apis/dashboard/v0alpha1/register.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -17,7 +16,7 @@ const ( APIVERSION = GROUP + "/" + VERSION ) -var DashboardResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var DashboardResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "dashboards", "dashboard", "Dashboard", func() runtime.Object { return &Dashboard{} }, func() runtime.Object { return &DashboardList{} }, @@ -43,7 +42,7 @@ var DashboardResourceInfo = common.NewResourceInfo(GROUP, VERSION, }, ) -var LibraryPanelResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var LibraryPanelResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "librarypanels", "librarypanel", "LibraryPanel", func() runtime.Object { return &LibraryPanel{} }, func() runtime.Object { return &LibraryPanelList{} }, diff --git a/pkg/apis/dashboardsnapshot/v0alpha1/register.go b/pkg/apis/dashboardsnapshot/v0alpha1/register.go index 113bc031fc0..b2bb3ecd70c 100644 --- a/pkg/apis/dashboardsnapshot/v0alpha1/register.go +++ b/pkg/apis/dashboardsnapshot/v0alpha1/register.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -17,7 +16,7 @@ const ( APIVERSION = GROUP + "/" + VERSION ) -var DashboardSnapshotResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var DashboardSnapshotResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "dashboardsnapshots", "dashboardsnapshot", "DashboardSnapshot", func() runtime.Object { return &DashboardSnapshot{} }, func() runtime.Object { return &DashboardSnapshotList{} }, diff --git a/pkg/apis/datasource/v0alpha1/register.go b/pkg/apis/datasource/v0alpha1/register.go index 526f48c8a4d..2333aa0d996 100644 --- a/pkg/apis/datasource/v0alpha1/register.go +++ b/pkg/apis/datasource/v0alpha1/register.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -15,7 +14,7 @@ const ( VERSION = "v0alpha1" ) -var GenericConnectionResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var GenericConnectionResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "connections", "connection", "DataSourceConnection", func() runtime.Object { return &DataSourceConnection{} }, func() runtime.Object { return &DataSourceConnectionList{} }, diff --git a/pkg/apis/featuretoggle/v0alpha1/register.go b/pkg/apis/featuretoggle/v0alpha1/register.go index b3b6129c471..efcad19821b 100644 --- a/pkg/apis/featuretoggle/v0alpha1/register.go +++ b/pkg/apis/featuretoggle/v0alpha1/register.go @@ -3,7 +3,6 @@ package v0alpha1 import ( "fmt" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" @@ -17,7 +16,7 @@ const ( ) // FeatureResourceInfo represents each feature that may have a toggle -var FeatureResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var FeatureResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "features", "feature", "Feature", func() runtime.Object { return &Feature{} }, func() runtime.Object { return &FeatureList{} }, @@ -42,7 +41,7 @@ var FeatureResourceInfo = common.NewResourceInfo(GROUP, VERSION, ) // TogglesResourceInfo represents the actual configuration -var TogglesResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var TogglesResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "featuretoggles", "featuretoggle", "FeatureToggles", func() runtime.Object { return &FeatureToggles{} }, func() runtime.Object { return &FeatureTogglesList{} }, diff --git a/pkg/apis/folder/v0alpha1/register.go b/pkg/apis/folder/v0alpha1/register.go index a56362276b9..7decb813d5c 100644 --- a/pkg/apis/folder/v0alpha1/register.go +++ b/pkg/apis/folder/v0alpha1/register.go @@ -3,7 +3,6 @@ package v0alpha1 import ( "fmt" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -17,7 +16,7 @@ const ( APIVERSION = GROUP + "/" + VERSION ) -var FolderResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var FolderResourceInfo = utils.NewResourceInfo(GROUP, VERSION, RESOURCE, "folder", "Folder", func() runtime.Object { return &Folder{} }, func() runtime.Object { return &FolderList{} }, diff --git a/pkg/apis/identity/v0alpha1/register.go b/pkg/apis/identity/v0alpha1/register.go index ba97f4555e1..e48274e60c9 100644 --- a/pkg/apis/identity/v0alpha1/register.go +++ b/pkg/apis/identity/v0alpha1/register.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -17,7 +16,7 @@ const ( APIVERSION = GROUP + "/" + VERSION ) -var UserResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var UserResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "users", "user", "User", func() runtime.Object { return &User{} }, func() runtime.Object { return &UserList{} }, @@ -43,7 +42,7 @@ var UserResourceInfo = common.NewResourceInfo(GROUP, VERSION, }, ) -var TeamResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var TeamResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "teams", "team", "Team", func() runtime.Object { return &Team{} }, func() runtime.Object { return &TeamList{} }, @@ -69,7 +68,7 @@ var TeamResourceInfo = common.NewResourceInfo(GROUP, VERSION, }, ) -var ServiceAccountResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var ServiceAccountResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "serviceaccounts", "serviceaccount", "ServiceAccount", func() runtime.Object { return &ServiceAccount{} }, func() runtime.Object { return &ServiceAccountList{} }, @@ -95,7 +94,7 @@ var ServiceAccountResourceInfo = common.NewResourceInfo(GROUP, VERSION, }, ) -var SSOSettingResourceInfo = common.NewResourceInfo( +var SSOSettingResourceInfo = utils.NewResourceInfo( GROUP, VERSION, "ssosettings", "ssosetting", "SSOSetting", func() runtime.Object { return &SSOSetting{} }, func() runtime.Object { return &SSOSettingList{} }, @@ -121,7 +120,7 @@ var SSOSettingResourceInfo = common.NewResourceInfo( }, ) -var TeamBindingResourceInfo = common.NewResourceInfo( +var TeamBindingResourceInfo = utils.NewResourceInfo( GROUP, VERSION, "teambindings", "teambinding", "TeamBinding", func() runtime.Object { return &TeamBinding{} }, func() runtime.Object { return &TeamBindingList{} }, diff --git a/pkg/apis/peakq/v0alpha1/register.go b/pkg/apis/peakq/v0alpha1/register.go index fdbc6689d73..e314355d107 100644 --- a/pkg/apis/peakq/v0alpha1/register.go +++ b/pkg/apis/peakq/v0alpha1/register.go @@ -5,7 +5,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" ) @@ -15,7 +14,7 @@ const ( APIVERSION = GROUP + "/" + VERSION ) -var QueryTemplateResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var QueryTemplateResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "querytemplates", "querytemplate", "QueryTemplate", func() runtime.Object { return &QueryTemplate{} }, func() runtime.Object { return &QueryTemplateList{} }, diff --git a/pkg/apis/playlist/v0alpha1/register.go b/pkg/apis/playlist/v0alpha1/register.go index ce5dddbee6f..40c3eaf00bb 100644 --- a/pkg/apis/playlist/v0alpha1/register.go +++ b/pkg/apis/playlist/v0alpha1/register.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -19,7 +18,7 @@ const ( GROUPRESOURCE = GROUP + "/" + RESOURCE ) -var PlaylistResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var PlaylistResourceInfo = utils.NewResourceInfo(GROUP, VERSION, RESOURCE, "playlist", "Playlist", func() runtime.Object { return &Playlist{} }, func() runtime.Object { return &PlaylistList{} }, diff --git a/pkg/apis/query/v0alpha1/register.go b/pkg/apis/query/v0alpha1/register.go index faabe486aca..14ba3560315 100644 --- a/pkg/apis/query/v0alpha1/register.go +++ b/pkg/apis/query/v0alpha1/register.go @@ -4,7 +4,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" ) @@ -14,14 +13,14 @@ const ( APIVERSION = GROUP + "/" + VERSION ) -var DataSourceApiServerResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var DataSourceApiServerResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "datasourceapiservers", "datasourceapiserver", "DataSourceApiServer", func() runtime.Object { return &DataSourceApiServer{} }, func() runtime.Object { return &DataSourceApiServerList{} }, utils.TableColumns{}, // default table converter ) -var QueryTypeDefinitionResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var QueryTypeDefinitionResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "querytypes", "querytype", "QueryTypeDefinition", func() runtime.Object { return &QueryTypeDefinition{} }, func() runtime.Object { return &QueryTypeDefinitionList{} }, diff --git a/pkg/apis/scope/v0alpha1/register.go b/pkg/apis/scope/v0alpha1/register.go index 7d301cba8a9..e4c514c062d 100644 --- a/pkg/apis/scope/v0alpha1/register.go +++ b/pkg/apis/scope/v0alpha1/register.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -17,7 +16,7 @@ const ( APIVERSION = GROUP + "/" + VERSION ) -var ScopeResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var ScopeResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "scopes", "scope", "Scope", func() runtime.Object { return &Scope{} }, func() runtime.Object { return &ScopeList{} }, @@ -43,7 +42,7 @@ var ScopeResourceInfo = common.NewResourceInfo(GROUP, VERSION, }, // default table converter ) -var ScopeDashboardBindingResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var ScopeDashboardBindingResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "scopedashboardbindings", "scopedashboardbinding", "ScopeDashboardBinding", func() runtime.Object { return &ScopeDashboardBinding{} }, func() runtime.Object { return &ScopeDashboardBindingList{} }, @@ -69,7 +68,7 @@ var ScopeDashboardBindingResourceInfo = common.NewResourceInfo(GROUP, VERSION, }, ) -var ScopeNodeResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var ScopeNodeResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "scopenodes", "scopenode", "ScopeNode", func() runtime.Object { return &ScopeNode{} }, func() runtime.Object { return &ScopeNodeList{} }, diff --git a/pkg/apis/service/v0alpha1/register.go b/pkg/apis/service/v0alpha1/register.go index 9cc423d51ab..2bfb02c6e29 100644 --- a/pkg/apis/service/v0alpha1/register.go +++ b/pkg/apis/service/v0alpha1/register.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -17,7 +16,7 @@ const ( APIVERSION = GROUP + "/" + VERSION ) -var ExternalNameResourceInfo = common.NewResourceInfo(GROUP, VERSION, +var ExternalNameResourceInfo = utils.NewResourceInfo(GROUP, VERSION, "externalnames", "externalname", "ExternalName", func() runtime.Object { return &ExternalName{} }, func() runtime.Object { return &ExternalNameList{} }, diff --git a/pkg/registry/apis/dashboard/legacy_storage.go b/pkg/registry/apis/dashboard/legacy_storage.go index 411fb53df66..44ca56d59ec 100644 --- a/pkg/registry/apis/dashboard/legacy_storage.go +++ b/pkg/registry/apis/dashboard/legacy_storage.go @@ -1,21 +1,20 @@ package dashboard import ( - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apiserver/pkg/registry/generic" - genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" - "k8s.io/apiserver/pkg/registry/rest" - - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" + "github.com/grafana/grafana/pkg/apimachinery/utils" grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic" grafanarest "github.com/grafana/grafana/pkg/apiserver/rest" "github.com/grafana/grafana/pkg/registry/apis/dashboard/legacy" "github.com/grafana/grafana/pkg/storage/unified/apistore" "github.com/grafana/grafana/pkg/storage/unified/resource" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apiserver/pkg/registry/generic" + genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" + "k8s.io/apiserver/pkg/registry/rest" ) type dashboardStorage struct { - resource common.ResourceInfo + resource utils.ResourceInfo access legacy.DashboardAccess tableConverter rest.TableConvertor diff --git a/pkg/registry/apis/datasource/connections.go b/pkg/registry/apis/datasource/connections.go index cd880596328..ec79393095d 100644 --- a/pkg/registry/apis/datasource/connections.go +++ b/pkg/registry/apis/datasource/connections.go @@ -3,12 +3,11 @@ package datasource import ( "context" + "github.com/grafana/grafana/pkg/apimachinery/utils" "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/rest" - - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" ) var ( @@ -20,7 +19,7 @@ var ( ) type connectionAccess struct { - resourceInfo common.ResourceInfo + resourceInfo utils.ResourceInfo tableConverter rest.TableConvertor datasources PluginDatasourceProvider } diff --git a/pkg/registry/apis/datasource/querier.go b/pkg/registry/apis/datasource/querier.go index 0a5806a4616..c18e3ec1b57 100644 --- a/pkg/registry/apis/datasource/querier.go +++ b/pkg/registry/apis/datasource/querier.go @@ -4,20 +4,19 @@ import ( "context" "github.com/grafana/grafana-plugin-sdk-go/backend" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/identity" + "github.com/grafana/grafana/pkg/apimachinery/utils" "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1" "github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" "github.com/grafana/grafana/pkg/services/datasources" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -type QuerierFactoryFunc func(ctx context.Context, ri common.ResourceInfo, pj plugins.JSONData) (Querier, error) +type QuerierFactoryFunc func(ctx context.Context, ri utils.ResourceInfo, pj plugins.JSONData) (Querier, error) type QuerierProvider interface { - Querier(ctx context.Context, ri common.ResourceInfo, pj plugins.JSONData) (Querier, error) + Querier(ctx context.Context, ri utils.ResourceInfo, pj plugins.JSONData) (Querier, error) } type DefaultQuerierProvider struct { @@ -26,7 +25,7 @@ type DefaultQuerierProvider struct { func ProvideDefaultQuerierProvider(pluginClient plugins.Client, dsService datasources.DataSourceService, dsCache datasources.CacheService) *DefaultQuerierProvider { - return NewQuerierProvider(func(ctx context.Context, ri common.ResourceInfo, pj plugins.JSONData) (Querier, error) { + return NewQuerierProvider(func(ctx context.Context, ri utils.ResourceInfo, pj plugins.JSONData) (Querier, error) { return NewDefaultQuerier(ri, pj, pluginClient, dsService, dsCache), nil }) } @@ -37,7 +36,7 @@ func NewQuerierProvider(factory QuerierFactoryFunc) *DefaultQuerierProvider { } } -func (p *DefaultQuerierProvider) Querier(ctx context.Context, ri common.ResourceInfo, pj plugins.JSONData) (Querier, error) { +func (p *DefaultQuerierProvider) Querier(ctx context.Context, ri utils.ResourceInfo, pj plugins.JSONData) (Querier, error) { return p.factory(ctx, ri, pj) } @@ -56,7 +55,7 @@ type Querier interface { } type DefaultQuerier struct { - connectionResourceInfo common.ResourceInfo + connectionResourceInfo utils.ResourceInfo pluginJSON plugins.JSONData pluginClient plugins.Client dsService datasources.DataSourceService @@ -64,7 +63,7 @@ type DefaultQuerier struct { } func NewDefaultQuerier( - connectionResourceInfo common.ResourceInfo, + connectionResourceInfo utils.ResourceInfo, pluginJSON plugins.JSONData, pluginClient plugins.Client, dsService datasources.DataSourceService, diff --git a/pkg/registry/apis/datasource/register.go b/pkg/registry/apis/datasource/register.go index 8507d0cbe52..9ed9a72b839 100644 --- a/pkg/registry/apis/datasource/register.go +++ b/pkg/registry/apis/datasource/register.go @@ -6,7 +6,19 @@ import ( "fmt" "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/grafana/grafana/pkg/apimachinery/utils" + datasource "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1" + query "github.com/grafana/grafana/pkg/apis/query/v0alpha1" + grafanarest "github.com/grafana/grafana/pkg/apiserver/rest" "github.com/grafana/grafana/pkg/infra/log" + "github.com/grafana/grafana/pkg/plugins" + "github.com/grafana/grafana/pkg/promlib/models" + "github.com/grafana/grafana/pkg/registry/apis/query/queryschema" + "github.com/grafana/grafana/pkg/services/accesscontrol" + "github.com/grafana/grafana/pkg/services/apiserver/builder" + "github.com/grafana/grafana/pkg/services/featuremgmt" + "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore" + "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/kinds" "github.com/prometheus/client_golang/prometheus" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -19,26 +31,13 @@ import ( openapi "k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/spec3" "k8s.io/utils/strings/slices" - - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" - datasource "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1" - query "github.com/grafana/grafana/pkg/apis/query/v0alpha1" - grafanarest "github.com/grafana/grafana/pkg/apiserver/rest" - "github.com/grafana/grafana/pkg/plugins" - "github.com/grafana/grafana/pkg/promlib/models" - "github.com/grafana/grafana/pkg/registry/apis/query/queryschema" - "github.com/grafana/grafana/pkg/services/accesscontrol" - "github.com/grafana/grafana/pkg/services/apiserver/builder" - "github.com/grafana/grafana/pkg/services/featuremgmt" - "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore" - "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource/kinds" ) var _ builder.APIGroupBuilder = (*DataSourceAPIBuilder)(nil) // DataSourceAPIBuilder is used just so wire has something unique to return type DataSourceAPIBuilder struct { - connectionResourceInfo common.ResourceInfo + connectionResourceInfo utils.ResourceInfo pluginJSON plugins.JSONData client PluginClient // will only ever be called with the same pluginid! @@ -192,10 +191,10 @@ func (b *DataSourceAPIBuilder) InstallSchema(scheme *runtime.Scheme) error { return scheme.SetVersionPriority(gv) } -func resourceFromPluginID(pluginID string) (common.ResourceInfo, error) { +func resourceFromPluginID(pluginID string) (utils.ResourceInfo, error) { group, err := plugins.GetDatasourceGroupNameFromPluginID(pluginID) if err != nil { - return common.ResourceInfo{}, err + return utils.ResourceInfo{}, err } return datasource.GenericConnectionResourceInfo.WithGroupAndShortName(group, pluginID+"-connection"), nil } diff --git a/pkg/registry/apis/featuretoggle/features.go b/pkg/registry/apis/featuretoggle/features.go index e50cf2658e0..fa7cf10a7fb 100644 --- a/pkg/registry/apis/featuretoggle/features.go +++ b/pkg/registry/apis/featuretoggle/features.go @@ -5,14 +5,13 @@ import ( "fmt" "sync" + "github.com/grafana/grafana/pkg/apimachinery/utils" + "github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1" + "github.com/grafana/grafana/pkg/services/featuremgmt" "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/rest" - - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" - "github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1" - "github.com/grafana/grafana/pkg/services/featuremgmt" ) var ( @@ -24,7 +23,7 @@ var ( ) type featuresStorage struct { - resource *common.ResourceInfo + resource *utils.ResourceInfo tableConverter rest.TableConvertor features *v0alpha1.FeatureList featuresOnce sync.Once diff --git a/pkg/registry/apis/featuretoggle/toggles.go b/pkg/registry/apis/featuretoggle/toggles.go index 9c920c5a0ba..5d84bcc7843 100644 --- a/pkg/registry/apis/featuretoggle/toggles.go +++ b/pkg/registry/apis/featuretoggle/toggles.go @@ -4,15 +4,14 @@ import ( "context" "fmt" + "github.com/grafana/grafana/pkg/apimachinery/utils" + "github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1" + "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" + "github.com/grafana/grafana/pkg/services/featuremgmt" "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/rest" - - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" - "github.com/grafana/grafana/pkg/apis/featuretoggle/v0alpha1" - "github.com/grafana/grafana/pkg/services/apiserver/endpoints/request" - "github.com/grafana/grafana/pkg/services/featuremgmt" ) var ( @@ -24,7 +23,7 @@ var ( ) type togglesStorage struct { - resource *common.ResourceInfo + resource *utils.ResourceInfo tableConverter rest.TableConvertor // The startup toggles diff --git a/pkg/registry/apis/query/plugins.go b/pkg/registry/apis/query/plugins.go index 6c4a4861df9..23a904f1144 100644 --- a/pkg/registry/apis/query/plugins.go +++ b/pkg/registry/apis/query/plugins.go @@ -3,13 +3,12 @@ package query import ( "context" + "github.com/grafana/grafana/pkg/apimachinery/utils" + query "github.com/grafana/grafana/pkg/apis/query/v0alpha1" "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/rest" - - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" - query "github.com/grafana/grafana/pkg/apis/query/v0alpha1" ) var ( @@ -20,7 +19,7 @@ var ( ) type pluginsStorage struct { - resourceInfo *common.ResourceInfo + resourceInfo *utils.ResourceInfo tableConverter rest.TableConvertor registry query.DataSourceApiServerRegistry diff --git a/pkg/registry/apis/query/queryschema/query_type_storage.go b/pkg/registry/apis/query/queryschema/query_type_storage.go index 4018161b4b8..781b2104178 100644 --- a/pkg/registry/apis/query/queryschema/query_type_storage.go +++ b/pkg/registry/apis/query/queryschema/query_type_storage.go @@ -4,15 +4,13 @@ import ( "context" "net/http" + "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1" + "github.com/grafana/grafana/pkg/apimachinery/utils" + query "github.com/grafana/grafana/pkg/apis/query/v0alpha1" "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/rest" - - "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1" - - common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" - query "github.com/grafana/grafana/pkg/apis/query/v0alpha1" ) var ( @@ -27,7 +25,7 @@ var ( ) type queryTypeStorage struct { - resourceInfo *common.ResourceInfo + resourceInfo *utils.ResourceInfo tableConverter rest.TableConvertor registry query.QueryTypeDefinitionList }