Plugins App: PluginMeta -> Meta (#115034)

apps/plugins/pkg/app/app.go

@@ -43,7 +43,7 @@ func New(cfg app.Config) (app.App, error) {
 				Kind: pluginsv0alpha1.PluginKind(),
 			},
 			{
-				Kind: pluginsv0alpha1.PluginMetaKind(),
+				Kind: pluginsv0alpha1.MetaKind(),
 			},
 		},
 	}
@@ -137,9 +137,9 @@ func (p *PluginAppInstaller) InstallAPIs(
 		return client, nil
 	}
 
-	pluginMetaGVR := pluginsv0alpha1.PluginMetaKind().GroupVersionResource()
+	pluginMetaGVR := pluginsv0alpha1.MetaKind().GroupVersionResource()
 	replacedStorage := map[schema.GroupVersionResource]rest.Storage{
-		pluginMetaGVR: NewPluginMetaStorage(p.metaManager, clientFactory),
+		pluginMetaGVR: NewMetaStorage(p.metaManager, clientFactory),
 	}
 	wrappedServer := &customStorageWrapper{
 		wrapped: server,

apps/plugins/pkg/app/meta/cloud.go

@@ -96,24 +96,24 @@ func (p *CloudProvider) GetMeta(ctx context.Context, pluginID, version string) (
 // grafanaComPluginVersionMeta represents the response from grafana.com API
 // GET /api/plugins/{pluginId}/versions/{version}
 type grafanaComPluginVersionMeta struct {
-	PluginID        string                             `json:"pluginSlug"`
-	Version         string                             `json:"version"`
-	URL             string                             `json:"url"`
-	Commit          string                             `json:"commit"`
-	Description     string                             `json:"description"`
-	Keywords        []string                           `json:"keywords"`
-	CreatedAt       time.Time                          `json:"createdAt"`
-	UpdatedAt       time.Time                          `json:"updatedAt"`
-	JSON            pluginsv0alpha1.PluginMetaJSONData `json:"json"`
-	Readme          string                             `json:"readme"`
-	Downloads       int                                `json:"downloads"`
-	Verified        bool                               `json:"verified"`
-	Status          string                             `json:"status"`
-	StatusContext   string                             `json:"statusContext"`
-	DownloadSlug    string                             `json:"downloadSlug"`
-	SignatureType   string                             `json:"signatureType"`
-	SignedByOrg     string                             `json:"signedByOrg"`
-	SignedByOrgName string                             `json:"signedByOrgName"`
+	PluginID        string                       `json:"pluginSlug"`
+	Version         string                       `json:"version"`
+	URL             string                       `json:"url"`
+	Commit          string                       `json:"commit"`
+	Description     string                       `json:"description"`
+	Keywords        []string                     `json:"keywords"`
+	CreatedAt       time.Time                    `json:"createdAt"`
+	UpdatedAt       time.Time                    `json:"updatedAt"`
+	JSON            pluginsv0alpha1.MetaJSONData `json:"json"`
+	Readme          string                       `json:"readme"`
+	Downloads       int                          `json:"downloads"`
+	Verified        bool                         `json:"verified"`
+	Status          string                       `json:"status"`
+	StatusContext   string                       `json:"statusContext"`
+	DownloadSlug    string                       `json:"downloadSlug"`
+	SignatureType   string                       `json:"signatureType"`
+	SignedByOrg     string                       `json:"signedByOrg"`
+	SignedByOrgName string                       `json:"signedByOrgName"`
 	Packages        struct {
 		Any struct {
 			Md5         string `json:"md5"`

apps/plugins/pkg/app/meta/cloud_test.go

@@ -19,10 +19,10 @@ func TestCloudProvider_GetMeta(t *testing.T) {
 	ctx := context.Background()
 
 	t.Run("successfully fetches plugin metadata", func(t *testing.T) {
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -108,10 +108,10 @@ func TestCloudProvider_GetMeta(t *testing.T) {
 
 	t.Run("uses custom TTL when provided", func(t *testing.T) {
 		customTTL := 2 * time.Hour
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

apps/plugins/pkg/app/meta/core.go

@@ -23,7 +23,7 @@ const (
 // CoreProvider retrieves plugin metadata for core plugins.
 type CoreProvider struct {
 	mu            sync.RWMutex
-	loadedPlugins map[string]pluginsv0alpha1.PluginMetaJSONData
+	loadedPlugins map[string]pluginsv0alpha1.MetaJSONData
 	initialized   bool
 	ttl           time.Duration
 }
@@ -36,7 +36,7 @@ func NewCoreProvider() *CoreProvider {
 // NewCoreProviderWithTTL creates a new CoreProvider with a custom TTL.
 func NewCoreProviderWithTTL(ttl time.Duration) *CoreProvider {
 	return &CoreProvider{
-		loadedPlugins: make(map[string]pluginsv0alpha1.PluginMetaJSONData),
+		loadedPlugins: make(map[string]pluginsv0alpha1.MetaJSONData),
 		ttl:           ttl,
 	}
 }
@@ -119,17 +119,17 @@ func (p *CoreProvider) loadPlugins(ctx context.Context) error {
 	}
 
 	for _, bundle := range ps {
-		meta := jsonDataToPluginMetaJSONData(bundle.Primary.JSONData)
+		meta := jsonDataToMetaJSONData(bundle.Primary.JSONData)
 		p.loadedPlugins[bundle.Primary.JSONData.ID] = meta
 	}
 
 	return nil
 }
 
-// jsonDataToPluginMetaJSONData converts a plugins.JSONData to a pluginsv0alpha1.PluginMetaJSONData.
+// jsonDataToMetaJSONData converts a plugins.JSONData to a pluginsv0alpha1.MetaJSONData.
 // nolint:gocyclo
-func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.PluginMetaJSONData {
-	meta := pluginsv0alpha1.PluginMetaJSONData{
+func jsonDataToMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.MetaJSONData {
+	meta := pluginsv0alpha1.MetaJSONData{
 		Id:   jsonData.ID,
 		Name: jsonData.Name,
 	}
@@ -137,19 +137,19 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 	// Map plugin type
 	switch jsonData.Type {
 	case plugins.TypeApp:
-		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypeApp
+		meta.Type = pluginsv0alpha1.MetaJSONDataTypeApp
 	case plugins.TypeDataSource:
-		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypeDatasource
+		meta.Type = pluginsv0alpha1.MetaJSONDataTypeDatasource
 	case plugins.TypePanel:
-		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypePanel
+		meta.Type = pluginsv0alpha1.MetaJSONDataTypePanel
 	case plugins.TypeRenderer:
-		meta.Type = pluginsv0alpha1.PluginMetaJSONDataTypeRenderer
+		meta.Type = pluginsv0alpha1.MetaJSONDataTypeRenderer
 	}
 
 	// Map Info
-	meta.Info = pluginsv0alpha1.PluginMetaInfo{
+	meta.Info = pluginsv0alpha1.MetaInfo{
 		Keywords: jsonData.Info.Keywords,
-		Logos: pluginsv0alpha1.PluginMetaV0alpha1InfoLogos{
+		Logos: pluginsv0alpha1.MetaV0alpha1InfoLogos{
 			Small: jsonData.Info.Logos.Small,
 			Large: jsonData.Info.Logos.Large,
 		},
@@ -162,7 +162,7 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 	}
 
 	if jsonData.Info.Author.Name != "" || jsonData.Info.Author.URL != "" {
-		author := &pluginsv0alpha1.PluginMetaV0alpha1InfoAuthor{}
+		author := &pluginsv0alpha1.MetaV0alpha1InfoAuthor{}
 		if jsonData.Info.Author.Name != "" {
 			author.Name = &jsonData.Info.Author.Name
 		}
@@ -173,9 +173,9 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 	}
 
 	if len(jsonData.Info.Links) > 0 {
-		meta.Info.Links = make([]pluginsv0alpha1.PluginMetaV0alpha1InfoLinks, 0, len(jsonData.Info.Links))
+		meta.Info.Links = make([]pluginsv0alpha1.MetaV0alpha1InfoLinks, 0, len(jsonData.Info.Links))
 		for _, link := range jsonData.Info.Links {
-			v0Link := pluginsv0alpha1.PluginMetaV0alpha1InfoLinks{}
+			v0Link := pluginsv0alpha1.MetaV0alpha1InfoLinks{}
 			if link.Name != "" {
 				v0Link.Name = &link.Name
 			}
@@ -187,9 +187,9 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 	}
 
 	if len(jsonData.Info.Screenshots) > 0 {
-		meta.Info.Screenshots = make([]pluginsv0alpha1.PluginMetaV0alpha1InfoScreenshots, 0, len(jsonData.Info.Screenshots))
+		meta.Info.Screenshots = make([]pluginsv0alpha1.MetaV0alpha1InfoScreenshots, 0, len(jsonData.Info.Screenshots))
 		for _, screenshot := range jsonData.Info.Screenshots {
-			v0Screenshot := pluginsv0alpha1.PluginMetaV0alpha1InfoScreenshots{}
+			v0Screenshot := pluginsv0alpha1.MetaV0alpha1InfoScreenshots{}
 			if screenshot.Name != "" {
 				v0Screenshot.Name = &screenshot.Name
 			}
@@ -201,7 +201,7 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 	}
 
 	// Map Dependencies
-	meta.Dependencies = pluginsv0alpha1.PluginMetaDependencies{
+	meta.Dependencies = pluginsv0alpha1.MetaDependencies{
 		GrafanaDependency: jsonData.Dependencies.GrafanaDependency,
 	}
 
@@ -210,18 +210,18 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 	}
 
 	if len(jsonData.Dependencies.Plugins) > 0 {
-		meta.Dependencies.Plugins = make([]pluginsv0alpha1.PluginMetaV0alpha1DependenciesPlugins, 0, len(jsonData.Dependencies.Plugins))
+		meta.Dependencies.Plugins = make([]pluginsv0alpha1.MetaV0alpha1DependenciesPlugins, 0, len(jsonData.Dependencies.Plugins))
 		for _, dep := range jsonData.Dependencies.Plugins {
-			var depType pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsType
+			var depType pluginsv0alpha1.MetaV0alpha1DependenciesPluginsType
 			switch dep.Type {
 			case "app":
-				depType = pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsTypeApp
+				depType = pluginsv0alpha1.MetaV0alpha1DependenciesPluginsTypeApp
 			case "datasource":
-				depType = pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsTypeDatasource
+				depType = pluginsv0alpha1.MetaV0alpha1DependenciesPluginsTypeDatasource
 			case "panel":
-				depType = pluginsv0alpha1.PluginMetaV0alpha1DependenciesPluginsTypePanel
+				depType = pluginsv0alpha1.MetaV0alpha1DependenciesPluginsTypePanel
 			}
-			meta.Dependencies.Plugins = append(meta.Dependencies.Plugins, pluginsv0alpha1.PluginMetaV0alpha1DependenciesPlugins{
+			meta.Dependencies.Plugins = append(meta.Dependencies.Plugins, pluginsv0alpha1.MetaV0alpha1DependenciesPlugins{
 				Id:   dep.ID,
 				Type: depType,
 				Name: dep.Name,
@@ -230,7 +230,7 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 	}
 
 	if len(jsonData.Dependencies.Extensions.ExposedComponents) > 0 {
-		meta.Dependencies.Extensions = &pluginsv0alpha1.PluginMetaV0alpha1DependenciesExtensions{
+		meta.Dependencies.Extensions = &pluginsv0alpha1.MetaV0alpha1DependenciesExtensions{
 			ExposedComponents: jsonData.Dependencies.Extensions.ExposedComponents,
 		}
 	}
@@ -278,40 +278,40 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 
 	// Map category
 	if jsonData.Category != "" {
-		var category pluginsv0alpha1.PluginMetaJSONDataCategory
+		var category pluginsv0alpha1.MetaJSONDataCategory
 		switch jsonData.Category {
 		case "tsdb":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryTsdb
+			category = pluginsv0alpha1.MetaJSONDataCategoryTsdb
 		case "logging":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryLogging
+			category = pluginsv0alpha1.MetaJSONDataCategoryLogging
 		case "cloud":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryCloud
+			category = pluginsv0alpha1.MetaJSONDataCategoryCloud
 		case "tracing":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryTracing
+			category = pluginsv0alpha1.MetaJSONDataCategoryTracing
 		case "profiling":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryProfiling
+			category = pluginsv0alpha1.MetaJSONDataCategoryProfiling
 		case "sql":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategorySql
+			category = pluginsv0alpha1.MetaJSONDataCategorySql
 		case "enterprise":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryEnterprise
+			category = pluginsv0alpha1.MetaJSONDataCategoryEnterprise
 		case "iot":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryIot
+			category = pluginsv0alpha1.MetaJSONDataCategoryIot
 		case "other":
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryOther
+			category = pluginsv0alpha1.MetaJSONDataCategoryOther
 		default:
-			category = pluginsv0alpha1.PluginMetaJSONDataCategoryOther
+			category = pluginsv0alpha1.MetaJSONDataCategoryOther
 		}
 		meta.Category = &category
 	}
 
 	// Map state
 	if jsonData.State != "" {
-		var state pluginsv0alpha1.PluginMetaJSONDataState
+		var state pluginsv0alpha1.MetaJSONDataState
 		switch jsonData.State {
 		case plugins.ReleaseStateAlpha:
-			state = pluginsv0alpha1.PluginMetaJSONDataStateAlpha
+			state = pluginsv0alpha1.MetaJSONDataStateAlpha
 		case plugins.ReleaseStateBeta:
-			state = pluginsv0alpha1.PluginMetaJSONDataStateBeta
+			state = pluginsv0alpha1.MetaJSONDataStateBeta
 		default:
 		}
 		if state != "" {
@@ -326,7 +326,7 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 
 	// Map QueryOptions
 	if len(jsonData.QueryOptions) > 0 {
-		queryOptions := &pluginsv0alpha1.PluginMetaQueryOptions{}
+		queryOptions := &pluginsv0alpha1.MetaQueryOptions{}
 		if val, ok := jsonData.QueryOptions["maxDataPoints"]; ok {
 			queryOptions.MaxDataPoints = &val
 		}
@@ -341,23 +341,23 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 
 	// Map Includes
 	if len(jsonData.Includes) > 0 {
-		meta.Includes = make([]pluginsv0alpha1.PluginMetaInclude, 0, len(jsonData.Includes))
+		meta.Includes = make([]pluginsv0alpha1.MetaInclude, 0, len(jsonData.Includes))
 		for _, include := range jsonData.Includes {
-			v0Include := pluginsv0alpha1.PluginMetaInclude{}
+			v0Include := pluginsv0alpha1.MetaInclude{}
 			if include.UID != "" {
 				v0Include.Uid = &include.UID
 			}
 			if include.Type != "" {
-				var includeType pluginsv0alpha1.PluginMetaIncludeType
+				var includeType pluginsv0alpha1.MetaIncludeType
 				switch include.Type {
 				case "dashboard":
-					includeType = pluginsv0alpha1.PluginMetaIncludeTypeDashboard
+					includeType = pluginsv0alpha1.MetaIncludeTypeDashboard
 				case "page":
-					includeType = pluginsv0alpha1.PluginMetaIncludeTypePage
+					includeType = pluginsv0alpha1.MetaIncludeTypePage
 				case "panel":
-					includeType = pluginsv0alpha1.PluginMetaIncludeTypePanel
+					includeType = pluginsv0alpha1.MetaIncludeTypePanel
 				case "datasource":
-					includeType = pluginsv0alpha1.PluginMetaIncludeTypeDatasource
+					includeType = pluginsv0alpha1.MetaIncludeTypeDatasource
 				}
 				v0Include.Type = &includeType
 			}
@@ -368,14 +368,14 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 				v0Include.Component = &include.Component
 			}
 			if include.Role != "" {
-				var role pluginsv0alpha1.PluginMetaIncludeRole
+				var role pluginsv0alpha1.MetaIncludeRole
 				switch include.Role {
 				case "Admin":
-					role = pluginsv0alpha1.PluginMetaIncludeRoleAdmin
+					role = pluginsv0alpha1.MetaIncludeRoleAdmin
 				case "Editor":
-					role = pluginsv0alpha1.PluginMetaIncludeRoleEditor
+					role = pluginsv0alpha1.MetaIncludeRoleEditor
 				case "Viewer":
-					role = pluginsv0alpha1.PluginMetaIncludeRoleViewer
+					role = pluginsv0alpha1.MetaIncludeRoleViewer
 				}
 				v0Include.Role = &role
 			}
@@ -400,9 +400,9 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 
 	// Map Routes
 	if len(jsonData.Routes) > 0 {
-		meta.Routes = make([]pluginsv0alpha1.PluginMetaRoute, 0, len(jsonData.Routes))
+		meta.Routes = make([]pluginsv0alpha1.MetaRoute, 0, len(jsonData.Routes))
 		for _, route := range jsonData.Routes {
-			v0Route := pluginsv0alpha1.PluginMetaRoute{}
+			v0Route := pluginsv0alpha1.MetaRoute{}
 			if route.Path != "" {
 				v0Route.Path = &route.Path
 			}
@@ -427,9 +427,9 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 				v0Route.Headers = headers
 			}
 			if len(route.URLParams) > 0 {
-				v0Route.UrlParams = make([]pluginsv0alpha1.PluginMetaV0alpha1RouteUrlParams, 0, len(route.URLParams))
+				v0Route.UrlParams = make([]pluginsv0alpha1.MetaV0alpha1RouteUrlParams, 0, len(route.URLParams))
 				for _, param := range route.URLParams {
-					v0Param := pluginsv0alpha1.PluginMetaV0alpha1RouteUrlParams{}
+					v0Param := pluginsv0alpha1.MetaV0alpha1RouteUrlParams{}
 					if param.Name != "" {
 						v0Param.Name = &param.Name
 					}
@@ -440,7 +440,7 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 				}
 			}
 			if route.TokenAuth != nil {
-				v0Route.TokenAuth = &pluginsv0alpha1.PluginMetaV0alpha1RouteTokenAuth{}
+				v0Route.TokenAuth = &pluginsv0alpha1.MetaV0alpha1RouteTokenAuth{}
 				if route.TokenAuth.Url != "" {
 					v0Route.TokenAuth.Url = &route.TokenAuth.Url
 				}
@@ -455,7 +455,7 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 				}
 			}
 			if route.JwtTokenAuth != nil {
-				v0Route.JwtTokenAuth = &pluginsv0alpha1.PluginMetaV0alpha1RouteJwtTokenAuth{}
+				v0Route.JwtTokenAuth = &pluginsv0alpha1.MetaV0alpha1RouteJwtTokenAuth{}
 				if route.JwtTokenAuth.Url != "" {
 					v0Route.JwtTokenAuth.Url = &route.JwtTokenAuth.Url
 				}
@@ -482,12 +482,12 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 	// Map Extensions
 	if len(jsonData.Extensions.AddedLinks) > 0 || len(jsonData.Extensions.AddedComponents) > 0 ||
 		len(jsonData.Extensions.ExposedComponents) > 0 || len(jsonData.Extensions.ExtensionPoints) > 0 {
-		extensions := &pluginsv0alpha1.PluginMetaExtensions{}
+		extensions := &pluginsv0alpha1.MetaExtensions{}
 
 		if len(jsonData.Extensions.AddedLinks) > 0 {
-			extensions.AddedLinks = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedLinks, 0, len(jsonData.Extensions.AddedLinks))
+			extensions.AddedLinks = make([]pluginsv0alpha1.MetaV0alpha1ExtensionsAddedLinks, 0, len(jsonData.Extensions.AddedLinks))
 			for _, link := range jsonData.Extensions.AddedLinks {
-				v0Link := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedLinks{
+				v0Link := pluginsv0alpha1.MetaV0alpha1ExtensionsAddedLinks{
 					Targets: link.Targets,
 					Title:   link.Title,
 				}
@@ -499,9 +499,9 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 		}
 
 		if len(jsonData.Extensions.AddedComponents) > 0 {
-			extensions.AddedComponents = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedComponents, 0, len(jsonData.Extensions.AddedComponents))
+			extensions.AddedComponents = make([]pluginsv0alpha1.MetaV0alpha1ExtensionsAddedComponents, 0, len(jsonData.Extensions.AddedComponents))
 			for _, comp := range jsonData.Extensions.AddedComponents {
-				v0Comp := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsAddedComponents{
+				v0Comp := pluginsv0alpha1.MetaV0alpha1ExtensionsAddedComponents{
 					Targets: comp.Targets,
 					Title:   comp.Title,
 				}
@@ -513,9 +513,9 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 		}
 
 		if len(jsonData.Extensions.ExposedComponents) > 0 {
-			extensions.ExposedComponents = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExposedComponents, 0, len(jsonData.Extensions.ExposedComponents))
+			extensions.ExposedComponents = make([]pluginsv0alpha1.MetaV0alpha1ExtensionsExposedComponents, 0, len(jsonData.Extensions.ExposedComponents))
 			for _, comp := range jsonData.Extensions.ExposedComponents {
-				v0Comp := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExposedComponents{
+				v0Comp := pluginsv0alpha1.MetaV0alpha1ExtensionsExposedComponents{
 					Id: comp.Id,
 				}
 				if comp.Title != "" {
@@ -529,9 +529,9 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 		}
 
 		if len(jsonData.Extensions.ExtensionPoints) > 0 {
-			extensions.ExtensionPoints = make([]pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExtensionPoints, 0, len(jsonData.Extensions.ExtensionPoints))
+			extensions.ExtensionPoints = make([]pluginsv0alpha1.MetaV0alpha1ExtensionsExtensionPoints, 0, len(jsonData.Extensions.ExtensionPoints))
 			for _, point := range jsonData.Extensions.ExtensionPoints {
-				v0Point := pluginsv0alpha1.PluginMetaV0alpha1ExtensionsExtensionPoints{
+				v0Point := pluginsv0alpha1.MetaV0alpha1ExtensionsExtensionPoints{
 					Id: point.Id,
 				}
 				if point.Title != "" {
@@ -549,13 +549,13 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 
 	// Map Roles
 	if len(jsonData.Roles) > 0 {
-		meta.Roles = make([]pluginsv0alpha1.PluginMetaRole, 0, len(jsonData.Roles))
+		meta.Roles = make([]pluginsv0alpha1.MetaRole, 0, len(jsonData.Roles))
 		for _, role := range jsonData.Roles {
-			v0Role := pluginsv0alpha1.PluginMetaRole{
+			v0Role := pluginsv0alpha1.MetaRole{
 				Grants: role.Grants,
 			}
 			if role.Role.Name != "" || role.Role.Description != "" || len(role.Role.Permissions) > 0 {
-				v0RoleRole := &pluginsv0alpha1.PluginMetaV0alpha1RoleRole{}
+				v0RoleRole := &pluginsv0alpha1.MetaV0alpha1RoleRole{}
 				if role.Role.Name != "" {
 					v0RoleRole.Name = &role.Role.Name
 				}
@@ -563,9 +563,9 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 					v0RoleRole.Description = &role.Role.Description
 				}
 				if len(role.Role.Permissions) > 0 {
-					v0RoleRole.Permissions = make([]pluginsv0alpha1.PluginMetaV0alpha1RoleRolePermissions, 0, len(role.Role.Permissions))
+					v0RoleRole.Permissions = make([]pluginsv0alpha1.MetaV0alpha1RoleRolePermissions, 0, len(role.Role.Permissions))
 					for _, perm := range role.Role.Permissions {
-						v0Perm := pluginsv0alpha1.PluginMetaV0alpha1RoleRolePermissions{}
+						v0Perm := pluginsv0alpha1.MetaV0alpha1RoleRolePermissions{}
 						if perm.Action != "" {
 							v0Perm.Action = &perm.Action
 						}
@@ -583,11 +583,11 @@ func jsonDataToPluginMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.Plu
 
 	// Map IAM
 	if jsonData.IAM != nil && len(jsonData.IAM.Permissions) > 0 {
-		iam := &pluginsv0alpha1.PluginMetaIAM{
-			Permissions: make([]pluginsv0alpha1.PluginMetaV0alpha1IAMPermissions, 0, len(jsonData.IAM.Permissions)),
+		iam := &pluginsv0alpha1.MetaIAM{
+			Permissions: make([]pluginsv0alpha1.MetaV0alpha1IAMPermissions, 0, len(jsonData.IAM.Permissions)),
 		}
 		for _, perm := range jsonData.IAM.Permissions {
-			v0Perm := pluginsv0alpha1.PluginMetaV0alpha1IAMPermissions{}
+			v0Perm := pluginsv0alpha1.MetaV0alpha1IAMPermissions{}
 			if perm.Action != "" {
 				v0Perm.Action = &perm.Action
 			}

apps/plugins/pkg/app/meta/core_test.go

@@ -22,10 +22,10 @@ func TestCoreProvider_GetMeta(t *testing.T) {
 	t.Run("returns cached plugin when available", func(t *testing.T) {
 		provider := NewCoreProvider()
 
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 
 		provider.mu.Lock()
@@ -58,10 +58,10 @@ func TestCoreProvider_GetMeta(t *testing.T) {
 	t.Run("ignores version parameter", func(t *testing.T) {
 		provider := NewCoreProvider()
 
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 
 		provider.mu.Lock()
@@ -81,10 +81,10 @@ func TestCoreProvider_GetMeta(t *testing.T) {
 		customTTL := 2 * time.Hour
 		provider := NewCoreProviderWithTTL(customTTL)
 
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 
 		provider.mu.Lock()
@@ -271,11 +271,11 @@ func TestJsonDataToMeta(t *testing.T) {
 			},
 		}
 
-		meta := jsonDataToPluginMetaJSONData(jsonData)
+		meta := jsonDataToMetaJSONData(jsonData)
 
 		assert.Equal(t, "test-plugin", meta.Id)
 		assert.Equal(t, "Test Plugin", meta.Name)
-		assert.Equal(t, pluginsv0alpha1.PluginMetaJSONDataTypeDatasource, meta.Type)
+		assert.Equal(t, pluginsv0alpha1.MetaJSONDataTypeDatasource, meta.Type)
 		assert.Equal(t, "1.0.0", meta.Info.Version)
 		assert.Equal(t, "Test description", *meta.Info.Description)
 		assert.Equal(t, []string{"test", "plugin"}, meta.Info.Keywords)
@@ -293,7 +293,7 @@ func TestJsonDataToMeta(t *testing.T) {
 			},
 		}
 
-		meta := jsonDataToPluginMetaJSONData(jsonData)
+		meta := jsonDataToMetaJSONData(jsonData)
 
 		assert.Nil(t, meta.Info.Description)
 		assert.Nil(t, meta.Info.Author)

apps/plugins/pkg/app/meta/manager.go

@@ -16,7 +16,7 @@ const (
 
 // cachedMeta represents a cached metadata entry with expiration time
 type cachedMeta struct {
-	meta      pluginsv0alpha1.PluginMetaJSONData
+	meta      pluginsv0alpha1.MetaJSONData
 	ttl       time.Duration
 	expiresAt time.Time
 }

apps/plugins/pkg/app/meta/manager_test.go

@@ -35,10 +35,10 @@ func TestProviderManager_GetMeta(t *testing.T) {
 	ctx := context.Background()
 
 	t.Run("returns cached result when available and not expired", func(t *testing.T) {
-		cachedMeta := pluginsv0alpha1.PluginMetaJSONData{
+		cachedMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 
 		provider := &mockProvider{
@@ -60,7 +60,7 @@ func TestProviderManager_GetMeta(t *testing.T) {
 
 		provider.getMetaFunc = func(ctx context.Context, pluginID, version string) (*Result, error) {
 			return &Result{
-				Meta: pluginsv0alpha1.PluginMetaJSONData{Id: "different"},
+				Meta: pluginsv0alpha1.MetaJSONData{Id: "different"},
 				TTL:  time.Hour,
 			}, nil
 		}
@@ -73,10 +73,10 @@ func TestProviderManager_GetMeta(t *testing.T) {
 	})
 
 	t.Run("fetches from provider when not cached", func(t *testing.T) {
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 		expectedTTL := 2 * time.Hour
 
@@ -108,15 +108,15 @@ func TestProviderManager_GetMeta(t *testing.T) {
 	})
 
 	t.Run("does not cache result with zero TTL and tries next provider", func(t *testing.T) {
-		zeroTTLMeta := pluginsv0alpha1.PluginMetaJSONData{
+		zeroTTLMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Zero TTL Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 
 		provider1 := &mockProvider{
@@ -154,10 +154,10 @@ func TestProviderManager_GetMeta(t *testing.T) {
 	})
 
 	t.Run("tries next provider when first returns ErrMetaNotFound", func(t *testing.T) {
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 
 		provider1 := &mockProvider{
@@ -229,15 +229,15 @@ func TestProviderManager_GetMeta(t *testing.T) {
 	})
 
 	t.Run("skips expired cache entries", func(t *testing.T) {
-		expiredMeta := pluginsv0alpha1.PluginMetaJSONData{
+		expiredMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Expired Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
-		expectedMeta := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Test Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 
 		callCount := 0
@@ -272,15 +272,15 @@ func TestProviderManager_GetMeta(t *testing.T) {
 	})
 
 	t.Run("uses first successful provider", func(t *testing.T) {
-		expectedMeta1 := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta1 := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Provider 1 Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
-		expectedMeta2 := pluginsv0alpha1.PluginMetaJSONData{
+		expectedMeta2 := pluginsv0alpha1.MetaJSONData{
 			Id:   "test-plugin",
 			Name: "Provider 2 Plugin",
-			Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
+			Type: pluginsv0alpha1.MetaJSONDataTypeDatasource,
 		}
 
 		provider1 := &mockProvider{
@@ -331,9 +331,9 @@ func TestProviderManager_Run(t *testing.T) {
 
 func TestProviderManager_cleanupExpired(t *testing.T) {
 	t.Run("removes expired entries", func(t *testing.T) {
-		validMeta := pluginsv0alpha1.PluginMetaJSONData{Id: "valid"}
-		expiredMeta1 := pluginsv0alpha1.PluginMetaJSONData{Id: "expired1"}
-		expiredMeta2 := pluginsv0alpha1.PluginMetaJSONData{Id: "expired2"}
+		validMeta := pluginsv0alpha1.MetaJSONData{Id: "valid"}
+		expiredMeta1 := pluginsv0alpha1.MetaJSONData{Id: "expired1"}
+		expiredMeta2 := pluginsv0alpha1.MetaJSONData{Id: "expired2"}
 
 		provider := &mockProvider{
 			getMetaFunc: func(ctx context.Context, pluginID, version string) (*Result, error) {

apps/plugins/pkg/app/meta/provider.go

@@ -14,14 +14,14 @@ var (
 
 // Result contains plugin metadata along with its recommended TTL.
 type Result struct {
-	Meta pluginsv0alpha1.PluginMetaJSONData
+	Meta pluginsv0alpha1.MetaJSONData
 	TTL  time.Duration
 }
 
 // Provider is used for retrieving plugin metadata.
 type Provider interface {
 	// GetMeta retrieves plugin metadata for the given plugin ID and version.
-	// Returns the Result containing the PluginMetaJSONData and its recommended TTL.
+	// Returns the Result containing the MetaJSONData and its recommended TTL.
 	// If the plugin is not found, returns ErrMetaNotFound.
 	GetMeta(ctx context.Context, pluginID, version string) (*Result, error)
 }

apps/plugins/pkg/app/storage.go

@@ -22,15 +22,15 @@ import (
 )
 
 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)
+	_ rest.Scoper               = (*MetaStorage)(nil)
+	_ rest.SingularNameProvider = (*MetaStorage)(nil)
+	_ rest.Getter               = (*MetaStorage)(nil)
+	_ rest.Lister               = (*MetaStorage)(nil)
+	_ rest.Storage              = (*MetaStorage)(nil)
+	_ rest.TableConvertor       = (*MetaStorage)(nil)
 )
 
-type PluginMetaStorage struct {
+type MetaStorage struct {
 	metaManager   *meta.ProviderManager
 	client        *pluginsv0alpha1.PluginClient
 	clientFactory func(context.Context) (*pluginsv0alpha1.PluginClient, error)
@@ -41,16 +41,16 @@ type PluginMetaStorage struct {
 	tableConverter rest.TableConvertor
 }
 
-func NewPluginMetaStorage(
+func NewMetaStorage(
 	metaManager *meta.ProviderManager,
 	clientFactory func(context.Context) (*pluginsv0alpha1.PluginClient, error),
-) *PluginMetaStorage {
+) *MetaStorage {
 	gr := schema.GroupResource{
 		Group:    pluginsv0alpha1.APIGroup,
-		Resource: strings.ToLower(pluginsv0alpha1.PluginMetaKind().Plural()),
+		Resource: strings.ToLower(pluginsv0alpha1.MetaKind().Plural()),
 	}
 
-	return &PluginMetaStorage{
+	return &MetaStorage{
 		metaManager:    metaManager,
 		clientFactory:  clientFactory,
 		gr:             gr,
@@ -58,7 +58,7 @@ func NewPluginMetaStorage(
 	}
 }
 
-func (s *PluginMetaStorage) getClient(ctx context.Context) (*pluginsv0alpha1.PluginClient, error) {
+func (s *MetaStorage) getClient(ctx context.Context) (*pluginsv0alpha1.PluginClient, error) {
 	s.clientOnce.Do(func() {
 		client, err := s.clientFactory(ctx)
 		if err != nil {
@@ -72,29 +72,29 @@ func (s *PluginMetaStorage) getClient(ctx context.Context) (*pluginsv0alpha1.Plu
 	return s.client, s.clientErr
 }
 
-func (s *PluginMetaStorage) New() runtime.Object {
-	return pluginsv0alpha1.PluginMetaKind().ZeroValue()
+func (s *MetaStorage) New() runtime.Object {
+	return pluginsv0alpha1.MetaKind().ZeroValue()
 }
 
-func (s *PluginMetaStorage) Destroy() {}
+func (s *MetaStorage) Destroy() {}
 
-func (s *PluginMetaStorage) NamespaceScoped() bool {
+func (s *MetaStorage) NamespaceScoped() bool {
 	return true
 }
 
-func (s *PluginMetaStorage) GetSingularName() string {
-	return strings.ToLower(pluginsv0alpha1.PluginMetaKind().Kind())
+func (s *MetaStorage) GetSingularName() string {
+	return strings.ToLower(pluginsv0alpha1.MetaKind().Kind())
 }
 
-func (s *PluginMetaStorage) NewList() runtime.Object {
-	return pluginsv0alpha1.PluginMetaKind().ZeroListValue()
+func (s *MetaStorage) NewList() runtime.Object {
+	return pluginsv0alpha1.MetaKind().ZeroListValue()
 }
 
-func (s *PluginMetaStorage) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+func (s *MetaStorage) 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) {
+func (s *MetaStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
 	ns, err := request.NamespaceInfoFrom(ctx, true)
 	if err != nil {
 		return nil, err
@@ -111,8 +111,8 @@ func (s *PluginMetaStorage) List(ctx context.Context, options *internalversion.L
 		return nil, apierrors.NewInternalError(fmt.Errorf("failed to list plugins: %w", err))
 	}
 
-	// Convert each Plugin to PluginMeta
-	metaItems := make([]pluginsv0alpha1.PluginMeta, 0, len(plugins.Items))
+	// Convert each Plugin to Meta
+	metaItems := make([]pluginsv0alpha1.Meta, 0, len(plugins.Items))
 	for _, plugin := range plugins.Items {
 		result, err := s.metaManager.GetMeta(ctx, plugin.Spec.Id, plugin.Spec.Version)
 		if err != nil {
@@ -121,14 +121,14 @@ func (s *PluginMetaStorage) List(ctx context.Context, options *internalversion.L
 			continue
 		}
 
-		pluginMeta := createPluginMetaFromPluginMetaJSONData(result.Meta, plugin.Name, plugin.Namespace)
+		pluginMeta := createMetaFromMetaJSONData(result.Meta, plugin.Name, plugin.Namespace)
 		metaItems = append(metaItems, *pluginMeta)
 	}
 
-	list := &pluginsv0alpha1.PluginMetaList{
+	list := &pluginsv0alpha1.MetaList{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: pluginsv0alpha1.APIGroup + "/" + pluginsv0alpha1.APIVersion,
-			Kind:       pluginsv0alpha1.PluginMetaKind().Kind() + "List",
+			Kind:       pluginsv0alpha1.MetaKind().Kind() + "List",
 		},
 		Items: metaItems,
 	}
@@ -136,7 +136,7 @@ func (s *PluginMetaStorage) List(ctx context.Context, options *internalversion.L
 	return list, nil
 }
 
-func (s *PluginMetaStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
+func (s *MetaStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
 	ns, err := request.NamespaceInfoFrom(ctx, true)
 	if err != nil {
 		return nil, err
@@ -169,17 +169,17 @@ func (s *PluginMetaStorage) Get(ctx context.Context, name string, options *metav
 		return nil, apierrors.NewInternalError(fmt.Errorf("failed to fetch plugin metadata: %w", err))
 	}
 
-	return createPluginMetaFromPluginMetaJSONData(result.Meta, name, ns.Value), nil
+	return createMetaFromMetaJSONData(result.Meta, name, ns.Value), nil
 }
 
-// createPluginMetaFromPluginMetaJSONData creates a PluginMeta k8s object from PluginMetaJSONData and plugin metadata.
-func createPluginMetaFromPluginMetaJSONData(pluginJSON pluginsv0alpha1.PluginMetaJSONData, name, namespace string) *pluginsv0alpha1.PluginMeta {
-	pluginMeta := &pluginsv0alpha1.PluginMeta{
+// createMetaFromMetaJSONData creates a Meta k8s object from MetaJSONData and plugin metadata.
+func createMetaFromMetaJSONData(pluginJSON pluginsv0alpha1.MetaJSONData, name, namespace string) *pluginsv0alpha1.Meta {
+	pluginMeta := &pluginsv0alpha1.Meta{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
 			Namespace: namespace,
 		},
-		Spec: pluginsv0alpha1.PluginMetaSpec{
+		Spec: pluginsv0alpha1.MetaSpec{
 			PluginJSON: pluginJSON,
 		},
 	}
@@ -188,7 +188,7 @@ func createPluginMetaFromPluginMetaJSONData(pluginJSON pluginsv0alpha1.PluginMet
 	pluginMeta.SetGroupVersionKind(schema.GroupVersionKind{
 		Group:   pluginsv0alpha1.APIGroup,
 		Version: pluginsv0alpha1.APIVersion,
-		Kind:    pluginsv0alpha1.PluginMetaKind().Kind(),
+		Kind:    pluginsv0alpha1.MetaKind().Kind(),
 	})
 
 	return pluginMeta