K8s: Move shared apis to a common folder with shared openapi spec (#80484)

pkg/registry/apis/datasource/connections.go

@@ -10,7 +10,7 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/registry/rest"
 
-	"github.com/grafana/grafana/pkg/apis"
+	common "github.com/grafana/grafana/pkg/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
 	"github.com/grafana/grafana/pkg/kinds"
 	"github.com/grafana/grafana/pkg/services/datasources"
@@ -26,7 +26,7 @@ var (
 )
 
 type connectionAccess struct {
-	resourceInfo   apis.ResourceInfo
+	resourceInfo   common.ResourceInfo
 	tableConverter rest.TableConvertor
 	builder        *DataSourceAPIBuilder
 }

pkg/registry/apis/datasource/register.go

@@ -14,10 +14,10 @@ import (
 	"k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/registry/rest"
 	genericapiserver "k8s.io/apiserver/pkg/server"
-	common "k8s.io/kube-openapi/pkg/common"
+	openapi "k8s.io/kube-openapi/pkg/common"
 	"k8s.io/utils/strings/slices"
 
-	"github.com/grafana/grafana/pkg/apis"
+	common "github.com/grafana/grafana/pkg/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
 	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/plugins"
@@ -35,7 +35,7 @@ var _ grafanaapiserver.APIGroupBuilder = (*DataSourceAPIBuilder)(nil)
 
 // This is used just so wire has something unique to return
 type DataSourceAPIBuilder struct {
-	connectionResourceInfo apis.ResourceInfo
+	connectionResourceInfo common.ResourceInfo
 
 	plugin        plugins.JSONData
 	client        plugins.Client
@@ -187,7 +187,7 @@ func (b *DataSourceAPIBuilder) GetAPIGroupInfo(
 	return &apiGroupInfo, nil
 }
 
-func (b *DataSourceAPIBuilder) GetOpenAPIDefinitions() common.GetOpenAPIDefinitions {
+func (b *DataSourceAPIBuilder) GetOpenAPIDefinitions() openapi.GetOpenAPIDefinitions {
 	return v0alpha1.GetOpenAPIDefinitions
 }