IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Move store and plugin dto to pluginsintegration (#74655)

Browse Source 
move store and plugin dto
This commit is contained in:
Will Browne
2023-09-11 13:59:24 +02:00
committed by GitHub
parent 499b02b3c6
commit e855efb13d
63 changed files with 359 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/services/plugindashboards/service/dashboard_updater.go
View File

@@ -6,16 +6,16 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/dashboardimport"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/plugindashboards"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
)
func ProvideDashboardUpdater(bus bus.Bus, pluginStore plugins.Store, pluginDashboardService plugindashboards.Service,
func ProvideDashboardUpdater(bus bus.Bus, pluginStore pluginstore.Store, pluginDashboardService plugindashboards.Service,
dashboardImportService dashboardimport.Service, pluginSettingsService pluginsettings.Service,
dashboardPluginService dashboards.PluginService, dashboardService dashboards.DashboardService) *DashboardUpdater {
du := newDashboardUpdater(bus, pluginStore, pluginDashboardService, dashboardImportService,
@@ -24,7 +24,7 @@ func ProvideDashboardUpdater(bus bus.Bus, pluginStore plugins.Store, pluginDashb
return du
}
func newDashboardUpdater(bus bus.Bus, pluginStore plugins.Store,
func newDashboardUpdater(bus bus.Bus, pluginStore pluginstore.Store,
pluginDashboardService plugindashboards.Service, dashboardImportService dashboardimport.Service,
pluginSettingsService pluginsettings.Service, dashboardPluginService dashboards.PluginService,
dashboardService dashboards.DashboardService) *DashboardUpdater {
@@ -43,7 +43,7 @@ func newDashboardUpdater(bus bus.Bus, pluginStore plugins.Store,
}
type DashboardUpdater struct {
pluginStore plugins.Store
pluginStore pluginstore.Store
pluginDashboardService plugindashboards.Service
dashboardImportService dashboardimport.Service
pluginSettingsService pluginsettings.Service
@@ -75,7 +75,7 @@ func (du *DashboardUpdater) updateAppDashboards() {
}
}
func (du *DashboardUpdater) syncPluginDashboards(ctx context.Context, plugin plugins.PluginDTO, orgID int64) {
func (du *DashboardUpdater) syncPluginDashboards(ctx context.Context, plugin pluginstore.Plugin, orgID int64) {
du.logger.Info("Syncing plugin dashboards to DB", "pluginId", plugin.ID)
// Get plugin dashboards

27
pkg/services/plugindashboards/service/dashboard_updater_test.go
View File

@@ -16,6 +16,7 @@ import (
"github.com/grafana/grafana/pkg/services/plugindashboards"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
)
func TestDashboardUpdater(t *testing.T) {
@@ -83,7 +84,7 @@ func TestDashboardUpdater(t *testing.T) {
PluginVersion: "1.0.0",
},
},
installedPlugins: []plugins.PluginDTO{
installedPlugins: []pluginstore.Plugin{
{
JSONData: plugins.JSONData{
Info: plugins.Info{
@@ -115,7 +116,7 @@ func TestDashboardUpdater(t *testing.T) {
PluginVersion: "1.0.0",
},
},
installedPlugins: []plugins.PluginDTO{
installedPlugins: []pluginstore.Plugin{
{
JSONData: plugins.JSONData{
Info: plugins.Info{
@@ -151,7 +152,7 @@ func TestDashboardUpdater(t *testing.T) {
OrgID: 2,
},
},
installedPlugins: []plugins.PluginDTO{
installedPlugins: []pluginstore.Plugin{
{
JSONData: plugins.JSONData{
ID: "test",
@@ -225,7 +226,7 @@ func TestDashboardUpdater(t *testing.T) {
OrgID: 2,
},
},
installedPlugins: []plugins.PluginDTO{
installedPlugins: []pluginstore.Plugin{
{
JSONData: plugins.JSONData{
ID: "test",
@@ -273,7 +274,7 @@ func TestDashboardUpdater(t *testing.T) {
PluginVersion: "1.0.0",
},
},
installedPlugins: []plugins.PluginDTO{
installedPlugins: []pluginstore.Plugin{
{
JSONData: plugins.JSONData{
ID: "test",
@@ -341,16 +342,16 @@ func TestDashboardUpdater(t *testing.T) {
}
type pluginStoreMock struct {
plugins.Store
pluginFunc func(ctx context.Context, pluginID string) (plugins.PluginDTO, bool)
pluginstore.Store
pluginFunc func(ctx context.Context, pluginID string) (pluginstore.Plugin, bool)
}
func (m *pluginStoreMock) Plugin(ctx context.Context, pluginID string) (plugins.PluginDTO, bool) {
func (m *pluginStoreMock) Plugin(ctx context.Context, pluginID string) (pluginstore.Plugin, bool) {
if m.pluginFunc != nil {
return m.pluginFunc(ctx, pluginID)
}
return plugins.PluginDTO{}, false
return pluginstore.Plugin{}, false
}
type pluginDashboardServiceMock struct {
@@ -464,7 +465,7 @@ func (s *dashboardServiceMock) GetDashboardByPublicUid(ctx context.Context, dash
type scenarioInput struct {
storedPluginSettings []*pluginsettings.DTO
installedPlugins []plugins.PluginDTO
installedPlugins []pluginstore.Plugin
pluginDashboards []*plugindashboards.PluginDashboard
}
@@ -472,7 +473,7 @@ type scenarioContext struct {
t *testing.T
bus bus.Bus
pluginSettingsService *pluginsSettingsServiceMock
pluginStore plugins.Store
pluginStore pluginstore.Store
pluginDashboardService plugindashboards.Service
importDashboardService dashboardimport.Service
dashboardPluginService *dashboardPluginServiceMock
@@ -496,14 +497,14 @@ func scenario(t *testing.T, desc string, input scenarioInput, f func(ctx *scenar
updatePluginSettingVersionArgs: []*pluginsettings.UpdatePluginSettingVersionCmd{},
}
getPlugin := func(ctx context.Context, pluginID string) (plugins.PluginDTO, bool) {
getPlugin := func(ctx context.Context, pluginID string) (pluginstore.Plugin, bool) {
for _, p := range input.installedPlugins {
if p.ID == pluginID {
return p, true
}
}
return plugins.PluginDTO{}, false
return pluginstore.Plugin{}, false
}
sCtx.pluginSettingsService = &pluginsSettingsServiceMock{

2
pkg/services/plugindashboards/service/service.go
View File

@@ -7,9 +7,9 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
pluginDashboardsManager "github.com/grafana/grafana/pkg/plugins/manager/dashboards"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/plugindashboards"
pluginDashboardsManager "github.com/grafana/grafana/pkg/services/pluginsintegration/dashboards"
)
func ProvideService(pluginDashboardStore pluginDashboardsManager.FileStore, dashboardPluginService dashboards.PluginService) *Service {

2
pkg/services/plugindashboards/service/service_test.go
View File

@@ -10,9 +10,9 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/manager/dashboards"
dashmodels "github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/plugindashboards"
"github.com/grafana/grafana/pkg/services/pluginsintegration/dashboards"
)
func TestGetPluginDashboards(t *testing.T) {