refactor: Remove http logic from main

ViBiOh · ViBiOh · commit 48d055c08162 · 2024-06-28T12:57:29.000+02:00
Signed-off-by: Vincent Boutour &lt;bob@vibioh.fr&gt;
diff --git a/cmd/mailer/mailer.go b/cmd/mailer/mailer.go
@@ -6,10 +6,7 @@ import (
 	"github.com/ViBiOh/httputils/v4/pkg/alcotest"
 	"github.com/ViBiOh/httputils/v4/pkg/amqp"
 	"github.com/ViBiOh/httputils/v4/pkg/amqphandler"
-	"github.com/ViBiOh/httputils/v4/pkg/cors"
-	"github.com/ViBiOh/httputils/v4/pkg/httputils"
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
-	"github.com/ViBiOh/httputils/v4/pkg/owasp"
 	"github.com/ViBiOh/httputils/v4/pkg/server"
 )
 
@@ -33,10 +30,9 @@ func main() {
 
 	port := newPort(clients, services)
 
-	go services.server.Start(clients.health.EndCtx(), httputils.Handler(port, clients.health, clients.telemetry.Middleware("http"), owasp.New(config.owasp).Middleware, cors.New(config.cors).Middleware))
+	go services.server.Start(clients.health.EndCtx(), port)
 
 	clients.health.WaitForTermination(getDoneChan(services.server.Done(), clients.amqp, services.amqpHandler))
-
 	server.GracefulWait(services.server.Done(), services.amqpHandler.Done())
 }
 
diff --git a/cmd/mailer/port.go b/cmd/mailer/port.go
@@ -3,6 +3,7 @@ package main
 import (
 	"net/http"
 
+	"github.com/ViBiOh/httputils/v4/pkg/httputils"
 	"github.com/ViBiOh/mailer/pkg/httphandler"
 )
 
@@ -15,5 +16,9 @@ func newPort(clients clients, services services) http.Handler {
 	mux.HandleFunc("GET /render/{template...}", handler.HandlerTemplate)
 	mux.HandleFunc("GET /", handler.HandleRoot)
 
-	return mux
+	return httputils.Handler(mux, clients.health,
+		clients.telemetry.Middleware("http"),
+		services.owasp.Middleware,
+		services.cors.Middleware,
+	)
 }
diff --git a/cmd/mailer/services.go b/cmd/mailer/services.go
@@ -5,33 +5,42 @@ import (
 	"fmt"
 
 	"github.com/ViBiOh/httputils/v4/pkg/amqphandler"
+	"github.com/ViBiOh/httputils/v4/pkg/cors"
+	"github.com/ViBiOh/httputils/v4/pkg/owasp"
 	"github.com/ViBiOh/httputils/v4/pkg/server"
 	"github.com/ViBiOh/mailer/pkg/mailer"
 	"github.com/ViBiOh/mailer/pkg/mjml"
 	"github.com/ViBiOh/mailer/pkg/smtp"
 )
 
 type services struct {
-	server      *server.Server
+	server *server.Server
+	owasp  owasp.Service
+	cors   cors.Service
+
 	amqpHandler *amqphandler.Service
 	mailer      mailer.Service
 }
 
 func newServices(config configuration, clients clients) (services, error) {
+	var output services
+	var err error
+
+	output.server = server.New(config.server)
+	output.owasp = owasp.New(config.owasp)
+	output.cors = cors.New(config.cors)
+
 	mjmlService := mjml.New(config.mjml, clients.telemetry.MeterProvider(), clients.telemetry.TracerProvider())
 	smtpService := smtp.New(config.smtp, clients.telemetry.MeterProvider(), clients.telemetry.TracerProvider())
-	mailerService := mailer.New(config.mailer, mjmlService, smtpService, clients.telemetry.MeterProvider(), clients.telemetry.TracerProvider())
 
-	amqpHandler, err := amqphandler.New(config.amqphandler, clients.amqp, clients.telemetry.MeterProvider(), clients.telemetry.TracerProvider(), mailerService.AmqpHandler)
+	output.mailer = mailer.New(config.mailer, mjmlService, smtpService, clients.telemetry.MeterProvider(), clients.telemetry.TracerProvider())
+
+	output.amqpHandler, err = amqphandler.New(config.amqphandler, clients.amqp, clients.telemetry.MeterProvider(), clients.telemetry.TracerProvider(), output.mailer.AmqpHandler)
 	if err != nil {
-		return services{}, fmt.Errorf("amqpHandler: %w", err)
+		return output, fmt.Errorf("amqpHandler: %w", err)
 	}
 
-	return services{
-		server:      server.New(config.server),
-		mailer:      mailerService,
-		amqpHandler: amqpHandler,
-	}, nil
+	return output, nil
 }
 
 func (s services) Start(ctx context.Context) {
