Plugins API: Merge meta and installs (#112962)

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_client_gen.go

@@ -0,0 +1,123 @@
+package v0alpha1
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type PluginClient struct {
+	client *resource.TypedClient[*Plugin, *PluginList]
+}
+
+func NewPluginClient(client resource.Client) *PluginClient {
+	return &PluginClient{
+		client: resource.NewTypedClient[*Plugin, *PluginList](client, PluginKind()),
+	}
+}
+
+func NewPluginClientFromGenerator(generator resource.ClientGenerator) (*PluginClient, error) {
+	c, err := generator.ClientFor(PluginKind())
+	if err != nil {
+		return nil, err
+	}
+	return NewPluginClient(c), nil
+}
+
+func (c *PluginClient) Get(ctx context.Context, identifier resource.Identifier) (*Plugin, error) {
+	return c.client.Get(ctx, identifier)
+}
+
+func (c *PluginClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginList, error) {
+	return c.client.List(ctx, namespace, opts)
+}
+
+func (c *PluginClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginList, error) {
+	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
+		ResourceVersion: opts.ResourceVersion,
+		Limit:           opts.Limit,
+		LabelFilters:    opts.LabelFilters,
+		FieldSelectors:  opts.FieldSelectors,
+	})
+	if err != nil {
+		return nil, err
+	}
+	for resp.GetContinue() != "" {
+		page, err := c.client.List(ctx, namespace, resource.ListOptions{
+			Continue:        resp.GetContinue(),
+			ResourceVersion: opts.ResourceVersion,
+			Limit:           opts.Limit,
+			LabelFilters:    opts.LabelFilters,
+			FieldSelectors:  opts.FieldSelectors,
+		})
+		if err != nil {
+			return nil, err
+		}
+		resp.SetContinue(page.GetContinue())
+		resp.SetResourceVersion(page.GetResourceVersion())
+		resp.SetItems(append(resp.GetItems(), page.GetItems()...))
+	}
+	return resp, nil
+}
+
+func (c *PluginClient) Create(ctx context.Context, obj *Plugin, opts resource.CreateOptions) (*Plugin, error) {
+	// Make sure apiVersion and kind are set
+	obj.APIVersion = GroupVersion.Identifier()
+	obj.Kind = PluginKind().Kind()
+	return c.client.Create(ctx, obj, opts)
+}
+
+func (c *PluginClient) Update(ctx context.Context, obj *Plugin, opts resource.UpdateOptions) (*Plugin, error) {
+	return c.client.Update(ctx, obj, opts)
+}
+
+func (c *PluginClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*Plugin, error) {
+	return c.client.Patch(ctx, identifier, req, opts)
+}
+
+func (c *PluginClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus PluginStatus, opts resource.UpdateOptions) (*Plugin, error) {
+	return c.client.Update(ctx, &Plugin{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       PluginKind().Kind(),
+			APIVersion: GroupVersion.Identifier(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			ResourceVersion: opts.ResourceVersion,
+			Namespace:       identifier.Namespace,
+			Name:            identifier.Name,
+		},
+		Status: newStatus,
+	}, resource.UpdateOptions{
+		Subresource:     "status",
+		ResourceVersion: opts.ResourceVersion,
+	})
+}
+
+func (c *PluginClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
+	return c.client.Delete(ctx, identifier, opts)
+}
+
+type GetMetaRequest struct {
+	Headers http.Header
+}
+
+func (c *PluginClient) GetMeta(ctx context.Context, identifier resource.Identifier, request GetMetaRequest) (*GetMeta, error) {
+	resp, err := c.client.SubresourceRequest(ctx, identifier, resource.CustomRouteRequestOptions{
+		Path:    "/meta",
+		Verb:    "GET",
+		Headers: request.Headers,
+	})
+	if err != nil {
+		return nil, err
+	}
+	cast := GetMeta{}
+	err = json.Unmarshal(resp, &cast)
+	if err != nil {
+		return nil, fmt.Errorf("unable to unmarshal response bytes into GetMeta: %w", err)
+	}
+	return &cast, nil
+}

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_codec_gen.go

@@ -11,18 +11,18 @@ import (
 	"github.com/grafana/grafana-app-sdk/resource"
 )
 
-// PluginMetaJSONCodec is an implementation of resource.Codec for kubernetes JSON encoding
-type PluginMetaJSONCodec struct{}
+// PluginJSONCodec is an implementation of resource.Codec for kubernetes JSON encoding
+type PluginJSONCodec struct{}
 
 // Read reads JSON-encoded bytes from `reader` and unmarshals them into `into`
