mirror of
https://github.com/hanzo-fi/webhooks.git
synced 2026-10-30 20:32:55 +00:00
3a3f7a6b49
* feat: add audit middleware to webhooks server Wire httpaudit.Middleware from go-libs/v5 into the webhooks HTTP handler to capture and publish audit events via the existing Watermill publisher infrastructure. This was lost when the upgrade PR was squash-merged. * fix: remove duplicate publish module registration The publisher is already provided by the worker module. Adding it again in serve.go causes an fx "already provided" conflict. * fix: move publish module from worker to serve Move publish.FXModuleFromFlags to serve.go so the publisher is available in both server-only and worker modes. Previously it was only in the worker module, causing a missing dependency when running without --worker. --------- Co-authored-by: Hanzo Dev <[email protected]>
89 lines
2.5 KiB
Go
89 lines
2.5 KiB
Go
package cmd
|
|
|
|
import (
|
|
"github.com/formancehq/go-libs/v2/aws/iam"
|
|
"github.com/formancehq/go-libs/v2/otlp"
|
|
"github.com/formancehq/go-libs/v2/otlp/otlptraces"
|
|
"github.com/formancehq/go-libs/v2/publish"
|
|
|
|
"github.com/formancehq/go-libs/v2/auth"
|
|
"github.com/formancehq/go-libs/v2/bun/bunconnect"
|
|
"github.com/formancehq/go-libs/v2/licence"
|
|
"github.com/formancehq/go-libs/v2/service"
|
|
"github.com/formancehq/webhooks/cmd/flag"
|
|
"github.com/formancehq/webhooks/pkg/backoff"
|
|
innerotlp "github.com/formancehq/webhooks/pkg/otlp"
|
|
"github.com/formancehq/webhooks/pkg/server"
|
|
"github.com/formancehq/webhooks/pkg/storage/postgres"
|
|
"github.com/formancehq/webhooks/pkg/worker"
|
|
"github.com/spf13/cobra"
|
|
"go.uber.org/fx"
|
|
)
|
|
|
|
func newServeCommand() *cobra.Command {
|
|
ret := &cobra.Command{
|
|
Use: "serve",
|
|
Aliases: []string{"server"},
|
|
Short: "Run webhooks server",
|
|
RunE: serve,
|
|
PreRunE: handleAutoMigrate,
|
|
}
|
|
otlp.AddFlags(ret.Flags())
|
|
otlptraces.AddFlags(ret.Flags())
|
|
publish.AddFlags(ServiceName, ret.Flags())
|
|
auth.AddFlags(ret.Flags())
|
|
flag.Init(ret.Flags())
|
|
bunconnect.AddFlags(ret.Flags())
|
|
iam.AddFlags(ret.Flags())
|
|
service.AddFlags(ret.Flags())
|
|
licence.AddFlags(ret.Flags())
|
|
|
|
return ret
|
|
}
|
|
|
|
func serve(cmd *cobra.Command, _ []string) error {
|
|
connectionOptions, err := bunconnect.ConnectionOptionsFromFlags(cmd)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
listen, _ := cmd.Flags().GetString(flag.Listen)
|
|
options := []fx.Option{
|
|
fx.Provide(func() server.ServiceInfo {
|
|
return server.ServiceInfo{
|
|
Version: Version,
|
|
}
|
|
}),
|
|
auth.FXModuleFromFlags(cmd),
|
|
publish.FXModuleFromFlags(cmd, service.IsDebug(cmd)),
|
|
postgres.NewModule(*connectionOptions, service.IsDebug(cmd)),
|
|
innerotlp.HttpClientModule(),
|
|
server.FXModuleFromFlags(cmd, listen, service.IsDebug(cmd)),
|
|
licence.FXModuleFromFlags(cmd, ServiceName),
|
|
}
|
|
isWorker, _ := cmd.Flags().GetBool(flag.Worker)
|
|
if isWorker {
|
|
retryPeriod, _ := cmd.Flags().GetDuration(flag.RetryPeriod)
|
|
retryBatchSize, _ := cmd.Flags().GetInt(flag.RetryBatchSize)
|
|
minBackOffDelay, _ := cmd.Flags().GetDuration(flag.MinBackoffDelay)
|
|
maxBackOffDelay, _ := cmd.Flags().GetDuration(flag.MaxBackoffDelay)
|
|
abortAfter, _ := cmd.Flags().GetDuration(flag.AbortAfter)
|
|
topics, _ := cmd.Flags().GetStringSlice(flag.KafkaTopics)
|
|
|
|
options = append(options, worker.StartModule(
|
|
cmd,
|
|
retryPeriod,
|
|
backoff.NewExponential(
|
|
minBackOffDelay,
|
|
maxBackOffDelay,
|
|
abortAfter,
|
|
),
|
|
retryBatchSize,
|
|
service.IsDebug(cmd),
|
|
topics,
|
|
))
|
|
}
|
|
|
|
return service.New(cmd.OutOrStdout(), options...).Run(cmd)
|
|
}
|