Add internal provider

Co-authored-by: Julien Salleyron <julien.salleyron@gmail.com>

pkg/server/router/router.go

@@ -11,41 +11,55 @@ import (
 	"github.com/containous/traefik/v2/pkg/middlewares/accesslog"
 	"github.com/containous/traefik/v2/pkg/middlewares/recovery"
 	"github.com/containous/traefik/v2/pkg/middlewares/tracing"
-	"github.com/containous/traefik/v2/pkg/responsemodifiers"
 	"github.com/containous/traefik/v2/pkg/rules"
 	"github.com/containous/traefik/v2/pkg/server/internal"
 	"github.com/containous/traefik/v2/pkg/server/middleware"
-	"github.com/containous/traefik/v2/pkg/server/service"
 )
 
 const (
 	recoveryMiddlewareName = "traefik-internal-recovery"
 )
 
+type middlewareBuilder interface {
+	BuildChain(ctx context.Context, names []string) *alice.Chain
+}
+
+type responseModifierBuilder interface {
+	Build(ctx context.Context, names []string) func(*http.Response) error
+}
+
+type serviceManager interface {
+	BuildHTTP(rootCtx context.Context, serviceName string, responseModifier func(*http.Response) error) (http.Handler, error)
+	LaunchHealthCheck()
+}
+
+// Manager A route/router manager
+type Manager struct {
+	routerHandlers     map[string]http.Handler
+	serviceManager     serviceManager
+	middlewaresBuilder middlewareBuilder
+	chainBuilder       *middleware.ChainBuilder
+	modifierBuilder    responseModifierBuilder
+	conf               *runtime.Configuration
+}
+
 // NewManager Creates a new Manager
 func NewManager(conf *runtime.Configuration,
-	serviceManager *service.Manager,
-	middlewaresBuilder *middleware.Builder,
-	modifierBuilder *responsemodifiers.Builder,
+	serviceManager serviceManager,
+	middlewaresBuilder middlewareBuilder,
+	modifierBuilder responseModifierBuilder,
+	chainBuilder *middleware.ChainBuilder,
 ) *Manager {
 	return &Manager{
 		routerHandlers:     make(map[string]http.Handler),
 		serviceManager:     serviceManager,
 		middlewaresBuilder: middlewaresBuilder,
 		modifierBuilder:    modifierBuilder,
+		chainBuilder:       chainBuilder,
 		conf:               conf,
 	}
 }
 
-// Manager A route/router manager
-type Manager struct {
-	routerHandlers     map[string]http.Handler
-	serviceManager     *service.Manager
-	middlewaresBuilder *middleware.Builder
-	modifierBuilder    *responsemodifiers.Builder
-	conf               *runtime.Configuration
-}
-
 func (m *Manager) getHTTPRouters(ctx context.Context, entryPoints []string, tls bool) map[string]map[string]*runtime.RouterInfo {
 	if m.conf != nil {
 		return m.conf.GetRoutersByEntryPoints(ctx, entryPoints, tls)
@@ -79,6 +93,22 @@ func (m *Manager) BuildHandlers(rootCtx context.Context, entryPoints []string, t
 		}
 	}
 
+	for _, entryPointName := range entryPoints {
+		ctx := log.With(rootCtx, log.Str(log.EntryPointName, entryPointName))
+
+		handler, ok := entryPointHandlers[entryPointName]
+		if !ok || handler == nil {
+			handler = BuildDefaultHTTPRouter()
+		}
+
+		handlerWithMiddlewares, err := m.chainBuilder.Build(ctx, entryPointName).Then(handler)
+		if err != nil {
+			log.FromContext(ctx).Error(err)
+			continue
+		}
+		entryPointHandlers[entryPointName] = handlerWithMiddlewares
+	}
+
 	m.serviceManager.LaunchHealthCheck()
 
 	return entryPointHandlers
@@ -167,3 +197,8 @@ func (m *Manager) buildHTTPHandler(ctx context.Context, router *runtime.RouterIn
 
 	return alice.New().Extend(*mHandler).Append(tHandler).Then(sHandler)
 }
+
+// BuildDefaultHTTPRouter creates a default HTTP router.
+func BuildDefaultHTTPRouter() http.Handler {
+	return http.NotFoundHandler()
+}