-func (*PluginMetaJSONCodec) Read(reader io.Reader, into resource.Object) error {
+func (*PluginJSONCodec) Read(reader io.Reader, into resource.Object) error {
 	return json.NewDecoder(reader).Decode(into)
 }
 
 // Write writes JSON-encoded bytes into `writer` marshaled from `from`
-func (*PluginMetaJSONCodec) Write(writer io.Writer, from resource.Object) error {
+func (*PluginJSONCodec) Write(writer io.Writer, from resource.Object) error {
 	return json.NewEncoder(writer).Encode(from)
 }
 
 // Interface compliance checks
-var _ resource.Codec = &PluginMetaJSONCodec{}
+var _ resource.Codec = &PluginJSONCodec{}

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_getmeta_response_types_gen.go

@@ -0,0 +1,463 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	time "time"
+)
+
+// +k8s:openapi-gen=true
+type Info struct {
+	// Required fields
+	// +listType=set
+	Keywords []string          `json:"keywords"`
+	Logos    V0alpha1InfoLogos `json:"logos"`
+	Updated  time.Time         `json:"updated"`
+	Version  string            `json:"version"`
+	// Optional fields
+	Author      *V0alpha1InfoAuthor `json:"author,omitempty"`
+	Description *string             `json:"description,omitempty"`
+	// +listType=atomic
+	Links []V0alpha1InfoLinks `json:"links,omitempty"`
+	// +listType=atomic
+	Screenshots []V0alpha1InfoScreenshots `json:"screenshots,omitempty"`
+}
+
+// NewInfo creates a new Info object.
+func NewInfo() *Info {
+	return &Info{
+		Keywords: []string{},
+		Logos:    *NewV0alpha1InfoLogos(),
+	}
+}
+
+// +k8s:openapi-gen=true
+type Dependencies struct {
+	// Required field
+	GrafanaDependency string `json:"grafanaDependency"`
+	// Optional fields
+	GrafanaVersion *string `json:"grafanaVersion,omitempty"`
+	// +listType=set
+	// +listMapKey=id
+	Plugins    []V0alpha1DependenciesPlugins   `json:"plugins,omitempty"`
+	Extensions *V0alpha1DependenciesExtensions `json:"extensions,omitempty"`
+}
+
+// NewDependencies creates a new Dependencies object.
+func NewDependencies() *Dependencies {
+	return &Dependencies{}
+}
+
+// +k8s:openapi-gen=true
+type EnterpriseFeatures struct {
+	// Allow additional properties
+	HealthDiagnosticsErrors *bool `json:"healthDiagnosticsErrors,omitempty"`
+}
+
+// NewEnterpriseFeatures creates a new EnterpriseFeatures object.
+func NewEnterpriseFeatures() *EnterpriseFeatures {
+	return &EnterpriseFeatures{
+		HealthDiagnosticsErrors: (func(input bool) *bool { return &input })(false),
+	}
+}
+
+// +k8s:openapi-gen=true
+type Include struct {
+	Uid        *string      `json:"uid,omitempty"`
+	Type       *IncludeType `json:"type,omitempty"`
+	Name       *string      `json:"name,omitempty"`
+	Component  *string      `json:"component,omitempty"`
+	Role       *IncludeRole `json:"role,omitempty"`
+	Action     *string      `json:"action,omitempty"`
+	Path       *string      `json:"path,omitempty"`
+	AddToNav   *bool        `json:"addToNav,omitempty"`
+	DefaultNav *bool        `json:"defaultNav,omitempty"`
+	Icon       *string      `json:"icon,omitempty"`
+}
+
+// NewInclude creates a new Include object.
+func NewInclude() *Include {
+	return &Include{}
+}
+
+// +k8s:openapi-gen=true
+type QueryOptions struct {
+	MaxDataPoints *bool `json:"maxDataPoints,omitempty"`
+	MinInterval   *bool `json:"minInterval,omitempty"`
+	CacheTimeout  *bool `json:"cacheTimeout,omitempty"`
+}
+
+// NewQueryOptions creates a new QueryOptions object.
+func NewQueryOptions() *QueryOptions {
+	return &QueryOptions{}
+}
+
+// +k8s:openapi-gen=true
+type Route struct {
+	Path        *string `json:"path,omitempty"`
+	Method      *string `json:"method,omitempty"`
+	Url         *string `json:"url,omitempty"`
+	ReqSignedIn *bool   `json:"reqSignedIn,omitempty"`
+	ReqRole     *string `json:"reqRole,omitempty"`
+	ReqAction   *string `json:"reqAction,omitempty"`
+	// +listType=atomic
+	Headers      []string                   `json:"headers,omitempty"`
+	Body         map[string]interface{}     `json:"body,omitempty"`
+	TokenAuth    *V0alpha1RouteTokenAuth    `json:"tokenAuth,omitempty"`
+	JwtTokenAuth *V0alpha1RouteJwtTokenAuth `json:"jwtTokenAuth,omitempty"`
+	// +listType=atomic
+	UrlParams []V0alpha1RouteUrlParams `json:"urlParams,omitempty"`
+}
+
+// NewRoute creates a new Route object.
+func NewRoute() *Route {
+	return &Route{}
+}
+
+// +k8s:openapi-gen=true
+type IAM struct {
+	// +listType=atomic
+	Permissions []V0alpha1IAMPermissions `json:"permissions,omitempty"`
+}
+
+// NewIAM creates a new IAM object.
+func NewIAM() *IAM {
+	return &IAM{}
+}
+
+// +k8s:openapi-gen=true
+type Role struct {
+	Role *V0alpha1RoleRole `json:"role,omitempty"`
+	// +listType=set
+	Grants []string `json:"grants,omitempty"`
+}
+
+// NewRole creates a new Role object.
+func NewRole() *Role {
+	return &Role{}
+}
+
+// +k8s:openapi-gen=true
+type Extensions struct {
+	// +listType=atomic
+	AddedComponents []V0alpha1ExtensionsAddedComponents `json:"addedComponents,omitempty"`
+	// +listType=atomic
+	AddedLinks []V0alpha1ExtensionsAddedLinks `json:"addedLinks,omitempty"`
+	// +listType=set
+	// +listMapKey=id
+	ExposedComponents []V0alpha1ExtensionsExposedComponents `json:"exposedComponents,omitempty"`
+	// +listType=set
+	// +listMapKey=id
+	ExtensionPoints []V0alpha1ExtensionsExtensionPoints `json:"extensionPoints,omitempty"`
+}
+
+// NewExtensions creates a new Extensions object.
+func NewExtensions() *Extensions {
+	return &Extensions{}
+}
+
+// +k8s:openapi-gen=true
+type GetMeta struct {
+	// Unique name of the plugin
+	Id string `json:"id"`
+	// Plugin type
+	Type GetMetaType `json:"type"`
+	// Human-readable name of the plugin
+	Name string `json:"name"`
+	// Metadata for the plugin
+	Info Info `json:"info"`
+	// Dependency information
+	Dependencies Dependencies `json:"dependencies"`
+	// Optional fields
+	Alerting           *bool               `json:"alerting,omitempty"`
+	Annotations        *bool               `json:"annotations,omitempty"`
+	AutoEnabled        *bool               `json:"autoEnabled,omitempty"`
+	Backend            *bool               `json:"backend,omitempty"`
+	BuildMode          *string             `json:"buildMode,omitempty"`
+	BuiltIn            *bool               `json:"builtIn,omitempty"`
+	Category           *GetMetaCategory    `json:"category,omitempty"`
+	EnterpriseFeatures *EnterpriseFeatures `json:"enterpriseFeatures,omitempty"`
+	Executable         *string             `json:"executable,omitempty"`
+	HideFromList       *bool               `json:"hideFromList,omitempty"`
+	// +listType=atomic
+	Includes                  []Include     `json:"includes,omitempty"`
+	Logs                      *bool         `json:"logs,omitempty"`
+	Metrics                   *bool         `json:"metrics,omitempty"`
+	MultiValueFilterOperators *bool         `json:"multiValueFilterOperators,omitempty"`
+	PascalName                *string       `json:"pascalName,omitempty"`
+	Preload                   *bool         `json:"preload,omitempty"`
+	QueryOptions              *QueryOptions `json:"queryOptions,omitempty"`
+	// +listType=atomic
+	Routes        []Route       `json:"routes,omitempty"`
+	SkipDataQuery *bool         `json:"skipDataQuery,omitempty"`
+	State         *GetMetaState `json:"state,omitempty"`
+	Streaming     *bool         `json:"streaming,omitempty"`
+	Tracing       *bool         `json:"tracing,omitempty"`
+	Iam           *IAM          `json:"iam,omitempty"`
+	// +listType=atomic
+	Roles      []Role      `json:"roles,omitempty"`
+	Extensions *Extensions `json:"extensions,omitempty"`
+}
+
+// NewGetMeta creates a new GetMeta object.
+func NewGetMeta() *GetMeta {
+	return &GetMeta{
+		Info:         *NewInfo(),
+		Dependencies: *NewDependencies(),
+	}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1InfoLogos struct {
+	Small string `json:"small"`
+	Large string `json:"large"`
+}
+
+// NewV0alpha1InfoLogos creates a new V0alpha1InfoLogos object.
+func NewV0alpha1InfoLogos() *V0alpha1InfoLogos {
+	return &V0alpha1InfoLogos{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1InfoAuthor struct {
+	Name  *string `json:"name,omitempty"`
+	Email *string `json:"email,omitempty"`
+	Url   *string `json:"url,omitempty"`
+}
+
+// NewV0alpha1InfoAuthor creates a new V0alpha1InfoAuthor object.
+func NewV0alpha1InfoAuthor() *V0alpha1InfoAuthor {
+	return &V0alpha1InfoAuthor{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1InfoLinks struct {
+	Name *string `json:"name,omitempty"`
+	Url  *string `json:"url,omitempty"`
+}
+
+// NewV0alpha1InfoLinks creates a new V0alpha1InfoLinks object.
+func NewV0alpha1InfoLinks() *V0alpha1InfoLinks {
+	return &V0alpha1InfoLinks{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1InfoScreenshots struct {
+	Name *string `json:"name,omitempty"`
+	Path *string `json:"path,omitempty"`
+}
+
+// NewV0alpha1InfoScreenshots creates a new V0alpha1InfoScreenshots object.
+func NewV0alpha1InfoScreenshots() *V0alpha1InfoScreenshots {
+	return &V0alpha1InfoScreenshots{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1DependenciesPlugins struct {
+	Id   string                          `json:"id"`
+	Type V0alpha1DependenciesPluginsType `json:"type"`
+	Name string                          `json:"name"`
+}
+
+// NewV0alpha1DependenciesPlugins creates a new V0alpha1DependenciesPlugins object.
+func NewV0alpha1DependenciesPlugins() *V0alpha1DependenciesPlugins {
+	return &V0alpha1DependenciesPlugins{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1DependenciesExtensions struct {
+	// +listType=set
+	ExposedComponents []string `json:"exposedComponents,omitempty"`
+}
+
+// NewV0alpha1DependenciesExtensions creates a new V0alpha1DependenciesExtensions object.
+func NewV0alpha1DependenciesExtensions() *V0alpha1DependenciesExtensions {
+	return &V0alpha1DependenciesExtensions{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1RouteTokenAuth struct {
+	Url *string `json:"url,omitempty"`
+	// +listType=set
+	Scopes []string               `json:"scopes,omitempty"`
+	Params map[string]interface{} `json:"params,omitempty"`
+}
+
+// NewV0alpha1RouteTokenAuth creates a new V0alpha1RouteTokenAuth object.
+func NewV0alpha1RouteTokenAuth() *V0alpha1RouteTokenAuth {
+	return &V0alpha1RouteTokenAuth{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1RouteJwtTokenAuth struct {
+	Url *string `json:"url,omitempty"`
+	// +listType=set
+	Scopes []string               `json:"scopes,omitempty"`
+	Params map[string]interface{} `json:"params,omitempty"`
+}
+
+// NewV0alpha1RouteJwtTokenAuth creates a new V0alpha1RouteJwtTokenAuth object.
+func NewV0alpha1RouteJwtTokenAuth() *V0alpha1RouteJwtTokenAuth {
+	return &V0alpha1RouteJwtTokenAuth{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1RouteUrlParams struct {
+	Name    *string `json:"name,omitempty"`
+	Content *string `json:"content,omitempty"`
+}
+
+// NewV0alpha1RouteUrlParams creates a new V0alpha1RouteUrlParams object.
+func NewV0alpha1RouteUrlParams() *V0alpha1RouteUrlParams {
+	return &V0alpha1RouteUrlParams{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1IAMPermissions struct {
+	Action *string `json:"action,omitempty"`
+	Scope  *string `json:"scope,omitempty"`
+}
+
+// NewV0alpha1IAMPermissions creates a new V0alpha1IAMPermissions object.
+func NewV0alpha1IAMPermissions() *V0alpha1IAMPermissions {
+	return &V0alpha1IAMPermissions{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1RoleRolePermissions struct {
+	Action *string `json:"action,omitempty"`
+	Scope  *string `json:"scope,omitempty"`
+}
+
+// NewV0alpha1RoleRolePermissions creates a new V0alpha1RoleRolePermissions object.
+func NewV0alpha1RoleRolePermissions() *V0alpha1RoleRolePermissions {
+	return &V0alpha1RoleRolePermissions{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1RoleRole struct {
+	Name        *string `json:"name,omitempty"`
+	Description *string `json:"description,omitempty"`
+	// +listType=atomic
+	Permissions []V0alpha1RoleRolePermissions `json:"permissions,omitempty"`
+}
+
+// NewV0alpha1RoleRole creates a new V0alpha1RoleRole object.
+func NewV0alpha1RoleRole() *V0alpha1RoleRole {
+	return &V0alpha1RoleRole{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1ExtensionsAddedComponents struct {
+	// +listType=set
+	Targets     []string `json:"targets"`
+	Title       string   `json:"title"`
+	Description *string  `json:"description,omitempty"`
+}
+
+// NewV0alpha1ExtensionsAddedComponents creates a new V0alpha1ExtensionsAddedComponents object.
+func NewV0alpha1ExtensionsAddedComponents() *V0alpha1ExtensionsAddedComponents {
+	return &V0alpha1ExtensionsAddedComponents{
+		Targets: []string{},
+	}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1ExtensionsAddedLinks struct {
+	// +listType=set
+	Targets     []string `json:"targets"`
+	Title       string   `json:"title"`
+	Description *string  `json:"description,omitempty"`
+}
+
+// NewV0alpha1ExtensionsAddedLinks creates a new V0alpha1ExtensionsAddedLinks object.
+func NewV0alpha1ExtensionsAddedLinks() *V0alpha1ExtensionsAddedLinks {
+	return &V0alpha1ExtensionsAddedLinks{
+		Targets: []string{},
+	}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1ExtensionsExposedComponents struct {
+	Id          string  `json:"id"`
+	Title       *string `json:"title,omitempty"`
+	Description *string `json:"description,omitempty"`
+}
+
+// NewV0alpha1ExtensionsExposedComponents creates a new V0alpha1ExtensionsExposedComponents object.
+func NewV0alpha1ExtensionsExposedComponents() *V0alpha1ExtensionsExposedComponents {
+	return &V0alpha1ExtensionsExposedComponents{}
+}
+
+// +k8s:openapi-gen=true
+type V0alpha1ExtensionsExtensionPoints struct {
+	Id          string  `json:"id"`
+	Title       *string `json:"title,omitempty"`
+	Description *string `json:"description,omitempty"`
+}
+
+// NewV0alpha1ExtensionsExtensionPoints creates a new V0alpha1ExtensionsExtensionPoints object.
+func NewV0alpha1ExtensionsExtensionPoints() *V0alpha1ExtensionsExtensionPoints {
+	return &V0alpha1ExtensionsExtensionPoints{}
+}
+
+// +k8s:openapi-gen=true
+type IncludeType string
+
+const (
+	IncludeTypeDashboard  IncludeType = "dashboard"
+	IncludeTypePage       IncludeType = "page"
+	IncludeTypePanel      IncludeType = "panel"
+	IncludeTypeDatasource IncludeType = "datasource"
+)
+
+// +k8s:openapi-gen=true
+type IncludeRole string
+
+const (
+	IncludeRoleAdmin  IncludeRole = "Admin"
+	IncludeRoleEditor IncludeRole = "Editor"
+	IncludeRoleViewer IncludeRole = "Viewer"
+)
+
+// +k8s:openapi-gen=true
+type GetMetaType string
+
+const (
+	GetMetaTypeApp        GetMetaType = "app"
+	GetMetaTypeDatasource GetMetaType = "datasource"
+	GetMetaTypePanel      GetMetaType = "panel"
+	GetMetaTypeRenderer   GetMetaType = "renderer"
+)
+
+// +k8s:openapi-gen=true
+type GetMetaCategory string
+
+const (
+	GetMetaCategoryTsdb       GetMetaCategory = "tsdb"
+	GetMetaCategoryLogging    GetMetaCategory = "logging"
+	GetMetaCategoryCloud      GetMetaCategory = "cloud"
+	GetMetaCategoryTracing    GetMetaCategory = "tracing"
+	GetMetaCategoryProfiling  GetMetaCategory = "profiling"
+	GetMetaCategorySql        GetMetaCategory = "sql"
+	GetMetaCategoryEnterprise GetMetaCategory = "enterprise"
+	GetMetaCategoryIot        GetMetaCategory = "iot"
+	GetMetaCategoryOther      GetMetaCategory = "other"
+)
+
+// +k8s:openapi-gen=true
+type GetMetaState string
+
+const (
+	GetMetaStateAlpha GetMetaState = "alpha"
+	GetMetaStateBeta  GetMetaState = "beta"
+)
+
+// +k8s:openapi-gen=true
+type V0alpha1DependenciesPluginsType string
+
+const (
+	V0alpha1DependenciesPluginsTypeApp        V0alpha1DependenciesPluginsType = "app"
+	V0alpha1DependenciesPluginsTypeDatasource V0alpha1DependenciesPluginsType = "datasource"
+	V0alpha1DependenciesPluginsTypePanel      V0alpha1DependenciesPluginsType = "panel"
+)

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_metadata_gen.go

@@ -9,7 +9,7 @@ import (
 // metadata contains embedded CommonMetadata and can be extended with custom string fields
 // TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
 // without external reference as using the CommonMetadata reference breaks thema codegen.
-type PluginMetaMetadata struct {
+type PluginMetadata struct {
 	UpdateTimestamp   time.Time         `json:"updateTimestamp"`
 	CreatedBy         string            `json:"createdBy"`
 	Uid               string            `json:"uid"`
@@ -22,9 +22,9 @@ type PluginMetaMetadata struct {
 	Labels            map[string]string `json:"labels"`
 }
 
-// NewPluginMetaMetadata creates a new PluginMetaMetadata object.
-func NewPluginMetaMetadata() *PluginMetaMetadata {
-	return &PluginMetaMetadata{
+// NewPluginMetadata creates a new PluginMetadata object.
+func NewPluginMetadata() *PluginMetadata {
+	return &PluginMetadata{
 		Finalizers: []string{},
 		Labels:     map[string]string{},
 	}

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_object_gen.go

@@ -15,22 +15,22 @@ import (
 )
 
 // +k8s:openapi-gen=true
-type PluginMeta struct {
+type Plugin struct {
 	metav1.TypeMeta   `json:",inline" yaml:",inline"`
 	metav1.ObjectMeta `json:"metadata" yaml:"metadata"`
 
-	// Spec is the spec of the PluginMeta
-	Spec PluginMetaSpec `json:"spec" yaml:"spec"`
+	// Spec is the spec of the Plugin
+	Spec PluginSpec `json:"spec" yaml:"spec"`
 
-	Status PluginMetaStatus `json:"status" yaml:"status"`
+	Status PluginStatus `json:"status" yaml:"status"`
 }
 
-func (o *PluginMeta) GetSpec() any {
+func (o *Plugin) GetSpec() any {
 	return o.Spec
 }
 
-func (o *PluginMeta) SetSpec(spec any) error {
-	cast, ok := spec.(PluginMetaSpec)
+func (o *Plugin) SetSpec(spec any) error {
+	cast, ok := spec.(PluginSpec)
 	if !ok {
 		return fmt.Errorf("cannot set spec type %#v, not of type Spec", spec)
 	}
@@ -38,13 +38,13 @@ func (o *PluginMeta) SetSpec(spec any) error {
 	return nil
 }
 
-func (o *PluginMeta) GetSubresources() map[string]any {
+func (o *Plugin) GetSubresources() map[string]any {
 	return map[string]any{
 		"status": o.Status,
 	}
 }
 
-func (o *PluginMeta) GetSubresource(name string) (any, bool) {
+func (o *Plugin) GetSubresource(name string) (any, bool) {
 	switch name {
 	case "status":
 		return o.Status, true
@@ -53,12 +53,12 @@ func (o *PluginMeta) GetSubresource(name string) (any, bool) {
 	}
 }
 
-func (o *PluginMeta) SetSubresource(name string, value any) error {
+func (o *Plugin) SetSubresource(name string, value any) error {
 	switch name {
 	case "status":
-		cast, ok := value.(PluginMetaStatus)
+		cast, ok := value.(PluginStatus)
 		if !ok {
-			return fmt.Errorf("cannot set status type %#v, not of type PluginMetaStatus", value)
+			return fmt.Errorf("cannot set status type %#v, not of type PluginStatus", value)
 		}
 		o.Status = cast
 		return nil
@@ -67,7 +67,7 @@ func (o *PluginMeta) SetSubresource(name string, value any) error {
 	}
 }
 
-func (o *PluginMeta) GetStaticMetadata() resource.StaticMetadata {
+func (o *Plugin) GetStaticMetadata() resource.StaticMetadata {
 	gvk := o.GroupVersionKind()
 	return resource.StaticMetadata{
 		Name:      o.ObjectMeta.Name,
@@ -78,7 +78,7 @@ func (o *PluginMeta) GetStaticMetadata() resource.StaticMetadata {
 	}
 }
 
-func (o *PluginMeta) SetStaticMetadata(metadata resource.StaticMetadata) {
+func (o *Plugin) SetStaticMetadata(metadata resource.StaticMetadata) {
 	o.Name = metadata.Name
 	o.Namespace = metadata.Namespace
 	o.SetGroupVersionKind(schema.GroupVersionKind{
@@ -88,7 +88,7 @@ func (o *PluginMeta) SetStaticMetadata(metadata resource.StaticMetadata) {
 	})
 }
 
-func (o *PluginMeta) GetCommonMetadata() resource.CommonMetadata {
+func (o *Plugin) GetCommonMetadata() resource.CommonMetadata {
 	dt := o.DeletionTimestamp
 	var deletionTimestamp *time.Time
 	if dt != nil {
@@ -120,7 +120,7 @@ func (o *PluginMeta) GetCommonMetadata() resource.CommonMetadata {
 	}
 }
 
-func (o *PluginMeta) SetCommonMetadata(metadata resource.CommonMetadata) {
+func (o *Plugin) SetCommonMetadata(metadata resource.CommonMetadata) {
 	o.UID = types.UID(metadata.UID)
 	o.ResourceVersion = metadata.ResourceVersion
 	o.Generation = metadata.Generation
@@ -165,7 +165,7 @@ func (o *PluginMeta) SetCommonMetadata(metadata resource.CommonMetadata) {
 	}
 }
 
-func (o *PluginMeta) GetCreatedBy() string {
+func (o *Plugin) GetCreatedBy() string {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -173,7 +173,7 @@ func (o *PluginMeta) GetCreatedBy() string {
 	return o.ObjectMeta.Annotations["grafana.com/createdBy"]
 }
 
-func (o *PluginMeta) SetCreatedBy(createdBy string) {
+func (o *Plugin) SetCreatedBy(createdBy string) {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -181,7 +181,7 @@ func (o *PluginMeta) SetCreatedBy(createdBy string) {
 	o.ObjectMeta.Annotations["grafana.com/createdBy"] = createdBy
 }
 
-func (o *PluginMeta) GetUpdateTimestamp() time.Time {
+func (o *Plugin) GetUpdateTimestamp() time.Time {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -190,7 +190,7 @@ func (o *PluginMeta) GetUpdateTimestamp() time.Time {
 	return parsed
 }
 
-func (o *PluginMeta) SetUpdateTimestamp(updateTimestamp time.Time) {
+func (o *Plugin) SetUpdateTimestamp(updateTimestamp time.Time) {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -198,7 +198,7 @@ func (o *PluginMeta) SetUpdateTimestamp(updateTimestamp time.Time) {
 	o.ObjectMeta.Annotations["grafana.com/updateTimestamp"] = updateTimestamp.Format(time.RFC3339)
 }
 
-func (o *PluginMeta) GetUpdatedBy() string {
+func (o *Plugin) GetUpdatedBy() string {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -206,7 +206,7 @@ func (o *PluginMeta) GetUpdatedBy() string {
 	return o.ObjectMeta.Annotations["grafana.com/updatedBy"]
 }
 
-func (o *PluginMeta) SetUpdatedBy(updatedBy string) {
+func (o *Plugin) SetUpdatedBy(updatedBy string) {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -214,21 +214,21 @@ func (o *PluginMeta) SetUpdatedBy(updatedBy string) {
 	o.ObjectMeta.Annotations["grafana.com/updatedBy"] = updatedBy
 }
 
-func (o *PluginMeta) Copy() resource.Object {
+func (o *Plugin) Copy() resource.Object {
 	return resource.CopyObject(o)
 }
 
-func (o *PluginMeta) DeepCopyObject() runtime.Object {
+func (o *Plugin) DeepCopyObject() runtime.Object {
 	return o.Copy()
 }
 
-func (o *PluginMeta) DeepCopy() *PluginMeta {
-	cpy := &PluginMeta{}
+func (o *Plugin) DeepCopy() *Plugin {
+	cpy := &Plugin{}
 	o.DeepCopyInto(cpy)
 	return cpy
 }
 
-func (o *PluginMeta) DeepCopyInto(dst *PluginMeta) {
+func (o *Plugin) DeepCopyInto(dst *Plugin) {
 	dst.TypeMeta.APIVersion = o.TypeMeta.APIVersion
 	dst.TypeMeta.Kind = o.TypeMeta.Kind
 	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
@@ -237,34 +237,34 @@ func (o *PluginMeta) DeepCopyInto(dst *PluginMeta) {
 }
 
 // Interface compliance compile-time check
-var _ resource.Object = &PluginMeta{}
+var _ resource.Object = &Plugin{}
 
 // +k8s:openapi-gen=true
-type PluginMetaList struct {
+type PluginList struct {
 	metav1.TypeMeta `json:",inline" yaml:",inline"`
 	metav1.ListMeta `json:"metadata" yaml:"metadata"`
-	Items           []PluginMeta `json:"items" yaml:"items"`
+	Items           []Plugin `json:"items" yaml:"items"`
 }
 
-func (o *PluginMetaList) DeepCopyObject() runtime.Object {
+func (o *PluginList) DeepCopyObject() runtime.Object {
 	return o.Copy()
 }
 
-func (o *PluginMetaList) Copy() resource.ListObject {
-	cpy := &PluginMetaList{
+func (o *PluginList) Copy() resource.ListObject {
+	cpy := &PluginList{
 		TypeMeta: o.TypeMeta,
-		Items:    make([]PluginMeta, len(o.Items)),
+		Items:    make([]Plugin, len(o.Items)),
 	}
 	o.ListMeta.DeepCopyInto(&cpy.ListMeta)
 	for i := 0; i < len(o.Items); i++ {
-		if item, ok := o.Items[i].Copy().(*PluginMeta); ok {
+		if item, ok := o.Items[i].Copy().(*Plugin); ok {
 			cpy.Items[i] = *item
 		}
 	}
 	return cpy
 }
 
-func (o *PluginMetaList) GetItems() []resource.Object {
+func (o *PluginList) GetItems() []resource.Object {
 	items := make([]resource.Object, len(o.Items))
 	for i := 0; i < len(o.Items); i++ {
 		items[i] = &o.Items[i]
@@ -272,48 +272,48 @@ func (o *PluginMetaList) GetItems() []resource.Object {
 	return items
 }
 
-func (o *PluginMetaList) SetItems(items []resource.Object) {
-	o.Items = make([]PluginMeta, len(items))
+func (o *PluginList) SetItems(items []resource.Object) {
+	o.Items = make([]Plugin, len(items))
 	for i := 0; i < len(items); i++ {
-		o.Items[i] = *items[i].(*PluginMeta)
+		o.Items[i] = *items[i].(*Plugin)
 	}
 }
 
-func (o *PluginMetaList) DeepCopy() *PluginMetaList {
-	cpy := &PluginMetaList{}
+func (o *PluginList) DeepCopy() *PluginList {
+	cpy := &PluginList{}
 	o.DeepCopyInto(cpy)
 	return cpy
 }
 
-func (o *PluginMetaList) DeepCopyInto(dst *PluginMetaList) {
+func (o *PluginList) DeepCopyInto(dst *PluginList) {
 	resource.CopyObjectInto(dst, o)
 }
 
 // Interface compliance compile-time check
-var _ resource.ListObject = &PluginMetaList{}
+var _ resource.ListObject = &PluginList{}
 
 // Copy methods for all subresource types
 
 // DeepCopy creates a full deep copy of Spec
-func (s *PluginMetaSpec) DeepCopy() *PluginMetaSpec {
-	cpy := &PluginMetaSpec{}
+func (s *PluginSpec) DeepCopy() *PluginSpec {
+	cpy := &PluginSpec{}
 	s.DeepCopyInto(cpy)
 	return cpy
 }
 
 // DeepCopyInto deep copies Spec into another Spec object
-func (s *PluginMetaSpec) DeepCopyInto(dst *PluginMetaSpec) {
+func (s *PluginSpec) DeepCopyInto(dst *PluginSpec) {
 	resource.CopyObjectInto(dst, s)
 }
 
-// DeepCopy creates a full deep copy of PluginMetaStatus
-func (s *PluginMetaStatus) DeepCopy() *PluginMetaStatus {
-	cpy := &PluginMetaStatus{}
+// DeepCopy creates a full deep copy of PluginStatus
+func (s *PluginStatus) DeepCopy() *PluginStatus {
+	cpy := &PluginStatus{}
 	s.DeepCopyInto(cpy)
 	return cpy
 }
 
-// DeepCopyInto deep copies PluginMetaStatus into another PluginMetaStatus object
-func (s *PluginMetaStatus) DeepCopyInto(dst *PluginMetaStatus) {
+// DeepCopyInto deep copies PluginStatus into another PluginStatus object
+func (s *PluginStatus) DeepCopyInto(dst *PluginStatus) {
 	resource.CopyObjectInto(dst, s)
 }

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_schema_gen.go

@@ -0,0 +1,34 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v0alpha1
+
+import (
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// schema is unexported to prevent accidental overwrites
+var (
+	schemaPlugin = resource.NewSimpleSchema("plugins.grafana.app", "v0alpha1", &Plugin{}, &PluginList{}, resource.WithKind("Plugin"),
+		resource.WithPlural("plugins"), resource.WithScope(resource.NamespacedScope))
+	kindPlugin = resource.Kind{
+		Schema: schemaPlugin,
+		Codecs: map[resource.KindEncoding]resource.Codec{
+			resource.KindEncodingJSON: &PluginJSONCodec{},
+		},
+	}
+)
+
+// Kind returns a resource.Kind for this Schema with a JSON codec
+func PluginKind() resource.Kind {
+	return kindPlugin
+}
+
+// Schema returns a resource.SimpleSchema representation of Plugin
+func PluginSchema() *resource.SimpleSchema {
+	return schemaPlugin
+}
+
+// Interface compliance checks
+var _ resource.Schema = kindPlugin

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_spec_gen.go

@@ -0,0 +1,25 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v0alpha1
+
+// +k8s:openapi-gen=true
+type PluginSpec struct {
+	Id      string          `json:"id"`
+	Version string          `json:"version"`
+	Url     *string         `json:"url,omitempty"`
+	Class   PluginSpecClass `json:"class"`
+}
+
+// NewPluginSpec creates a new PluginSpec object.
+func NewPluginSpec() *PluginSpec {
+	return &PluginSpec{}
+}
+
+// +k8s:openapi-gen=true
+type PluginSpecClass string
+
+const (
+	PluginSpecClassCore     PluginSpecClass = "core"
+	PluginSpecClassExternal PluginSpecClass = "external"
+	PluginSpecClassCdn      PluginSpecClass = "cdn"
+)

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_status_gen.go

@@ -3,42 +3,42 @@
 package v0alpha1
 
 // +k8s:openapi-gen=true
-type PluginMetastatusOperatorState struct {
+type PluginstatusOperatorState struct {
 	// lastEvaluation is the ResourceVersion last evaluated
 	LastEvaluation string `json:"lastEvaluation"`
 	// state describes the state of the lastEvaluation.
 	// It is limited to three possible states for machine evaluation.
-	State PluginMetaStatusOperatorStateState `json:"state"`
+	State PluginStatusOperatorStateState `json:"state"`
 	// descriptiveState is an optional more descriptive state field which has no requirements on format
 	DescriptiveState *string `json:"descriptiveState,omitempty"`
 	// details contains any extra information that is operator-specific
 	Details map[string]interface{} `json:"details,omitempty"`
 }
 
-// NewPluginMetastatusOperatorState creates a new PluginMetastatusOperatorState object.
-func NewPluginMetastatusOperatorState() *PluginMetastatusOperatorState {
-	return &PluginMetastatusOperatorState{}
+// NewPluginstatusOperatorState creates a new PluginstatusOperatorState object.
+func NewPluginstatusOperatorState() *PluginstatusOperatorState {
+	return &PluginstatusOperatorState{}
 }
 
 // +k8s:openapi-gen=true
-type PluginMetaStatus struct {
+type PluginStatus struct {
 	// operatorStates is a map of operator ID to operator state evaluations.
 	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
-	OperatorStates map[string]PluginMetastatusOperatorState `json:"operatorStates,omitempty"`
+	OperatorStates map[string]PluginstatusOperatorState `json:"operatorStates,omitempty"`
 	// additionalFields is reserved for future use
 	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
 }
 
-// NewPluginMetaStatus creates a new PluginMetaStatus object.
-func NewPluginMetaStatus() *PluginMetaStatus {
-	return &PluginMetaStatus{}
+// NewPluginStatus creates a new PluginStatus object.
+func NewPluginStatus() *PluginStatus {
+	return &PluginStatus{}
 }
 
 // +k8s:openapi-gen=true
-type PluginMetaStatusOperatorStateState string
+type PluginStatusOperatorStateState string
 
 const (
-	PluginMetaStatusOperatorStateStateSuccess    PluginMetaStatusOperatorStateState = "success"
-	PluginMetaStatusOperatorStateStateInProgress PluginMetaStatusOperatorStateState = "in_progress"
-	PluginMetaStatusOperatorStateStateFailed     PluginMetaStatusOperatorStateState = "failed"
+	PluginStatusOperatorStateStateSuccess    PluginStatusOperatorStateState = "success"
+	PluginStatusOperatorStateStateInProgress PluginStatusOperatorStateState = "in_progress"
+	PluginStatusOperatorStateStateFailed     PluginStatusOperatorStateState = "failed"
 )

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_client_gen.go

@@ -1,99 +0,0 @@
-package v0alpha1
-
-import (
-	"context"
-
-	"github.com/grafana/grafana-app-sdk/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type PluginInstallClient struct {
-	client *resource.TypedClient[*PluginInstall, *PluginInstallList]
-}
-
-func NewPluginInstallClient(client resource.Client) *PluginInstallClient {
-	return &PluginInstallClient{
-		client: resource.NewTypedClient[*PluginInstall, *PluginInstallList](client, PluginInstallKind()),
-	}
-}
-
-func NewPluginInstallClientFromGenerator(generator resource.ClientGenerator) (*PluginInstallClient, error) {
-	c, err := generator.ClientFor(PluginInstallKind())
-	if err != nil {
-		return nil, err
-	}
-	return NewPluginInstallClient(c), nil
-}
-
-func (c *PluginInstallClient) Get(ctx context.Context, identifier resource.Identifier) (*PluginInstall, error) {
-	return c.client.Get(ctx, identifier)
-}
-
-func (c *PluginInstallClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginInstallList, error) {
-	return c.client.List(ctx, namespace, opts)
-}
-
-func (c *PluginInstallClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginInstallList, error) {
-	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
-		ResourceVersion: opts.ResourceVersion,
-		Limit:           opts.Limit,
-		LabelFilters:    opts.LabelFilters,
-		FieldSelectors:  opts.FieldSelectors,
-	})
-	if err != nil {
-		return nil, err
-	}
-	for resp.GetContinue() != "" {
-		page, err := c.client.List(ctx, namespace, resource.ListOptions{
-			Continue:        resp.GetContinue(),
-			ResourceVersion: opts.ResourceVersion,
-			Limit:           opts.Limit,
-			LabelFilters:    opts.LabelFilters,
-			FieldSelectors:  opts.FieldSelectors,
-		})
-		if err != nil {
-			return nil, err
-		}
-		resp.SetContinue(page.GetContinue())
-		resp.SetResourceVersion(page.GetResourceVersion())
-		resp.SetItems(append(resp.GetItems(), page.GetItems()...))
-	}
-	return resp, nil
-}
-
-func (c *PluginInstallClient) Create(ctx context.Context, obj *PluginInstall, opts resource.CreateOptions) (*PluginInstall, error) {
-	// Make sure apiVersion and kind are set
-	obj.APIVersion = GroupVersion.Identifier()
-	obj.Kind = PluginInstallKind().Kind()
-	return c.client.Create(ctx, obj, opts)
-}
-
-func (c *PluginInstallClient) Update(ctx context.Context, obj *PluginInstall, opts resource.UpdateOptions) (*PluginInstall, error) {
-	return c.client.Update(ctx, obj, opts)
-}
-
-func (c *PluginInstallClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*PluginInstall, error) {
-	return c.client.Patch(ctx, identifier, req, opts)
-}
-
-func (c *PluginInstallClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus PluginInstallStatus, opts resource.UpdateOptions) (*PluginInstall, error) {
-	return c.client.Update(ctx, &PluginInstall{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       PluginInstallKind().Kind(),
-			APIVersion: GroupVersion.Identifier(),
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			ResourceVersion: opts.ResourceVersion,
-			Namespace:       identifier.Namespace,
-			Name:            identifier.Name,
-		},
-		Status: newStatus,
-	}, resource.UpdateOptions{
-		Subresource:     "status",
-		ResourceVersion: opts.ResourceVersion,
-	})
-}
-
-func (c *PluginInstallClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
-	return c.client.Delete(ctx, identifier, opts)
-}

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_codec_gen.go

@@ -1,28 +0,0 @@
-//
-// Code generated by grafana-app-sdk. DO NOT EDIT.
-//
-
-package v0alpha1
-
-import (
-	"encoding/json"
-	"io"
-
-	"github.com/grafana/grafana-app-sdk/resource"
-)
-
-// PluginInstallJSONCodec is an implementation of resource.Codec for kubernetes JSON encoding
-type PluginInstallJSONCodec struct{}
-
-// Read reads JSON-encoded bytes from `reader` and unmarshals them into `into`
-func (*PluginInstallJSONCodec) Read(reader io.Reader, into resource.Object) error {
-	return json.NewDecoder(reader).Decode(into)
-}
-
-// Write writes JSON-encoded bytes into `writer` marshaled from `from`
-func (*PluginInstallJSONCodec) Write(writer io.Writer, from resource.Object) error {
-	return json.NewEncoder(writer).Encode(from)
-}
-
-// Interface compliance checks
-var _ resource.Codec = &PluginInstallJSONCodec{}

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_metadata_gen.go

@@ -1,31 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-import (
-	time "time"
-)
-
-// metadata contains embedded CommonMetadata and can be extended with custom string fields
-// TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
-// without external reference as using the CommonMetadata reference breaks thema codegen.
-type PluginInstallMetadata struct {
-	UpdateTimestamp   time.Time         `json:"updateTimestamp"`
-	CreatedBy         string            `json:"createdBy"`
-	Uid               string            `json:"uid"`
-	CreationTimestamp time.Time         `json:"creationTimestamp"`
-	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
-	Finalizers        []string          `json:"finalizers"`
-	ResourceVersion   string            `json:"resourceVersion"`
-	Generation        int64             `json:"generation"`
-	UpdatedBy         string            `json:"updatedBy"`
-	Labels            map[string]string `json:"labels"`
-}
-
-// NewPluginInstallMetadata creates a new PluginInstallMetadata object.
-func NewPluginInstallMetadata() *PluginInstallMetadata {
-	return &PluginInstallMetadata{
-		Finalizers: []string{},
-		Labels:     map[string]string{},
-	}
-}

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_object_gen.go

@@ -1,319 +0,0 @@
-//
-// Code generated by grafana-app-sdk. DO NOT EDIT.
-//
-
-package v0alpha1
-
-import (
-	"fmt"
-	"github.com/grafana/grafana-app-sdk/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
-	"time"
-)
-
-// +k8s:openapi-gen=true
-type PluginInstall struct {
-	metav1.TypeMeta   `json:",inline" yaml:",inline"`
-	metav1.ObjectMeta `json:"metadata" yaml:"metadata"`
-
-	// Spec is the spec of the PluginInstall
-	Spec PluginInstallSpec `json:"spec" yaml:"spec"`
-
-	Status PluginInstallStatus `json:"status" yaml:"status"`
-}
-
-func (o *PluginInstall) GetSpec() any {
-	return o.Spec
-}
-
-func (o *PluginInstall) SetSpec(spec any) error {
-	cast, ok := spec.(PluginInstallSpec)
-	if !ok {
-		return fmt.Errorf("cannot set spec type %#v, not of type Spec", spec)
-	}
-	o.Spec = cast
-	return nil
-}
-
-func (o *PluginInstall) GetSubresources() map[string]any {
-	return map[string]any{
-		"status": o.Status,
-	}
-}
-
-func (o *PluginInstall) GetSubresource(name string) (any, bool) {
-	switch name {
-	case "status":
-		return o.Status, true
-	default:
-		return nil, false
-	}
-}
-
-func (o *PluginInstall) SetSubresource(name string, value any) error {
-	switch name {
-	case "status":
-		cast, ok := value.(PluginInstallStatus)
-		if !ok {
-			return fmt.Errorf("cannot set status type %#v, not of type PluginInstallStatus", value)
-		}
-		o.Status = cast
-		return nil
-	default:
-		return fmt.Errorf("subresource '%s' does not exist", name)
-	}
-}
-
-func (o *PluginInstall) GetStaticMetadata() resource.StaticMetadata {
-	gvk := o.GroupVersionKind()
-	return resource.StaticMetadata{
-		Name:      o.ObjectMeta.Name,
-		Namespace: o.ObjectMeta.Namespace,
-		Group:     gvk.Group,
-		Version:   gvk.Version,
-		Kind:      gvk.Kind,
-	}
-}
-
-func (o *PluginInstall) SetStaticMetadata(metadata resource.StaticMetadata) {
-	o.Name = metadata.Name
-	o.Namespace = metadata.Namespace
-	o.SetGroupVersionKind(schema.GroupVersionKind{
-		Group:   metadata.Group,
-		Version: metadata.Version,
-		Kind:    metadata.Kind,
-	})
-}
-
-func (o *PluginInstall) GetCommonMetadata() resource.CommonMetadata {
-	dt := o.DeletionTimestamp
-	var deletionTimestamp *time.Time
-	if dt != nil {
-		deletionTimestamp = &dt.Time
-	}
-	// Legacy ExtraFields support
-	extraFields := make(map[string]any)
-	if o.Annotations != nil {
-		extraFields["annotations"] = o.Annotations
-	}
-	if o.ManagedFields != nil {
-		extraFields["managedFields"] = o.ManagedFields
-	}
-	if o.OwnerReferences != nil {
-		extraFields["ownerReferences"] = o.OwnerReferences
-	}
-	return resource.CommonMetadata{
-		UID:               string(o.UID),
-		ResourceVersion:   o.ResourceVersion,
-		Generation:        o.Generation,
-		Labels:            o.Labels,
-		CreationTimestamp: o.CreationTimestamp.Time,
-		DeletionTimestamp: deletionTimestamp,
-		Finalizers:        o.Finalizers,
-		UpdateTimestamp:   o.GetUpdateTimestamp(),
-		CreatedBy:         o.GetCreatedBy(),
-		UpdatedBy:         o.GetUpdatedBy(),
-		ExtraFields:       extraFields,
-	}
-}
-
-func (o *PluginInstall) SetCommonMetadata(metadata resource.CommonMetadata) {
-	o.UID = types.UID(metadata.UID)
-	o.ResourceVersion = metadata.ResourceVersion
-	o.Generation = metadata.Generation
-	o.Labels = metadata.Labels
-	o.CreationTimestamp = metav1.NewTime(metadata.CreationTimestamp)
-	if metadata.DeletionTimestamp != nil {
-		dt := metav1.NewTime(*metadata.DeletionTimestamp)
-		o.DeletionTimestamp = &dt
-	} else {
-		o.DeletionTimestamp = nil
-	}
-	o.Finalizers = metadata.Finalizers
-	if o.Annotations == nil {
-		o.Annotations = make(map[string]string)
-	}
-	if !metadata.UpdateTimestamp.IsZero() {
-		o.SetUpdateTimestamp(metadata.UpdateTimestamp)
-	}
-	if metadata.CreatedBy != "" {
-		o.SetCreatedBy(metadata.CreatedBy)
-	}
-	if metadata.UpdatedBy != "" {
-		o.SetUpdatedBy(metadata.UpdatedBy)
-	}
-	// Legacy support for setting Annotations, ManagedFields, and OwnerReferences via ExtraFields
-	if metadata.ExtraFields != nil {
-		if annotations, ok := metadata.ExtraFields["annotations"]; ok {
-			if cast, ok := annotations.(map[string]string); ok {
-				o.Annotations = cast
-			}
-		}
-		if managedFields, ok := metadata.ExtraFields["managedFields"]; ok {
-			if cast, ok := managedFields.([]metav1.ManagedFieldsEntry); ok {
-				o.ManagedFields = cast
-			}
-		}
-		if ownerReferences, ok := metadata.ExtraFields["ownerReferences"]; ok {
-			if cast, ok := ownerReferences.([]metav1.OwnerReference); ok {
-				o.OwnerReferences = cast
-			}
-		}
-	}
-}
-
-func (o *PluginInstall) GetCreatedBy() string {
-	if o.ObjectMeta.Annotations == nil {
-		o.ObjectMeta.Annotations = make(map[string]string)
-	}
-
-	return o.ObjectMeta.Annotations["grafana.com/createdBy"]
-}
-
-func (o *PluginInstall) SetCreatedBy(createdBy string) {
-	if o.ObjectMeta.Annotations == nil {
-		o.ObjectMeta.Annotations = make(map[string]string)
-	}
-
-	o.ObjectMeta.Annotations["grafana.com/createdBy"] = createdBy
-}
-
-func (o *PluginInstall) GetUpdateTimestamp() time.Time {
-	if o.ObjectMeta.Annotations == nil {
-		o.ObjectMeta.Annotations = make(map[string]string)
-	}
-
-	parsed, _ := time.Parse(time.RFC3339, o.ObjectMeta.Annotations["grafana.com/updateTimestamp"])
-	return parsed
-}
-
-func (o *PluginInstall) SetUpdateTimestamp(updateTimestamp time.Time) {
-	if o.ObjectMeta.Annotations == nil {
-		o.ObjectMeta.Annotations = make(map[string]string)
-	}
-
-	o.ObjectMeta.Annotations["grafana.com/updateTimestamp"] = updateTimestamp.Format(time.RFC3339)
-}
-
-func (o *PluginInstall) GetUpdatedBy() string {
-	if o.ObjectMeta.Annotations == nil {
-		o.ObjectMeta.Annotations = make(map[string]string)
-	}
-
-	return o.ObjectMeta.Annotations["grafana.com/updatedBy"]
-}
-
-func (o *PluginInstall) SetUpdatedBy(updatedBy string) {
-	if o.ObjectMeta.Annotations == nil {
-		o.ObjectMeta.Annotations = make(map[string]string)
-	}
-
-	o.ObjectMeta.Annotations["grafana.com/updatedBy"] = updatedBy
-}
-
-func (o *PluginInstall) Copy() resource.Object {
-	return resource.CopyObject(o)
-}
-
-func (o *PluginInstall) DeepCopyObject() runtime.Object {
-	return o.Copy()
-}
-
-func (o *PluginInstall) DeepCopy() *PluginInstall {
-	cpy := &PluginInstall{}
-	o.DeepCopyInto(cpy)
-	return cpy
-}
-
-func (o *PluginInstall) DeepCopyInto(dst *PluginInstall) {
-	dst.TypeMeta.APIVersion = o.TypeMeta.APIVersion
-	dst.TypeMeta.Kind = o.TypeMeta.Kind
-	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
-	o.Spec.DeepCopyInto(&dst.Spec)
-	o.Status.DeepCopyInto(&dst.Status)
-}
-
-// Interface compliance compile-time check
-var _ resource.Object = &PluginInstall{}
-
-// +k8s:openapi-gen=true
-type PluginInstallList struct {
-	metav1.TypeMeta `json:",inline" yaml:",inline"`
-	metav1.ListMeta `json:"metadata" yaml:"metadata"`
-	Items           []PluginInstall `json:"items" yaml:"items"`
-}
-
-func (o *PluginInstallList) DeepCopyObject() runtime.Object {
-	return o.Copy()
-}
-
-func (o *PluginInstallList) Copy() resource.ListObject {
-	cpy := &PluginInstallList{
-		TypeMeta: o.TypeMeta,
-		Items:    make([]PluginInstall, len(o.Items)),
-	}
-	o.ListMeta.DeepCopyInto(&cpy.ListMeta)
-	for i := 0; i < len(o.Items); i++ {
-		if item, ok := o.Items[i].Copy().(*PluginInstall); ok {
-			cpy.Items[i] = *item
-		}
-	}
-	return cpy
-}
-
-func (o *PluginInstallList) GetItems() []resource.Object {
-	items := make([]resource.Object, len(o.Items))
-	for i := 0; i < len(o.Items); i++ {
-		items[i] = &o.Items[i]
-	}
-	return items
-}
-
-func (o *PluginInstallList) SetItems(items []resource.Object) {
-	o.Items = make([]PluginInstall, len(items))
-	for i := 0; i < len(items); i++ {
-		o.Items[i] = *items[i].(*PluginInstall)
-	}
-}
-
-func (o *PluginInstallList) DeepCopy() *PluginInstallList {
-	cpy := &PluginInstallList{}
-	o.DeepCopyInto(cpy)
-	return cpy
-}
-
-func (o *PluginInstallList) DeepCopyInto(dst *PluginInstallList) {
-	resource.CopyObjectInto(dst, o)
-}
-
-// Interface compliance compile-time check
-var _ resource.ListObject = &PluginInstallList{}
-
-// Copy methods for all subresource types
-
-// DeepCopy creates a full deep copy of Spec
-func (s *PluginInstallSpec) DeepCopy() *PluginInstallSpec {
-	cpy := &PluginInstallSpec{}
-	s.DeepCopyInto(cpy)
-	return cpy
-}
-
-// DeepCopyInto deep copies Spec into another Spec object
-func (s *PluginInstallSpec) DeepCopyInto(dst *PluginInstallSpec) {
-	resource.CopyObjectInto(dst, s)
-}
-
-// DeepCopy creates a full deep copy of PluginInstallStatus
-func (s *PluginInstallStatus) DeepCopy() *PluginInstallStatus {
-	cpy := &PluginInstallStatus{}
-	s.DeepCopyInto(cpy)
-	return cpy
-}
-
-// DeepCopyInto deep copies PluginInstallStatus into another PluginInstallStatus object
-func (s *PluginInstallStatus) DeepCopyInto(dst *PluginInstallStatus) {
-	resource.CopyObjectInto(dst, s)
-}

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_schema_gen.go

@@ -1,34 +0,0 @@
-//
-// Code generated by grafana-app-sdk. DO NOT EDIT.
-//
-
-package v0alpha1
-
-import (
-	"github.com/grafana/grafana-app-sdk/resource"
-)
-
-// schema is unexported to prevent accidental overwrites
-var (
-	schemaPluginInstall = resource.NewSimpleSchema("plugins.grafana.app", "v0alpha1", &PluginInstall{}, &PluginInstallList{}, resource.WithKind("PluginInstall"),
-		resource.WithPlural("plugininstalls"), resource.WithScope(resource.NamespacedScope))
-	kindPluginInstall = resource.Kind{
-		Schema: schemaPluginInstall,
-		Codecs: map[resource.KindEncoding]resource.Codec{
-			resource.KindEncodingJSON: &PluginInstallJSONCodec{},
-		},
-	}
-)
-
-// Kind returns a resource.Kind for this Schema with a JSON codec
-func PluginInstallKind() resource.Kind {
-	return kindPluginInstall
-}
-
-// Schema returns a resource.SimpleSchema representation of PluginInstall
-func PluginInstallSchema() *resource.SimpleSchema {
-	return schemaPluginInstall
-}
-
-// Interface compliance checks
-var _ resource.Schema = kindPluginInstall

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_spec_gen.go

@@ -1,25 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-// +k8s:openapi-gen=true
-type PluginInstallSpec struct {
-	Id      string                 `json:"id"`
-	Version string                 `json:"version"`
-	Url     *string                `json:"url,omitempty"`
-	Class   PluginInstallSpecClass `json:"class"`
-}
-
-// NewPluginInstallSpec creates a new PluginInstallSpec object.
-func NewPluginInstallSpec() *PluginInstallSpec {
-	return &PluginInstallSpec{}
-}
-
-// +k8s:openapi-gen=true
-type PluginInstallSpecClass string
-
-const (
-	PluginInstallSpecClassCore     PluginInstallSpecClass = "core"
-	PluginInstallSpecClassExternal PluginInstallSpecClass = "external"
-	PluginInstallSpecClassCdn      PluginInstallSpecClass = "cdn"
-)

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_status_gen.go

@@ -1,44 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-// +k8s:openapi-gen=true
-type PluginInstallstatusOperatorState struct {
-	// lastEvaluation is the ResourceVersion last evaluated
-	LastEvaluation string `json:"lastEvaluation"`
-	// state describes the state of the lastEvaluation.
-	// It is limited to three possible states for machine evaluation.
-	State PluginInstallStatusOperatorStateState `json:"state"`
-	// descriptiveState is an optional more descriptive state field which has no requirements on format
-	DescriptiveState *string `json:"descriptiveState,omitempty"`
-	// details contains any extra information that is operator-specific
-	Details map[string]interface{} `json:"details,omitempty"`
-}
-
-// NewPluginInstallstatusOperatorState creates a new PluginInstallstatusOperatorState object.
-func NewPluginInstallstatusOperatorState() *PluginInstallstatusOperatorState {
-	return &PluginInstallstatusOperatorState{}
-}
-
-// +k8s:openapi-gen=true
-type PluginInstallStatus struct {
-	// operatorStates is a map of operator ID to operator state evaluations.
-	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
-	OperatorStates map[string]PluginInstallstatusOperatorState `json:"operatorStates,omitempty"`
-	// additionalFields is reserved for future use
-	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
-}
-
-// NewPluginInstallStatus creates a new PluginInstallStatus object.
-func NewPluginInstallStatus() *PluginInstallStatus {
-	return &PluginInstallStatus{}
-}
-
-// +k8s:openapi-gen=true
-type PluginInstallStatusOperatorStateState string
-
-const (
-	PluginInstallStatusOperatorStateStateSuccess    PluginInstallStatusOperatorStateState = "success"
-	PluginInstallStatusOperatorStateStateInProgress PluginInstallStatusOperatorStateState = "in_progress"
-	PluginInstallStatusOperatorStateStateFailed     PluginInstallStatusOperatorStateState = "failed"
-)

apps/plugins/pkg/apis/plugins/v0alpha1/pluginmeta_client_gen.go

@@ -1,99 +0,0 @@
-package v0alpha1
-
-import (
-	"context"
-
-	"github.com/grafana/grafana-app-sdk/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type PluginMetaClient struct {
-	client *resource.TypedClient[*PluginMeta, *PluginMetaList]
-}
-
-func NewPluginMetaClient(client resource.Client) *PluginMetaClient {
-	return &PluginMetaClient{
-		client: resource.NewTypedClient[*PluginMeta, *PluginMetaList](client, PluginMetaKind()),
-	}
-}
-
-func NewPluginMetaClientFromGenerator(generator resource.ClientGenerator) (*PluginMetaClient, error) {
-	c, err := generator.ClientFor(PluginMetaKind())
-	if err != nil {
-		return nil, err
-	}
-	return NewPluginMetaClient(c), nil
-}
-
-func (c *PluginMetaClient) Get(ctx context.Context, identifier resource.Identifier) (*PluginMeta, error) {
-	return c.client.Get(ctx, identifier)
-}
-
-func (c *PluginMetaClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginMetaList, error) {
-	return c.client.List(ctx, namespace, opts)
-}
-
-func (c *PluginMetaClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginMetaList, error) {
-	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
-		ResourceVersion: opts.ResourceVersion,
-		Limit:           opts.Limit,
-		LabelFilters:    opts.LabelFilters,
-		FieldSelectors:  opts.FieldSelectors,
-	})
-	if err != nil {
-		return nil, err
-	}
-	for resp.GetContinue() != "" {
-		page, err := c.client.List(ctx, namespace, resource.ListOptions{
-			Continue:        resp.GetContinue(),
-			ResourceVersion: opts.ResourceVersion,
-			Limit:           opts.Limit,
-			LabelFilters:    opts.LabelFilters,
-			FieldSelectors:  opts.FieldSelectors,
-		})
-		if err != nil {
-			return nil, err
-		}
-		resp.SetContinue(page.GetContinue())
-		resp.SetResourceVersion(page.GetResourceVersion())
-		resp.SetItems(append(resp.GetItems(), page.GetItems()...))
-	}
-	return resp, nil
-}
-
-func (c *PluginMetaClient) Create(ctx context.Context, obj *PluginMeta, opts resource.CreateOptions) (*PluginMeta, error) {
-	// Make sure apiVersion and kind are set
-	obj.APIVersion = GroupVersion.Identifier()
-	obj.Kind = PluginMetaKind().Kind()
-	return c.client.Create(ctx, obj, opts)
-}
-
-func (c *PluginMetaClient) Update(ctx context.Context, obj *PluginMeta, opts resource.UpdateOptions) (*PluginMeta, error) {
-	return c.client.Update(ctx, obj, opts)
-}
-
-func (c *PluginMetaClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*PluginMeta, error) {
-	return c.client.Patch(ctx, identifier, req, opts)
-}
-
-func (c *PluginMetaClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus PluginMetaStatus, opts resource.UpdateOptions) (*PluginMeta, error) {
-	return c.client.Update(ctx, &PluginMeta{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       PluginMetaKind().Kind(),
-			APIVersion: GroupVersion.Identifier(),
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			ResourceVersion: opts.ResourceVersion,
-			Namespace:       identifier.Namespace,
-			Name:            identifier.Name,
-		},
-		Status: newStatus,
-	}, resource.UpdateOptions{
-		Subresource:     "status",
-		ResourceVersion: opts.ResourceVersion,
-	})
-}
-
-func (c *PluginMetaClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
-	return c.client.Delete(ctx, identifier, opts)
-}

apps/plugins/pkg/apis/plugins/v0alpha1/pluginmeta_schema_gen.go

@@ -1,34 +0,0 @@
-//
-// Code generated by grafana-app-sdk. DO NOT EDIT.
-//
-
-package v0alpha1
-
-import (
-	"github.com/grafana/grafana-app-sdk/resource"
-)
-
-// schema is unexported to prevent accidental overwrites
-var (
-	schemaPluginMeta = resource.NewSimpleSchema("plugins.grafana.app", "v0alpha1", &PluginMeta{}, &PluginMetaList{}, resource.WithKind("PluginMeta"),
-		resource.WithPlural("pluginmetas"), resource.WithScope(resource.NamespacedScope))
-	kindPluginMeta = resource.Kind{
-		Schema: schemaPluginMeta,
-		Codecs: map[resource.KindEncoding]resource.Codec{
-			resource.KindEncodingJSON: &PluginMetaJSONCodec{},
-		},
-	}
-)
-
-// Kind returns a resource.Kind for this Schema with a JSON codec
-func PluginMetaKind() resource.Kind {
-	return kindPluginMeta
-}
-
-// Schema returns a resource.SimpleSchema representation of PluginMeta
-func PluginMetaSchema() *resource.SimpleSchema {
-	return schemaPluginMeta
-}
-
-// Interface compliance checks
-var _ resource.Schema = kindPluginMeta

apps/plugins/pkg/apis/plugins/v0alpha1/pluginmeta_spec_gen.go

@@ -1,477 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-import (
-	time "time"
-)
-
-// JSON configuration schema for Grafana plugins
-// Converted from: https://github.com/grafana/grafana/blob/main/docs/sources/developers/plugins/plugin.schema.json
-// +k8s:openapi-gen=true
-type PluginMetaJSONData struct {
-	// Unique name of the plugin
-	Id string `json:"id"`
-	// Plugin type
-	Type PluginMetaJSONDataType `json:"type"`
-	// Human-readable name of the plugin
-	Name string `json:"name"`
-	// Metadata for the plugin
-	Info PluginMetaInfo `json:"info"`
-	// Dependency information
-	Dependencies PluginMetaDependencies `json:"dependencies"`
-	// Optional fields
-	Alerting           *bool                         `json:"alerting,omitempty"`
-	Annotations        *bool                         `json:"annotations,omitempty"`
-	AutoEnabled        *bool                         `json:"autoEnabled,omitempty"`
-	Backend            *bool                         `json:"backend,omitempty"`
-	BuildMode          *string                       `json:"buildMode,omitempty"`
-	BuiltIn            *bool                         `json:"builtIn,omitempty"`
-	Category           *PluginMetaJSONDataCategory   `json:"category,omitempty"`
-	EnterpriseFeatures *PluginMetaEnterpriseFeatures `json:"enterpriseFeatures,omitempty"`
-	Executable         *string                       `json:"executable,omitempty"`
-	HideFromList       *bool                         `json:"hideFromList,omitempty"`
-	// +listType=atomic
-	Includes                  []PluginMetaInclude     `json:"includes,omitempty"`
-	Logs                      *bool                   `json:"logs,omitempty"`
-	Metrics                   *bool                   `json:"metrics,omitempty"`
-	MultiValueFilterOperators *bool                   `json:"multiValueFilterOperators,omitempty"`
-	PascalName                *string                 `json:"pascalName,omitempty"`
-	Preload                   *bool                   `json:"preload,omitempty"`
-	QueryOptions              *PluginMetaQueryOptions `json:"queryOptions,omitempty"`
-	// +listType=atomic
-	Routes        []PluginMetaRoute        `json:"routes,omitempty"`
-	SkipDataQuery *bool                    `json:"skipDataQuery,omitempty"`
-	State         *PluginMetaJSONDataState `json:"state,omitempty"`
-	Streaming     *bool                    `json:"streaming,omitempty"`
-	Tracing       *bool                    `json:"tracing,omitempty"`
-	Iam           *PluginMetaIAM           `json:"iam,omitempty"`
-	// +listType=atomic
-	Roles      []PluginMetaRole      `json:"roles,omitempty"`
-	Extensions *PluginMetaExtensions `json:"extensions,omitempty"`
-}
-
-// NewPluginMetaJSONData creates a new PluginMetaJSONData object.
-func NewPluginMetaJSONData() *PluginMetaJSONData {
-	return &PluginMetaJSONData{
-		Info:         *NewPluginMetaInfo(),
-		Dependencies: *NewPluginMetaDependencies(),
-	}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaInfo struct {
-	// Required fields
-	// +listType=set
-	Keywords []string                    `json:"keywords"`
-	Logos    PluginMetaV0alpha1InfoLogos `json:"logos"`
-	Updated  time.Time                   `json:"updated"`
-	Version  string                      `json:"version"`
-	// Optional fields
-	Author      *PluginMetaV0alpha1InfoAuthor `json:"author,omitempty"`
-	Description *string                       `json:"description,omitempty"`
-	// +listType=atomic
-	Links []PluginMetaV0alpha1InfoLinks `json:"links,omitempty"`
-	// +listType=atomic
-	Screenshots []PluginMetaV0alpha1InfoScreenshots `json:"screenshots,omitempty"`
-}
-
-// NewPluginMetaInfo creates a new PluginMetaInfo object.
-func NewPluginMetaInfo() *PluginMetaInfo {
-	return &PluginMetaInfo{
-		Keywords: []string{},
-		Logos:    *NewPluginMetaV0alpha1InfoLogos(),
-	}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaDependencies struct {
-	// Required field
-	GrafanaDependency string `json:"grafanaDependency"`
-	// Optional fields
-	GrafanaVersion *string `json:"grafanaVersion,omitempty"`
-	// +listType=set
-	// +listMapKey=id
-	Plugins    []PluginMetaV0alpha1DependenciesPlugins   `json:"plugins,omitempty"`
-	Extensions *PluginMetaV0alpha1DependenciesExtensions `json:"extensions,omitempty"`
-}
-
-// NewPluginMetaDependencies creates a new PluginMetaDependencies object.
-func NewPluginMetaDependencies() *PluginMetaDependencies {
-	return &PluginMetaDependencies{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaEnterpriseFeatures struct {
-	// Allow additional properties
-	HealthDiagnosticsErrors *bool `json:"healthDiagnosticsErrors,omitempty"`
-}
-
-// NewPluginMetaEnterpriseFeatures creates a new PluginMetaEnterpriseFeatures object.
-func NewPluginMetaEnterpriseFeatures() *PluginMetaEnterpriseFeatures {
-	return &PluginMetaEnterpriseFeatures{
-		HealthDiagnosticsErrors: (func(input bool) *bool { return &input })(false),
-	}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaInclude struct {
-	Uid        *string                `json:"uid,omitempty"`
-	Type       *PluginMetaIncludeType `json:"type,omitempty"`
-	Name       *string                `json:"name,omitempty"`
-	Component  *string                `json:"component,omitempty"`
-	Role       *PluginMetaIncludeRole `json:"role,omitempty"`
-	Action     *string                `json:"action,omitempty"`
-	Path       *string                `json:"path,omitempty"`
-	AddToNav   *bool                  `json:"addToNav,omitempty"`
-	DefaultNav *bool                  `json:"defaultNav,omitempty"`
-	Icon       *string                `json:"icon,omitempty"`
-}
-
-// NewPluginMetaInclude creates a new PluginMetaInclude object.
-func NewPluginMetaInclude() *PluginMetaInclude {
-	return &PluginMetaInclude{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaQueryOptions struct {
-	MaxDataPoints *bool `json:"maxDataPoints,omitempty"`
-	MinInterval   *bool `json:"minInterval,omitempty"`
-	CacheTimeout  *bool `json:"cacheTimeout,omitempty"`
-}
-
-// NewPluginMetaQueryOptions creates a new PluginMetaQueryOptions object.
-func NewPluginMetaQueryOptions() *PluginMetaQueryOptions {
-	return &PluginMetaQueryOptions{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaRoute struct {
-	Path        *string `json:"path,omitempty"`
-	Method      *string `json:"method,omitempty"`
-	Url         *string `json:"url,omitempty"`
-	ReqSignedIn *bool   `json:"reqSignedIn,omitempty"`
-	ReqRole     *string `json:"reqRole,omitempty"`
-	ReqAction   *string `json:"reqAction,omitempty"`
-	// +listType=atomic
-	Headers      []string                             `json:"headers,omitempty"`
-	Body         map[string]interface{}               `json:"body,omitempty"`
-	TokenAuth    *PluginMetaV0alpha1RouteTokenAuth    `json:"tokenAuth,omitempty"`
-	JwtTokenAuth *PluginMetaV0alpha1RouteJwtTokenAuth `json:"jwtTokenAuth,omitempty"`
-	// +listType=atomic
-	UrlParams []PluginMetaV0alpha1RouteUrlParams `json:"urlParams,omitempty"`
-}
-
-// NewPluginMetaRoute creates a new PluginMetaRoute object.
-func NewPluginMetaRoute() *PluginMetaRoute {
-	return &PluginMetaRoute{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaIAM struct {
-	// +listType=atomic
-	Permissions []PluginMetaV0alpha1IAMPermissions `json:"permissions,omitempty"`
-}
-
-// NewPluginMetaIAM creates a new PluginMetaIAM object.
-func NewPluginMetaIAM() *PluginMetaIAM {
-	return &PluginMetaIAM{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaRole struct {
-	Role *PluginMetaV0alpha1RoleRole `json:"role,omitempty"`
-	// +listType=set
-	Grants []string `json:"grants,omitempty"`
-}
-
-// NewPluginMetaRole creates a new PluginMetaRole object.
-func NewPluginMetaRole() *PluginMetaRole {
-	return &PluginMetaRole{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaExtensions struct {
-	// +listType=atomic
-	AddedComponents []PluginMetaV0alpha1ExtensionsAddedComponents `json:"addedComponents,omitempty"`
-	// +listType=atomic
-	AddedLinks []PluginMetaV0alpha1ExtensionsAddedLinks `json:"addedLinks,omitempty"`
-	// +listType=set
-	// +listMapKey=id
-	ExposedComponents []PluginMetaV0alpha1ExtensionsExposedComponents `json:"exposedComponents,omitempty"`
-	// +listType=set
-	// +listMapKey=id
-	ExtensionPoints []PluginMetaV0alpha1ExtensionsExtensionPoints `json:"extensionPoints,omitempty"`
-}
-
-// NewPluginMetaExtensions creates a new PluginMetaExtensions object.
-func NewPluginMetaExtensions() *PluginMetaExtensions {
-	return &PluginMetaExtensions{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaSpec struct {
-	PluginJSON PluginMetaJSONData `json:"pluginJSON"`
-}
-
-// NewPluginMetaSpec creates a new PluginMetaSpec object.
-func NewPluginMetaSpec() *PluginMetaSpec {
-	return &PluginMetaSpec{
-		PluginJSON: *NewPluginMetaJSONData(),
-	}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1InfoLogos struct {
-	Small string `json:"small"`
-	Large string `json:"large"`
-}
-
-// NewPluginMetaV0alpha1InfoLogos creates a new PluginMetaV0alpha1InfoLogos object.
-func NewPluginMetaV0alpha1InfoLogos() *PluginMetaV0alpha1InfoLogos {
-	return &PluginMetaV0alpha1InfoLogos{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1InfoAuthor struct {
-	Name  *string `json:"name,omitempty"`
-	Email *string `json:"email,omitempty"`
-	Url   *string `json:"url,omitempty"`
-}
-
-// NewPluginMetaV0alpha1InfoAuthor creates a new PluginMetaV0alpha1InfoAuthor object.
-func NewPluginMetaV0alpha1InfoAuthor() *PluginMetaV0alpha1InfoAuthor {
-	return &PluginMetaV0alpha1InfoAuthor{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1InfoLinks struct {
-	Name *string `json:"name,omitempty"`
-	Url  *string `json:"url,omitempty"`
-}
-
-// NewPluginMetaV0alpha1InfoLinks creates a new PluginMetaV0alpha1InfoLinks object.
-func NewPluginMetaV0alpha1InfoLinks() *PluginMetaV0alpha1InfoLinks {
-	return &PluginMetaV0alpha1InfoLinks{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1InfoScreenshots struct {
-	Name *string `json:"name,omitempty"`
-	Path *string `json:"path,omitempty"`
-}
-
-// NewPluginMetaV0alpha1InfoScreenshots creates a new PluginMetaV0alpha1InfoScreenshots object.
-func NewPluginMetaV0alpha1InfoScreenshots() *PluginMetaV0alpha1InfoScreenshots {
-	return &PluginMetaV0alpha1InfoScreenshots{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1DependenciesPlugins struct {
-	Id   string                                    `json:"id"`
-	Type PluginMetaV0alpha1DependenciesPluginsType `json:"type"`
-	Name string                                    `json:"name"`
-}
-
-// NewPluginMetaV0alpha1DependenciesPlugins creates a new PluginMetaV0alpha1DependenciesPlugins object.
-func NewPluginMetaV0alpha1DependenciesPlugins() *PluginMetaV0alpha1DependenciesPlugins {
-	return &PluginMetaV0alpha1DependenciesPlugins{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1DependenciesExtensions struct {
-	// +listType=set
-	ExposedComponents []string `json:"exposedComponents,omitempty"`
-}
-
-// NewPluginMetaV0alpha1DependenciesExtensions creates a new PluginMetaV0alpha1DependenciesExtensions object.
-func NewPluginMetaV0alpha1DependenciesExtensions() *PluginMetaV0alpha1DependenciesExtensions {
-	return &PluginMetaV0alpha1DependenciesExtensions{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1RouteTokenAuth struct {
-	Url *string `json:"url,omitempty"`
-	// +listType=set
-	Scopes []string               `json:"scopes,omitempty"`
-	Params map[string]interface{} `json:"params,omitempty"`
-}
-
-// NewPluginMetaV0alpha1RouteTokenAuth creates a new PluginMetaV0alpha1RouteTokenAuth object.
-func NewPluginMetaV0alpha1RouteTokenAuth() *PluginMetaV0alpha1RouteTokenAuth {
-	return &PluginMetaV0alpha1RouteTokenAuth{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1RouteJwtTokenAuth struct {
-	Url *string `json:"url,omitempty"`
-	// +listType=set
-	Scopes []string               `json:"scopes,omitempty"`
-	Params map[string]interface{} `json:"params,omitempty"`
-}
-
-// NewPluginMetaV0alpha1RouteJwtTokenAuth creates a new PluginMetaV0alpha1RouteJwtTokenAuth object.
-func NewPluginMetaV0alpha1RouteJwtTokenAuth() *PluginMetaV0alpha1RouteJwtTokenAuth {
-	return &PluginMetaV0alpha1RouteJwtTokenAuth{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1RouteUrlParams struct {
-	Name    *string `json:"name,omitempty"`
-	Content *string `json:"content,omitempty"`
-}
-
-// NewPluginMetaV0alpha1RouteUrlParams creates a new PluginMetaV0alpha1RouteUrlParams object.
-func NewPluginMetaV0alpha1RouteUrlParams() *PluginMetaV0alpha1RouteUrlParams {
-	return &PluginMetaV0alpha1RouteUrlParams{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1IAMPermissions struct {
-	Action *string `json:"action,omitempty"`
-	Scope  *string `json:"scope,omitempty"`
-}
-
-// NewPluginMetaV0alpha1IAMPermissions creates a new PluginMetaV0alpha1IAMPermissions object.
-func NewPluginMetaV0alpha1IAMPermissions() *PluginMetaV0alpha1IAMPermissions {
-	return &PluginMetaV0alpha1IAMPermissions{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1RoleRolePermissions struct {
-	Action *string `json:"action,omitempty"`
-	Scope  *string `json:"scope,omitempty"`
-}
-
-// NewPluginMetaV0alpha1RoleRolePermissions creates a new PluginMetaV0alpha1RoleRolePermissions object.
-func NewPluginMetaV0alpha1RoleRolePermissions() *PluginMetaV0alpha1RoleRolePermissions {
-	return &PluginMetaV0alpha1RoleRolePermissions{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1RoleRole struct {
-	Name        *string `json:"name,omitempty"`
-	Description *string `json:"description,omitempty"`
-	// +listType=atomic
-	Permissions []PluginMetaV0alpha1RoleRolePermissions `json:"permissions,omitempty"`
-}
-
-// NewPluginMetaV0alpha1RoleRole creates a new PluginMetaV0alpha1RoleRole object.
-func NewPluginMetaV0alpha1RoleRole() *PluginMetaV0alpha1RoleRole {
-	return &PluginMetaV0alpha1RoleRole{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1ExtensionsAddedComponents struct {
-	// +listType=set
-	Targets     []string `json:"targets"`
-	Title       string   `json:"title"`
-	Description *string  `json:"description,omitempty"`
-}
-
-// NewPluginMetaV0alpha1ExtensionsAddedComponents creates a new PluginMetaV0alpha1ExtensionsAddedComponents object.
-func NewPluginMetaV0alpha1ExtensionsAddedComponents() *PluginMetaV0alpha1ExtensionsAddedComponents {
-	return &PluginMetaV0alpha1ExtensionsAddedComponents{
-		Targets: []string{},
-	}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1ExtensionsAddedLinks struct {
-	// +listType=set
-	Targets     []string `json:"targets"`
-	Title       string   `json:"title"`
-	Description *string  `json:"description,omitempty"`
-}
-
-// NewPluginMetaV0alpha1ExtensionsAddedLinks creates a new PluginMetaV0alpha1ExtensionsAddedLinks object.
-func NewPluginMetaV0alpha1ExtensionsAddedLinks() *PluginMetaV0alpha1ExtensionsAddedLinks {
-	return &PluginMetaV0alpha1ExtensionsAddedLinks{
-		Targets: []string{},
-	}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1ExtensionsExposedComponents struct {
-	Id          string  `json:"id"`
-	Title       *string `json:"title,omitempty"`
-	Description *string `json:"description,omitempty"`
-}
-
-// NewPluginMetaV0alpha1ExtensionsExposedComponents creates a new PluginMetaV0alpha1ExtensionsExposedComponents object.
-func NewPluginMetaV0alpha1ExtensionsExposedComponents() *PluginMetaV0alpha1ExtensionsExposedComponents {
-	return &PluginMetaV0alpha1ExtensionsExposedComponents{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1ExtensionsExtensionPoints struct {
-	Id          string  `json:"id"`
-	Title       *string `json:"title,omitempty"`
-	Description *string `json:"description,omitempty"`
-}
-
-// NewPluginMetaV0alpha1ExtensionsExtensionPoints creates a new PluginMetaV0alpha1ExtensionsExtensionPoints object.
-func NewPluginMetaV0alpha1ExtensionsExtensionPoints() *PluginMetaV0alpha1ExtensionsExtensionPoints {
-	return &PluginMetaV0alpha1ExtensionsExtensionPoints{}
-}
-
-// +k8s:openapi-gen=true
-type PluginMetaJSONDataType string
-
-const (
-	PluginMetaJSONDataTypeApp        PluginMetaJSONDataType = "app"
-	PluginMetaJSONDataTypeDatasource PluginMetaJSONDataType = "datasource"
-	PluginMetaJSONDataTypePanel      PluginMetaJSONDataType = "panel"
-	PluginMetaJSONDataTypeRenderer   PluginMetaJSONDataType = "renderer"
-)
-
-// +k8s:openapi-gen=true
-type PluginMetaJSONDataCategory string
-
-const (
-	PluginMetaJSONDataCategoryTsdb       PluginMetaJSONDataCategory = "tsdb"
-	PluginMetaJSONDataCategoryLogging    PluginMetaJSONDataCategory = "logging"
-	PluginMetaJSONDataCategoryCloud      PluginMetaJSONDataCategory = "cloud"
-	PluginMetaJSONDataCategoryTracing    PluginMetaJSONDataCategory = "tracing"
-	PluginMetaJSONDataCategoryProfiling  PluginMetaJSONDataCategory = "profiling"
-	PluginMetaJSONDataCategorySql        PluginMetaJSONDataCategory = "sql"
-	PluginMetaJSONDataCategoryEnterprise PluginMetaJSONDataCategory = "enterprise"
-	PluginMetaJSONDataCategoryIot        PluginMetaJSONDataCategory = "iot"
-	PluginMetaJSONDataCategoryOther      PluginMetaJSONDataCategory = "other"
-)
-
-// +k8s:openapi-gen=true
-type PluginMetaJSONDataState string
-
-const (
-	PluginMetaJSONDataStateAlpha PluginMetaJSONDataState = "alpha"
-	PluginMetaJSONDataStateBeta  PluginMetaJSONDataState = "beta"
-)
-
-// +k8s:openapi-gen=true
-type PluginMetaIncludeType string
-
-const (
-	PluginMetaIncludeTypeDashboard  PluginMetaIncludeType = "dashboard"
-	PluginMetaIncludeTypePage       PluginMetaIncludeType = "page"
-	PluginMetaIncludeTypePanel      PluginMetaIncludeType = "panel"
-	PluginMetaIncludeTypeDatasource PluginMetaIncludeType = "datasource"
-)
-
-// +k8s:openapi-gen=true
-type PluginMetaIncludeRole string
-
-const (
-	PluginMetaIncludeRoleAdmin  PluginMetaIncludeRole = "Admin"
-	PluginMetaIncludeRoleEditor PluginMetaIncludeRole = "Editor"
-	PluginMetaIncludeRoleViewer PluginMetaIncludeRole = "Viewer"
-)
-
-// +k8s:openapi-gen=true
-type PluginMetaV0alpha1DependenciesPluginsType string
-
-const (
-	PluginMetaV0alpha1DependenciesPluginsTypeApp        PluginMetaV0alpha1DependenciesPluginsType = "app"
-	PluginMetaV0alpha1DependenciesPluginsTypeDatasource PluginMetaV0alpha1DependenciesPluginsType = "datasource"
-	PluginMetaV0alpha1DependenciesPluginsTypePanel      PluginMetaV0alpha1DependenciesPluginsType = "panel"
-)

apps/plugins/pkg/app/app.go

@@ -2,8 +2,11 @@ package app
 
 import (
 	"context"
+	"net/http"
 
 	"github.com/grafana/grafana-app-sdk/app"
+	"github.com/grafana/grafana-app-sdk/k8s"
+	"github.com/grafana/grafana-app-sdk/logging"
 	"github.com/grafana/grafana-app-sdk/operator"
 	"github.com/grafana/grafana-app-sdk/resource"
 	"github.com/grafana/grafana-app-sdk/simple"
@@ -11,16 +14,15 @@ import (
 	"k8s.io/klog/v2"
 
 	pluginsapi "github.com/grafana/grafana/apps/plugins/pkg/apis"
+	pluginsv0alpha1 "github.com/grafana/grafana/apps/plugins/pkg/apis/plugins/v0alpha1"
 )
 
 func New(cfg app.Config) (app.App, error) {
-	managedKinds := []simple.AppManagedKind{}
-	for _, kinds := range GetKinds() {
-		for _, k := range kinds {
-			managedKinds = append(managedKinds, simple.AppManagedKind{
-				Kind: k,
-			})
-		}
+	cfg.KubeConfig.APIPath = "apis"
+	clientGenerator := k8s.NewClientRegistry(cfg.KubeConfig, k8s.DefaultClientConfig())
+	client, err := pluginsv0alpha1.NewPluginClientFromGenerator(clientGenerator)
+	if err != nil {
+		return nil, err
 	}
 
 	simpleConfig := simple.AppConfig{
@@ -33,7 +35,32 @@ func New(cfg app.Config) (app.App, error) {
 				},
 			},
 		},
-		ManagedKinds: managedKinds,
+		ManagedKinds: []simple.AppManagedKind{
+			{
+				Kind: pluginsv0alpha1.PluginKind(),
+				CustomRoutes: simple.AppCustomRouteHandlers{
+					simple.AppCustomRoute{
+						Method: http.MethodGet,
+						Path:   "meta",
+					}: func(ctx context.Context, w app.CustomRouteResponseWriter, req *app.CustomRouteRequest) error {
+						plugin, err := client.Get(ctx, resource.Identifier{
+							Namespace: req.ResourceIdentifier.Namespace,
+							Name:      req.ResourceIdentifier.Name,
+						})
+						if err != nil {
+							return err
+						}
+						logging.DefaultLogger.Debug("fetched plugin", "plugin", plugin)
+						// TODO: Implement this in future PR
+						w.WriteHeader(http.StatusNotImplemented)
+						if _, err := w.Write([]byte("Not implemented")); err != nil {
+							return err
+						}
+						return nil
+					},
+				},
+			},
+		},
 	}
 
 	a, err := simple.NewApp(simpleConfig)

apps/plugins/pkg/app/install/registrar.go

@@ -41,12 +41,12 @@ type PluginInstall struct {
 	Source  Source
 }
 
-func (p *PluginInstall) ToPluginInstallV0Alpha1(namespace string) *pluginsv0alpha1.PluginInstall {
+func (p *PluginInstall) ToPluginInstallV0Alpha1(namespace string) *pluginsv0alpha1.Plugin {
 	var url *string = nil
 	if p.URL != "" {
 		url = &p.URL
 	}
-	return &pluginsv0alpha1.PluginInstall{
+	return &pluginsv0alpha1.Plugin{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: namespace,
 			Name:      p.ID,
@@ -54,16 +54,16 @@ func (p *PluginInstall) ToPluginInstallV0Alpha1(namespace string) *pluginsv0alph
 				PluginInstallSourceAnnotation: p.Source,
 			},
 		},
-		Spec: pluginsv0alpha1.PluginInstallSpec{
+		Spec: pluginsv0alpha1.PluginSpec{
 			Id:      p.ID,
 			Version: p.Version,
 			Url:     url,
-			Class:   pluginsv0alpha1.PluginInstallSpecClass(p.Class),
+			Class:   pluginsv0alpha1.PluginSpecClass(p.Class),
 		},
 	}
 }
 
-func (p *PluginInstall) ShouldUpdate(existing *pluginsv0alpha1.PluginInstall) bool {
+func (p *PluginInstall) ShouldUpdate(existing *pluginsv0alpha1.Plugin) bool {
 	update := p.ToPluginInstallV0Alpha1(existing.Namespace)
 	if source, ok := existing.Annotations[PluginInstallSourceAnnotation]; ok && source != p.Source {
 		return true
@@ -92,7 +92,7 @@ func equalStringPointers(a, b *string) bool {
 
 type InstallRegistrar struct {
 	clientGenerator resource.ClientGenerator
-	client          *pluginsv0alpha1.PluginInstallClient
+	client          *pluginsv0alpha1.PluginClient
 	clientOnce      sync.Once
 }
 
@@ -103,9 +103,9 @@ func NewInstallRegistrar(clientGenerator resource.ClientGenerator) *InstallRegis
 	}
 }
 
-func (r *InstallRegistrar) GetClient() (*pluginsv0alpha1.PluginInstallClient, error) {
+func (r *InstallRegistrar) GetClient() (*pluginsv0alpha1.PluginClient, error) {
 	r.clientOnce.Do(func() {
-		client, err := pluginsv0alpha1.NewPluginInstallClientFromGenerator(r.clientGenerator)
+		client, err := pluginsv0alpha1.NewPluginClientFromGenerator(r.clientGenerator)
 		if err != nil {
 			r.client = nil
 			return

apps/plugins/pkg/app/storage.go

@@ -1,75 +0,0 @@
-package app
-
-import (
-	"context"
-	"strings"
-
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/apis/meta/internalversion"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apiserver/pkg/registry/rest"
-
-	claims "github.com/grafana/authlib/types"
-	pluginsv0alpha1 "github.com/grafana/grafana/apps/plugins/pkg/apis/plugins/v0alpha1"
-)
-
-var (
-	_ rest.Scoper               = (*PluginMetaStorage)(nil)
-	_ rest.SingularNameProvider = (*PluginMetaStorage)(nil)
-	_ rest.Getter               = (*PluginMetaStorage)(nil)
-	_ rest.Lister               = (*PluginMetaStorage)(nil)
-	_ rest.Storage              = (*PluginMetaStorage)(nil)
-	_ rest.TableConvertor       = (*PluginMetaStorage)(nil)
-)
-
-type PluginMetaStorage struct {
-	gr             schema.GroupResource
-	namespacer     claims.NamespaceFormatter
-	tableConverter rest.TableConvertor
-}
-
-func NewPluginMetaStorage(
-	namespacer claims.NamespaceFormatter,
-) *PluginMetaStorage {
-	gr := schema.GroupResource{
-		Group:    pluginsv0alpha1.PluginMetaKind().Group(),
-		Resource: strings.ToLower(pluginsv0alpha1.PluginMetaKind().Plural()),
-	}
-	return &PluginMetaStorage{
-		gr:             gr,
-		namespacer:     namespacer,
-		tableConverter: rest.NewDefaultTableConvertor(gr),
-	}
-}
-
-func (s *PluginMetaStorage) New() runtime.Object {
-	return pluginsv0alpha1.PluginMetaKind().ZeroValue()
-}
-
-func (s *PluginMetaStorage) Destroy() {}
-
-func (s *PluginMetaStorage) NamespaceScoped() bool {
-	return true
-}
-
-func (s *PluginMetaStorage) GetSingularName() string {
-	return strings.ToLower(pluginsv0alpha1.PluginMetaKind().Kind())
-}
-
-func (s *PluginMetaStorage) NewList() runtime.Object {
-	return pluginsv0alpha1.PluginMetaKind().ZeroListValue()
-}
-
-func (s *PluginMetaStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
-	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
-}
-
-func (s *PluginMetaStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
-	return s.NewList(), nil
-}
-
-func (s *PluginMetaStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
-	return nil, apierrors.NewNotFound(s.gr, name)
-}