feat: (worker) ensure connector engine only instantiated in payments …

…service
formancehq · Dec 20, 2024 · a963682 · a963682
1 parent 916ba71
commit a963682
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 27 deletions.
diff --git a/cmd/common.go b/cmd/common.go
@@ -55,12 +55,6 @@ func commonOptions(cmd *cobra.Command) (fx.Option, error) {
 		return nil, err
 	}
 
-	stack, _ := cmd.Flags().GetString(StackFlag)
-	stackPublicURL, _ := cmd.Flags().GetString(stackPublicURLFlag)
-	debug, _ := cmd.Flags().GetBool(service.DebugFlag)
-	temporalNamespace, _ := cmd.Flags().GetString(temporal.TemporalNamespaceFlag)
-	temporalMaxConcurrentWorkflowTaskPollers, _ := cmd.Flags().GetInt(temporalMaxConcurrentWorkflowTaskPollersFlag)
-
 	return fx.Options(
 		fx.Provide(func() *bunconnect.ConnectionOptions {
 			return connectionOptions
@@ -82,12 +76,5 @@ func commonOptions(cmd *cobra.Command) (fx.Option, error) {
 		licence.FXModuleFromFlags(cmd, ServiceName),
 		storage.Module(cmd, *connectionOptions, configEncryptionKey),
 		profiling.FXModuleFromFlags(cmd),
-		engine.Module(
-			stack,
-			stackPublicURL,
-			temporalNamespace,
-			temporalMaxConcurrentWorkflowTaskPollers,
-			debug,
-		),
 	), nil
 }
diff --git a/cmd/server.go b/cmd/server.go
@@ -9,6 +9,7 @@ import (
 	"github.com/formancehq/payments/internal/api"
 	v2 "github.com/formancehq/payments/internal/api/v2"
 	v3 "github.com/formancehq/payments/internal/api/v3"
+	"github.com/formancehq/payments/internal/connectors/engine"
 	"github.com/spf13/cobra"
 	"go.uber.org/fx"
 )
@@ -23,12 +24,6 @@ func newServer() *cobra.Command {
 	}
 	commonFlags(cmd)
 	cmd.Flags().String(ListenFlag, ":8080", "Listen address")
-	cmd.Flags().String(stackPublicURLFlag, "", "Stack public url")
-	// MaxConcurrentWorkflowTaskPollers should not be set to a number < 2, otherwise
-	// temporal will panic.
-	// After meeting with the temporal team, we decided to set it to 20 as per
-	// their recommendation.
-	cmd.Flags().Int(temporalMaxConcurrentWorkflowTaskPollersFlag, 20, "Max concurrent workflow task pollers")
 	return cmd
 }
 
@@ -55,6 +50,7 @@ func runServer() func(cmd *cobra.Command, args []string) error {
 
 func serverOptions(cmd *cobra.Command) (fx.Option, error) {
 	listen, _ := cmd.Flags().GetString(ListenFlag)
+	stack, _ := cmd.Flags().GetString(StackFlag)
 	return fx.Options(
 		fx.Provide(func() sharedapi.ServiceInfo {
 			return sharedapi.ServiceInfo{
@@ -65,5 +61,6 @@ func serverOptions(cmd *cobra.Command) (fx.Option, error) {
 		api.NewModule(listen, service.IsDebug(cmd)),
 		v2.NewModule(),
 		v3.NewModule(),
+		engine.Module(stack, service.IsDebug(cmd)),
 	), nil
 }
diff --git a/cmd/worker.go b/cmd/worker.go
@@ -19,12 +19,12 @@ func newWorker() *cobra.Command {
 		RunE:         runWorker(),
 	}
 	commonFlags(cmd)
-	cmd.Flags().String(stackPublicURLFlag, "", "Stack public url")
 	// MaxConcurrentWorkflowTaskPollers should not be set to a number < 2, otherwise
 	// temporal will panic.
 	// After meeting with the temporal team, we decided to set it to 20 as per
 	// their recommendation.
 	cmd.Flags().Int(temporalMaxConcurrentWorkflowTaskPollersFlag, 20, "Max concurrent workflow task pollers")
+	cmd.Flags().String(stackPublicURLFlag, "", "Stack public url")
 	return cmd
 }
 

diff --git a/internal/connectors/engine/module.go b/internal/connectors/engine/module.go
@@ -16,13 +16,7 @@ import (
 	"go.uber.org/fx"
 )
 
-func Module(
-	stack string,
-	stackURL string,
-	temporalNamespace string,
-	temporalMaxConcurrentWorkflowTaskPollers int,
-	debug bool,
-) fx.Option {
+func Module(stack string, debug bool) fx.Option {
 	ret := []fx.Option{
 		fx.Provide(func(
 			logger logging.Logger,