Updated

Author: djthorpe

cmd/server/service.go

@@ -201,30 +201,49 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
 
 func (cmd *ServiceRun2Command) Run(app server.Cmd) error {
 	// Create a provider by loading the plugins
-	provider, err := provider.NewWithPlugins(nil, cmd.Plugins...)
+	provider, err := provider.NewWithPlugins(cmd.Plugins...)
 	if err != nil {
 		return err
 	}
 
-	// Create configurations
-	err = errors.Join(err, provider.Load("log", "main", func(config server.Plugin) {
+	// Set the configuration
+	err = errors.Join(err, provider.Load("log", "main", func(ctx context.Context, config server.Plugin) {
 		logger := config.(*logger.Config)
 		logger.Debug = app.GetDebug() >= server.Debug
 	}))
-	err = errors.Join(err, provider.Load("httprouter", "main", func(config server.Plugin) {
+	err = errors.Join(err, provider.Load("httprouter", "main", func(ctx context.Context, config server.Plugin) {
 		httprouter := config.(*httprouter.Config)
-		httprouter.Origin = "*"
 		httprouter.Prefix = types.NormalisePath(app.GetEndpoint().Path)
+		httprouter.Origin = "*"
+		httprouter.Middleware = []string{"log.main"}
 	}))
-	err = errors.Join(err, provider.Load("httpserver", "main", func(config server.Plugin) {
+	err = errors.Join(err, provider.Load("httpserver", "main", func(ctx context.Context, config server.Plugin) {
 		httpserver := config.(*httpserver.Config)
 		httpserver.Listen = app.GetEndpoint()
+		httpserver.Router = provider.Task(ctx, "httprouter.main").(http.Handler)
+	}))
+	err = errors.Join(err, provider.Load("helloworld", "main", func(ctx context.Context, config server.Plugin) {
+		// NO-OP
+	}))
+	err = errors.Join(err, provider.Load("pgpool", "main", func(ctx context.Context, config server.Plugin) {
+		pgpool := config.(*pg.Config)
+		pgpool.Router = provider.Task(ctx, "httprouter.main").(server.HTTPRouter)
+	}))
+	err = errors.Join(err, provider.Load("auth", "main", func(ctx context.Context, config server.Plugin) {
+		auth := config.(*auth.Config)
+		auth.Pool = provider.Task(ctx, "pgpool.main").(server.PG)
+		auth.Router = provider.Task(ctx, "httprouter.main").(server.HTTPRouter)
+	}))
+	err = errors.Join(err, provider.Load("pgqueue", "main", func(ctx context.Context, config server.Plugin) {
+		pgqueue := config.(*pgqueue.Config)
+		pgqueue.Pool = provider.Task(ctx, "pgpool.main").(server.PG)
+		pgqueue.Router = provider.Task(ctx, "httprouter.main").(server.HTTPRouter)
+	}))
+	err = errors.Join(err, provider.Load("certmanager", "main", func(ctx context.Context, config server.Plugin) {
+		certmanager := config.(*cert.Config)
+		certmanager.Router = provider.Task(ctx, "httprouter.main").(server.HTTPRouter)
+		certmanager.Pool = provider.Task(ctx, "pgpool.main").(server.PG)
 	}))
-	err = errors.Join(err, provider.Load("helloworld", "main", nil))
-	err = errors.Join(err, provider.Load("auth", "main", nil))
-	err = errors.Join(err, provider.Load("pgpool", "main", nil))
-	err = errors.Join(err, provider.Load("pgqueue", "main", nil))
-	err = errors.Join(err, provider.Load("certmanager", "main", nil))
 	if err != nil {
 		return err
 	}

pkg/provider/plugin.go

@@ -1,6 +1,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"os"
 	"path/filepath"
@@ -25,7 +26,7 @@ const (
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
 
-func NewWithPlugins(resolver ResolverFunc, paths ...string) (server.Provider, error) {
+func NewWithPlugins(paths ...string) (server.Provider, error) {
 	self := new(provider)
 
 	// Load plugins
@@ -38,7 +39,6 @@ func NewWithPlugins(resolver ResolverFunc, paths ...string) (server.Provider, er
 	self.protos = make(map[string]*meta.Meta, len(plugins))
 	self.plugin = make(map[string]server.Plugin, len(plugins))
 	self.task = make(map[string]*state, len(plugins))
-	self.resolver = resolver
 	self.Logger = logger.New(os.Stderr, logger.Term, false)
 	for _, plugin := range plugins {
 		name := plugin.Name()
@@ -59,7 +59,7 @@ func NewWithPlugins(resolver ResolverFunc, paths ...string) (server.Provider, er
 
 // Create a "concrete" plugin from a prototype and a label, using the function to "hook"
 // any values into the plugin
-func (provider *provider) Load(name, label string, fn func(server.Plugin)) error {
+func (provider *provider) Load(name, label string, fn func(context.Context, server.Plugin)) error {
 	proto, exists := provider.protos[name]
 	if !exists {
 		return httpresponse.ErrBadRequest.Withf("Plugin not found: %q", name)
@@ -83,7 +83,7 @@ func (provider *provider) Load(name, label string, fn func(server.Plugin)) error
 		// Create a plugin from the prototype
 		plugin := proto.New()
 		if fn != nil {
-			fn(plugin)
+			fn(context.TODO(), plugin)
 		}
 		provider.plugin[label] = plugin
 		provider.porder = append(provider.porder, label)

plugin.go

@@ -38,7 +38,7 @@ type Provider interface {
 	Task
 
 	// Load a plugin by name and label
-	Load(string, string, func(config Plugin)) error
+	Load(string, string, func(context.Context, Plugin)) error
 
 	// Return a task given a plugin label
 	Task(context.Context, string) Task