opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 15:02:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: preinstall sync plugins have priority over preinstall_async plugin (#106016)

Browse Source
This commit is contained in:
Syerikjan Kh
2025-05-27 08:32:02 -04:00
committed by GitHub
parent ef14992f00
commit b6c9ecf7fe
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/setting/setting_plugins.go
View File

@ -145,13 +145,15 @@ func (cfg *Cfg) readPluginSettings(iniFile *ini.File) error {
delete(preinstallPluginsAsync, disabledPlugin)
delete(preinstallPluginsSync, disabledPlugin)
}
for _, plugin := range preinstallPluginsSync {
cfg.PreinstallPluginsSync = append(cfg.PreinstallPluginsSync, plugin)
// preinstallSync plugin has priority over preinstallAsync
delete(preinstallPluginsAsync, plugin.ID)
}
for _, plugin := range preinstallPluginsAsync {
cfg.PreinstallPluginsAsync = append(cfg.PreinstallPluginsAsync, plugin)
}
for _, plugin := range preinstallPluginsSync {
cfg.PreinstallPluginsSync = append(cfg.PreinstallPluginsSync, plugin)
}
installPluginsInAsync := pluginsSection.Key("preinstall_async").MustBool(true)
if !installPluginsInAsync {
for key, plugin := range preinstallPluginsAsync {

7
pkg/setting/setting_plugins_test.go
View File

@ -237,6 +237,13 @@ func Test_readPluginSettings(t *testing.T) {
return plugins
}(),
},
{
name: "when same plugin is defined in preinstall and preinstall_sync, should be only in preinstallSync",
rawInput: "plugin1",
rawInputSync: "plugin1",
expected: defaultPreinstallPluginsList,
expectedSync: []InstallPlugin{{ID: "plugin1"}},
},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {