Refactor routing to use paths generated from hosts #59

Simplified some things

command/run.go

@@ -35,10 +35,10 @@ func (r Run) Execute(args Args, config *config.Gateway, logEntry *logrus.Entry)
 	httpConf = httpConf.Merge(envConf)
 
 	// logEntry has still the 'daemon' type which can be used for config related load errors.
-	entrypointHandlers := runtime.BuildEntrypointHandlers(config, httpConf, logEntry)
+	srvMux := runtime.NewServerConfiguration(config, httpConf, logEntry)
 
 	ctx := ContextWithSignal(context.Background())
-	serverList, listenCmdShutdown := server.NewServerList(ctx, logEntry.Logger, httpConf, entrypointHandlers)
+	serverList, listenCmdShutdown := server.NewServerList(ctx, logEntry.Logger, httpConf, srvMux)
 	for _, srv := range serverList {
 		srv.Listen()
 	}

config/endpoint.go

@@ -11,9 +11,4 @@ type Endpoint struct {
 	InlineDefinition     hcl.Body `hcl:",remain" json:"-"`
 	Path                 string   `hcl:"path,optional"`
 	Pattern              string   `hcl:"path,label"`
-	Server               *Server  `hcl:"-"` // parent
-}
-
-func (e *Endpoint) String() string {
-	return e.Server.Name + ": " + e.Pattern
 }

config/runtime/http.go

@@ -10,14 +10,12 @@ import (
 
 type Port string
 
-type HostHandlers map[string]*ServerMux
-
-type EntrypointHandlers map[Port]HostHandlers
+type Server map[Port]*ServerMux
 
 // ServerMux represents the ServerMux struct.
 type ServerMux struct {
 	Server *config.Server
-	Mux    *Mux
+	Mux    *MuxOptions
 }
 
 // HTTPConfig represents the configuration of the ingress HTTP server.

config/runtime/mux.go

@@ -1,17 +1,63 @@
 package runtime
 
 import (
+	"net/http"
+	"path/filepath"
+	"strings"
+
+	"github.com/avenga/couper/config"
 	"github.com/avenga/couper/errors"
+	"github.com/avenga/couper/handler"
+	"github.com/avenga/couper/utils"
 )
 
-// Mux represents a Mux object.
-type Mux struct {
-	API       Routes
-	APIPath   string
-	APIErrTpl *errors.Template
-	FS        Routes
-	FSPath    string
-	FSErrTpl  *errors.Template
-	SPA       Routes
-	SPAPath   string
+type MuxOptions struct {
+	APIErrTpl      *errors.Template
+	APIPath        string
+	EndpointRoutes map[string]http.Handler
+	FileHandler    http.Handler
+	FileErrTpl     *errors.Template
+	SPARoutes      map[string]http.Handler
+}
+
+func NewMuxOptions(conf *config.Server) (*MuxOptions, error) {
+	options := &MuxOptions{
+		APIErrTpl:      errors.DefaultJSON,
+		FileErrTpl:     errors.DefaultHTML,
+		EndpointRoutes: make(map[string]http.Handler),
+		SPARoutes:      make(map[string]http.Handler),
+	}
+
+	if conf.API != nil {
+		options.APIPath = utils.JoinPath("/", conf.BasePath, conf.API.BasePath)
+		for strings.HasSuffix(options.APIPath, "/") {
+			options.APIPath = options.APIPath[:len(options.APIPath)-1]
+		}
+
+		if conf.API.ErrorFile != "" {
+			tpl, err := errors.NewTemplateFromFile(conf.Files.ErrorFile)
+			if err != nil {
+				return nil, err
+			}
+			options.APIErrTpl = tpl
+		}
+	}
+
+	if conf.Files != nil {
+		if conf.Files.ErrorFile != "" {
+			tpl, err := errors.NewTemplateFromFile(conf.Files.ErrorFile)
+			if err != nil {
+				return nil, err
+			}
+			options.FileErrTpl = tpl
+		}
+
+		absPath, err := filepath.Abs(conf.Files.DocumentRoot)
+		if err != nil {
+			return nil, err
+		}
+		options.FileHandler = handler.NewFile(conf.Files.BasePath, absPath, options.FileErrTpl)
+	}
+
+	return options, nil
 }