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: Add plugin settings DTO (#46283)

Browse Source 
* add clearer service layer

* re-order frontend settings for clarity

* fix fetch fail

* fix API response

* fix mockstore

* in -> where
This commit is contained in:
Will Browne
2022-03-18 20:49:13 +01:00
committed by GitHub
parent 1afd278bd0
commit bda3f860a8
16 changed files with 426 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pkg/api/pluginproxy/pluginproxy_test.go
View File

@@ -32,8 +32,8 @@ func TestPluginProxy(t *testing.T) {
store := &mockPluginsSettingsService{}
key, _ := secretsService.Encrypt(context.Background(), []byte("123"), secrets.WithoutScope())
store.pluginSetting = &models.PluginSetting{
SecureJsonData: map[string][]byte{
store.pluginSetting = &pluginsettings.DTO{
SecureJSONData: map[string][]byte{
"key": key,
},
}
@@ -65,7 +65,7 @@ func TestPluginProxy(t *testing.T) {
require.NoError(t, err)
store := &mockPluginsSettingsService{}
store.pluginSetting = &models.PluginSetting{}
store.pluginSetting = &pluginsettings.DTO{}
req := getPluginProxiedRequest(
t,
@@ -92,7 +92,7 @@ func TestPluginProxy(t *testing.T) {
require.NoError(t, err)
store := &mockPluginsSettingsService{}
store.pluginSetting = &models.PluginSetting{}
store.pluginSetting = &pluginsettings.DTO{}
req := getPluginProxiedRequest(
t,
@@ -118,7 +118,7 @@ func TestPluginProxy(t *testing.T) {
require.NoError(t, err)
store := &mockPluginsSettingsService{}
store.pluginSetting = &models.PluginSetting{}
store.pluginSetting = &pluginsettings.DTO{}
req := getPluginProxiedRequest(
t,
@@ -145,8 +145,8 @@ func TestPluginProxy(t *testing.T) {
}
store := &mockPluginsSettingsService{}
store.pluginSetting = &models.PluginSetting{
JsonData: map[string]interface{}{
store.pluginSetting = &pluginsettings.DTO{
JSONData: map[string]interface{}{
"dynamicUrl": "https://dynamic.grafana.com",
},
}
@@ -180,7 +180,7 @@ func TestPluginProxy(t *testing.T) {
}
store := &mockPluginsSettingsService{}
store.pluginSetting = &models.PluginSetting{}
store.pluginSetting = &pluginsettings.DTO{}
httpReq, err := http.NewRequest(http.MethodGet, "", nil)
require.NoError(t, err)
@@ -216,9 +216,9 @@ func TestPluginProxy(t *testing.T) {
map[string]string{"key": "123"},
secrets.WithoutScope(),
)
store.pluginSetting = &models.PluginSetting{
JsonData: map[string]interface{}{"dynamicUrl": "https://dynamic.grafana.com"},
SecureJsonData: encryptedJsonData,
store.pluginSetting = &pluginsettings.DTO{
JSONData: map[string]interface{}{"dynamicUrl": "https://dynamic.grafana.com"},
SecureJSONData: encryptedJsonData,
}
httpReq, err := http.NewRequest(http.MethodGet, "", nil)
@@ -268,8 +268,8 @@ func TestPluginProxy(t *testing.T) {
},
}
pluginSettingsService := &mockPluginsSettingsService{
pluginSetting: &models.PluginSetting{
SecureJsonData: map[string][]byte{},
pluginSetting: &pluginsettings.DTO{
SecureJSONData: map[string][]byte{},
},
}
proxy := NewApiPluginProxy(ctx, "", route, "", &setting.Cfg{}, pluginSettingsService, secretsService)
@@ -304,27 +304,26 @@ func getPluginProxiedRequest(t *testing.T, secretsService secrets.Service, ctx *
}
type mockPluginsSettingsService struct {
pluginSetting *models.PluginSetting
pluginSetting *pluginsettings.DTO
err error
}
func (s *mockPluginsSettingsService) GetPluginSettings(_ context.Context, _ int64) ([]*models.PluginSettingInfoDTO, error) {
func (s *mockPluginsSettingsService) GetPluginSettings(_ context.Context, _ *pluginsettings.GetArgs) ([]*pluginsettings.DTO, error) {
return nil, s.err
}
func (s *mockPluginsSettingsService) GetPluginSettingById(_ context.Context, query *models.GetPluginSettingByIdQuery) error {
query.Result = s.pluginSetting
func (s *mockPluginsSettingsService) GetPluginSettingByPluginID(_ context.Context, _ *pluginsettings.GetByPluginIDArgs) (*pluginsettings.DTO, error) {
return s.pluginSetting, s.err
}
func (s *mockPluginsSettingsService) UpdatePluginSettingPluginVersion(_ context.Context, _ *pluginsettings.UpdatePluginVersionArgs) error {
return s.err
}
func (s *mockPluginsSettingsService) UpdatePluginSettingVersion(_ context.Context, _ *models.UpdatePluginSettingVersionCmd) error {
func (s *mockPluginsSettingsService) UpdatePluginSetting(_ context.Context, _ *pluginsettings.UpdateArgs) error {
return s.err
}
func (s *mockPluginsSettingsService) UpdatePluginSetting(_ context.Context, _ *models.UpdatePluginSettingCmd) error {
return s.err
}
func (s *mockPluginsSettingsService) DecryptedValues(_ *models.PluginSetting) map[string]string {
func (s *mockPluginsSettingsService) DecryptedValues(_ *pluginsettings.DTO) map[string]string {
return nil
}