fix(worker): provide publisher dependencies

Author: flemzord

cmd/worker.go

@@ -49,11 +49,20 @@ func newWorkerCommand() *cobra.Command {
 }
 
 func runWorker(cmd *cobra.Command, _ []string) error {
-	connectionOptions, err := bunconnect.ConnectionOptionsFromFlags(cmd)
+	options, err := workerServiceOptions(cmd)
 	if err != nil {
 		return err
 	}
 
+	return service.New(cmd.OutOrStdout(), options...).Run(cmd)
+}
+
+func workerServiceOptions(cmd *cobra.Command) ([]fx.Option, error) {
+	connectionOptions, err := bunconnect.ConnectionOptionsFromFlags(cmd)
+	if err != nil {
+		return nil, err
+	}
+
 	retryPeriod, _ := cmd.Flags().GetDuration(flag.RetryPeriod)
 	retryBatchSize, _ := cmd.Flags().GetInt(flag.RetryBatchSize)
 	minBackOffDelay, _ := cmd.Flags().GetDuration(flag.MinBackoffDelay)
@@ -64,10 +73,10 @@ func runWorker(cmd *cobra.Command, _ []string) error {
 	listen, _ := cmd.Flags().GetString(flag.Listen)
 	retention := retentionConfigFromFlags(cmd)
 
-	return service.New(
-		cmd.OutOrStdout(),
+	return []fx.Option{
 		innerotlp.HttpClientModule(),
 		licence.FXModuleFromFlags(cmd, ServiceName),
+		publish.FXModuleFromFlags(cmd, service.IsDebug(cmd)),
 		postgres.NewModule(*connectionOptions, service.IsDebug(cmd)),
 		workerHTTPServerModule(cmd, listen),
 		otlp.FXModuleFromFlags(cmd),
@@ -86,7 +95,7 @@ func runWorker(cmd *cobra.Command, _ []string) error {
 			topics,
 			retention,
 		),
-	).Run(cmd)
+	}, nil
 }
 
 func workerHTTPServerModule(cmd *cobra.Command, listen string) fx.Option {

cmd/worker_test.go

@@ -3,17 +3,20 @@ package cmd
 import (
 	"testing"
 
+	"github.com/formancehq/go-libs/v2/logging"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/fx"
 )
 
-func TestWorkerHTTPServerModuleProvidesHandlerDependencies(t *testing.T) {
+func TestWorkerServiceOptionsProvideAllDependencies(t *testing.T) {
 	cmd := newWorkerCommand()
+	require.NoError(t, cmd.Flags().Set("postgres-uri", "postgresql://localhost/webhooks"))
+	options, err := workerServiceOptions(cmd)
+	require.NoError(t, err)
 
-	app := fx.New(
-		workerHTTPServerModule(cmd, "127.0.0.1:0"),
-		fx.NopLogger,
+	options = append(options,
+		fx.Supply(fx.Annotate(logging.Testing(), fx.As(new(logging.Logger)))),
 	)
 
-	require.NoError(t, app.Err())
+	require.NoError(t, fx.ValidateApp(options...))
 }