Plugins: Add context to StaticRouteResolver and ErrorResolver interfaces (#73121)
* add ctx * fix tests
This commit is contained in:
@@ -118,11 +118,11 @@ type SecretsPluginManager interface {
|
||||
}
|
||||
|
||||
type StaticRouteResolver interface {
|
||||
Routes() []*StaticRoute
|
||||
Routes(ctx context.Context) []*StaticRoute
|
||||
}
|
||||
|
||||
type ErrorResolver interface {
|
||||
PluginErrors() []*Error
|
||||
PluginErrors(ctx context.Context) []*Error
|
||||
}
|
||||
|
||||
type PluginLoaderAuthorizer interface {
|
||||
|
||||
@@ -21,13 +21,7 @@ type Loader struct {
|
||||
log log.Logger
|
||||
}
|
||||
|
||||
func ProvideService(discovery discovery.Discoverer, bootstrap bootstrap.Bootstrapper, validation validation.Validator,
|
||||
initializer initialization.Initializer, termination termination.Terminator) *Loader {
|
||||
return New(discovery, bootstrap, validation, initializer, termination)
|
||||
}
|
||||
|
||||
func New(
|
||||
discovery discovery.Discoverer, bootstrap bootstrap.Bootstrapper, validation validation.Validator,
|
||||
func New(discovery discovery.Discoverer, bootstrap bootstrap.Bootstrapper, validation validation.Validator,
|
||||
initializer initialization.Initializer, termination termination.Terminator) *Loader {
|
||||
return &Loader{
|
||||
discovery: discovery,
|
||||
|
||||
@@ -110,10 +110,10 @@ func (s *Service) availablePlugins(ctx context.Context) []*plugins.Plugin {
|
||||
return res
|
||||
}
|
||||
|
||||
func (s *Service) Routes() []*plugins.StaticRoute {
|
||||
func (s *Service) Routes(ctx context.Context) []*plugins.StaticRoute {
|
||||
staticRoutes := make([]*plugins.StaticRoute, 0)
|
||||
|
||||
for _, p := range s.availablePlugins(context.TODO()) {
|
||||
for _, p := range s.availablePlugins(ctx) {
|
||||
if p.StaticRoute() != nil {
|
||||
staticRoutes = append(staticRoutes, p.StaticRoute())
|
||||
}
|
||||
|
||||
@@ -132,7 +132,7 @@ func TestStore_Routes(t *testing.T) {
|
||||
return &plugins.StaticRoute{PluginID: p.ID, Directory: p.FS.Base()}
|
||||
}
|
||||
|
||||
rs := ps.Routes()
|
||||
rs := ps.Routes(context.Background())
|
||||
require.Equal(t, []*plugins.StaticRoute{sr(p1), sr(p2), sr(p4), sr(p5)}, rs)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user