Provisioning: Fix bug when provision app plugins using Enterprise edition (#26340)

In OSS provisioning service init after plugin registration, but in
Enterprise it's the opposite order and installed app plugin check
fails. This adjusts service registry init priority to make sure plugins
are registered before provisioning inits.

Which issue(s) this PR fixes:
Fixes #26336
pull/26168/head^2
Marcus Efraimsson 5 years ago committed by GitHub
parent 35f7f7b50a
commit b97d1f4170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      pkg/plugins/backendplugin/manager.go
  2. 7
      pkg/registry/registry.go
  3. 20
      pkg/services/provisioning/provisioning.go
  4. 6
      pkg/services/search/service.go

@ -34,11 +34,7 @@ var (
) )
func init() { func init() {
registry.Register(&registry.Descriptor{ registry.RegisterService(&manager{})
Name: "BackendPluginManager",
Instance: &manager{},
InitPriority: registry.Low,
})
} }
// Manager manages backend plugins. // Manager manages backend plugins.

@ -20,7 +20,7 @@ func RegisterService(instance Service) {
services = append(services, &Descriptor{ services = append(services, &Descriptor{
Name: reflect.TypeOf(instance).Elem().Name(), Name: reflect.TypeOf(instance).Elem().Name(),
Instance: instance, Instance: instance,
InitPriority: Low, InitPriority: Medium,
}) })
} }
@ -114,6 +114,7 @@ func IsDisabled(srv Service) bool {
type Priority int type Priority int
const ( const (
High Priority = 100 High Priority = 100
Low Priority = 0 Medium Priority = 50
Low Priority = 0
) )

@ -25,14 +25,18 @@ type ProvisioningService interface {
} }
func init() { func init() {
registry.RegisterService(NewProvisioningServiceImpl( registry.Register(&registry.Descriptor{
func(path string) (dashboards.DashboardProvisioner, error) { Name: "ProvisioningService",
return dashboards.New(path) Instance: NewProvisioningServiceImpl(
}, func(path string) (dashboards.DashboardProvisioner, error) {
notifiers.Provision, return dashboards.New(path)
datasources.Provision, },
plugins.Provision, notifiers.Provision,
)) datasources.Provision,
plugins.Provision,
),
InitPriority: registry.Low,
})
} }
func NewProvisioningServiceImpl( func NewProvisioningServiceImpl(

@ -11,11 +11,7 @@ import (
) )
func init() { func init() {
registry.Register(&registry.Descriptor{ registry.RegisterService(&SearchService{})
Name: "SearchService",
Instance: &SearchService{},
InitPriority: 20,
})
} }
type Query struct { type Query struct {

Loading…
Cancel
Save