From a189f4e12a6fc953acd4048f4dad7b334578c6f1 Mon Sep 17 00:00:00 2001 From: Maxence Maireaux Date: Thu, 4 Jun 2026 12:48:50 +0200 Subject: [PATCH] chore(deps): upgrade go-libs to v5 --- cmd/root.go | 39 +++++++------ cmd/serve.go | 28 ++++----- cmd/worker.go | 18 +++--- go.mod | 25 ++------ go.sum | 58 ++++--------------- internal/api/backend.go | 2 +- internal/api/backend_generated.go | 18 +++--- internal/api/handler_info.go | 2 +- internal/api/module.go | 4 +- internal/api/module_test.go | 9 +-- internal/api/router.go | 4 +- .../api/v1/handler_abort_workflow_instance.go | 2 +- internal/api/v1/handler_create_trigger.go | 2 +- internal/api/v1/handler_create_workflow.go | 2 +- internal/api/v1/handler_delete_trigger.go | 2 +- internal/api/v1/handler_delete_workflow.go | 2 +- .../api/v1/handler_delete_workflow_test.go | 2 +- internal/api/v1/handler_get_trigger.go | 2 +- internal/api/v1/handler_list_instances.go | 2 +- .../api/v1/handler_list_instances_test.go | 4 +- internal/api/v1/handler_list_triggers.go | 4 +- .../v1/handler_list_triggers_occurrences.go | 2 +- internal/api/v1/handler_list_workflows.go | 4 +- internal/api/v1/handler_post_event.go | 2 +- internal/api/v1/handler_read_instance.go | 2 +- .../api/v1/handler_read_instance_history.go | 2 +- internal/api/v1/handler_read_instance_test.go | 4 +- internal/api/v1/handler_read_stage_history.go | 2 +- internal/api/v1/handler_read_workflow.go | 2 +- internal/api/v1/handler_run_workflow.go | 2 +- internal/api/v1/handler_run_workflow_test.go | 2 +- internal/api/v1/main_test.go | 18 +++--- internal/api/v1/router.go | 6 +- .../api/v2/handler_abort_workflow_instance.go | 2 +- internal/api/v2/handler_create_trigger.go | 2 +- internal/api/v2/handler_create_workflow.go | 2 +- internal/api/v2/handler_delete_trigger.go | 2 +- internal/api/v2/handler_delete_workflow.go | 2 +- .../api/v2/handler_delete_workflow_test.go | 2 +- internal/api/v2/handler_get_trigger.go | 2 +- internal/api/v2/handler_list_instances.go | 4 +- .../api/v2/handler_list_instances_test.go | 4 +- internal/api/v2/handler_list_triggers.go | 4 +- .../v2/handler_list_triggers_occurrences.go | 4 +- internal/api/v2/handler_list_workflows.go | 4 +- internal/api/v2/handler_post_event.go | 2 +- internal/api/v2/handler_read_instance.go | 2 +- .../api/v2/handler_read_instance_history.go | 2 +- internal/api/v2/handler_read_instance_test.go | 2 +- internal/api/v2/handler_read_stage_history.go | 2 +- internal/api/v2/handler_read_workflow.go | 2 +- internal/api/v2/handler_run_workflow.go | 2 +- internal/api/v2/handler_run_workflow_test.go | 2 +- internal/api/v2/handler_test_trigger.go | 2 +- internal/api/v2/handler_test_trigger_test.go | 4 +- internal/api/v2/main_test.go | 18 +++--- internal/api/v2/router.go | 6 +- internal/schema/map.go | 2 +- internal/storage/main_test.go | 8 +-- internal/storage/migrations.go | 2 +- internal/storage/migrations_test.go | 6 +- internal/temporalworker/module.go | 2 +- internal/triggers/activities.go | 4 +- internal/triggers/expression.go | 4 +- internal/triggers/listener.go | 8 +-- internal/triggers/listener_test.go | 10 ++-- internal/triggers/main_test.go | 8 +-- internal/triggers/manager.go | 2 +- internal/triggers/module.go | 2 +- internal/triggers/trigger.go | 2 +- internal/triggers/workflow_trigger.go | 4 +- internal/triggers/workflow_trigger_test.go | 10 ++-- internal/workflow/activities/activity.go | 2 +- .../activity_ledger_create_transaction.go | 2 +- .../activities/activity_wallet_credit.go | 2 +- .../activities/activity_wallet_debit.go | 2 +- .../activities/activity_wallet_list.go | 2 +- internal/workflow/activities_test.go | 8 +-- internal/workflow/main_test.go | 10 ++-- internal/workflow/manager.go | 4 +- internal/workflow/manager_test.go | 8 +-- internal/workflow/stage.go | 2 +- internal/workflow/stages/delay/delay.go | 2 +- internal/workflow/stages/delay/run.go | 2 +- internal/workflow/stages/delay/run_test.go | 2 +- internal/workflow/stages/send/run.go | 6 +- internal/workflow/stages/send/run_test.go | 4 +- internal/workflow/stages/send/send.go | 4 +- pkg/events/events.go | 2 +- 89 files changed, 227 insertions(+), 270 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index cb4ff5a..45e4a99 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -5,16 +5,17 @@ import ( "fmt" "net/http" - "github.com/formancehq/go-libs/v3/auth" - "github.com/formancehq/go-libs/v3/bun/bunconnect" - "github.com/formancehq/go-libs/v3/bun/bunmigrate" - "github.com/formancehq/go-libs/v3/licence" - "github.com/formancehq/go-libs/v3/otlp" - "github.com/formancehq/go-libs/v3/otlp/otlpmetrics" - "github.com/formancehq/go-libs/v3/otlp/otlptraces" - "github.com/formancehq/go-libs/v3/publish" - "github.com/formancehq/go-libs/v3/service" - "github.com/formancehq/go-libs/v3/temporal" + "github.com/formancehq/go-libs/v5/pkg/fx/authnfx" + "github.com/formancehq/go-libs/v5/pkg/fx/messagingfx" + "github.com/formancehq/go-libs/v5/pkg/fx/observefx" + "github.com/formancehq/go-libs/v5/pkg/fx/storagefx" + "github.com/formancehq/go-libs/v5/pkg/fx/workflowfx" + otlp "github.com/formancehq/go-libs/v5/pkg/observe" + otlptraces "github.com/formancehq/go-libs/v5/pkg/observe/traces" + "github.com/formancehq/go-libs/v5/pkg/service" + bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect" + bunmigrate "github.com/formancehq/go-libs/v5/pkg/storage/bun/migrate" + "github.com/formancehq/go-libs/v5/pkg/workflow/temporal" "github.com/formancehq/orchestration/internal/storage" "github.com/formancehq/orchestration/internal/temporalworker" "github.com/formancehq/orchestration/internal/tracer" @@ -70,7 +71,7 @@ func Execute() { } func commonOptions(cmd *cobra.Command) (fx.Option, error) { - connectionOptions, err := bunconnect.ConnectionOptionsFromFlags(cmd) + connectionOptions, err := bunconnect.ConnectionOptionsFromFlags(cmd.Flags(), cmd.Context()) if err != nil { return nil, err } @@ -79,9 +80,9 @@ func commonOptions(cmd *cobra.Command) (fx.Option, error) { temporalTaskQueue, _ := cmd.Flags().GetString(temporal.TemporalTaskQueueFlag) return fx.Options( - otlp.FXModuleFromFlags(cmd), - otlptraces.FXModuleFromFlags(cmd), - temporal.FXModuleFromFlags( + observefx.ResourceModuleFromFlags(cmd), + observefx.TracesModuleFromFlags(cmd), + workflowfx.TemporalClientModuleFromFlags( cmd, tracer.Tracer, temporal.SearchAttributes{ @@ -91,11 +92,11 @@ func commonOptions(cmd *cobra.Command) (fx.Option, error) { ), }, ), - otlpmetrics.FXModuleFromFlags(cmd), - bunconnect.Module(*connectionOptions, service.IsDebug(cmd)), - publish.FXModuleFromFlags(cmd, service.IsDebug(cmd)), - auth.FXModuleFromFlags(cmd), - licence.FXModuleFromFlags(cmd, ServiceName), + observefx.MetricsModuleFromFlags(cmd), + storagefx.BunConnectModule(*connectionOptions, service.IsDebug(cmd)), + messagingfx.PublishModuleFromFlags(cmd, service.IsDebug(cmd)), + authnfx.JWTModuleFromFlags(cmd), + authnfx.LicenceModuleFromFlags(cmd, ServiceName), workflow.NewModule(stack, temporalTaskQueue), triggers.NewModule(stack, temporalTaskQueue), fx.Provide(func() *bunconnect.ConnectionOptions { diff --git a/cmd/serve.go b/cmd/serve.go index 6339f47..54e8acb 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -3,16 +3,18 @@ package cmd import ( "context" - "github.com/formancehq/go-libs/v3/auth" - "github.com/formancehq/go-libs/v3/aws/iam" - "github.com/formancehq/go-libs/v3/bun/bunconnect" - "github.com/formancehq/go-libs/v3/health" - "github.com/formancehq/go-libs/v3/httpserver" - "github.com/formancehq/go-libs/v3/licence" - "github.com/formancehq/go-libs/v3/otlp/otlpmetrics" - "github.com/formancehq/go-libs/v3/publish" - "github.com/formancehq/go-libs/v3/service" - "github.com/formancehq/go-libs/v3/temporal" + auth "github.com/formancehq/go-libs/v5/pkg/authn/jwt" + "github.com/formancehq/go-libs/v5/pkg/authn/licence" + "github.com/formancehq/go-libs/v5/pkg/cloud/aws/iam" + "github.com/formancehq/go-libs/v5/pkg/fx/servicefx" + "github.com/formancehq/go-libs/v5/pkg/fx/transportfx" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" + otlpmetrics "github.com/formancehq/go-libs/v5/pkg/observe/metrics" + "github.com/formancehq/go-libs/v5/pkg/service" + "github.com/formancehq/go-libs/v5/pkg/service/health" + bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect" + "github.com/formancehq/go-libs/v5/pkg/transport/httpserver" + "github.com/formancehq/go-libs/v5/pkg/workflow/temporal" "github.com/formancehq/orchestration/internal/api" v1 "github.com/formancehq/orchestration/internal/api/v1" v2 "github.com/formancehq/orchestration/internal/api/v2" @@ -25,8 +27,8 @@ import ( func healthCheckModule() fx.Option { return fx.Options( - health.Module(), - health.ProvideHealthCheck(func() health.NamedCheck { + servicefx.HealthModule(), + servicefx.ProvideHealthCheck(func() health.NamedCheck { return health.NewNamedCheck("default", health.CheckFn(func(ctx context.Context) error { return nil })) @@ -64,7 +66,7 @@ func newServeCommand() *cobra.Command { }), api.NewModule(service.IsDebug(cmd)), fx.Invoke(func(lc fx.Lifecycle, router *chi.Mux) { - lc.Append(httpserver.NewHook(router, httpserver.WithAddress(listen))) + lc.Append(transportfx.FXHook(httpserver.NewHook(router, httpserver.WithAddress(listen)))) }), } worker, _ := cmd.Flags().GetBool(workerFlag) diff --git a/cmd/worker.go b/cmd/worker.go index 150d3b7..e5db6c2 100644 --- a/cmd/worker.go +++ b/cmd/worker.go @@ -4,13 +4,13 @@ import ( "net/http" sdk "github.com/formancehq/formance-sdk-go/v3" - "github.com/formancehq/go-libs/v3/aws/iam" - "github.com/formancehq/go-libs/v3/bun/bunconnect" - "github.com/formancehq/go-libs/v3/licence" - "github.com/formancehq/go-libs/v3/otlp/otlpmetrics" - "github.com/formancehq/go-libs/v3/publish" - "github.com/formancehq/go-libs/v3/service" - "github.com/formancehq/go-libs/v3/temporal" + "github.com/formancehq/go-libs/v5/pkg/authn/licence" + "github.com/formancehq/go-libs/v5/pkg/cloud/aws/iam" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" + otlpmetrics "github.com/formancehq/go-libs/v5/pkg/observe/metrics" + "github.com/formancehq/go-libs/v5/pkg/service" + bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect" + "github.com/formancehq/go-libs/v5/pkg/workflow/temporal" "github.com/formancehq/orchestration/internal/temporalworker" "github.com/formancehq/orchestration/internal/triggers" "github.com/spf13/cobra" @@ -35,13 +35,13 @@ func workerOptions(cmd *cobra.Command) fx.Option { stack, _ := cmd.Flags().GetString(stackFlag) temporalTaskQueue, _ := cmd.Flags().GetString(temporal.TemporalTaskQueueFlag) - temporalMaxParallelActivities, _ := cmd.Flags().GetInt(temporal.TemporalMaxParallelActivitiesFlag) + temporalMaxParallelActivities, _ := cmd.Flags().GetFloat64(temporal.TemporalMaxParallelActivitiesFlag) topics, _ := cmd.Flags().GetStringSlice(topicsFlag) return fx.Options( stackClientModule(cmd), temporalworker.NewWorkerModule(temporalTaskQueue, worker.Options{ - TaskQueueActivitiesPerSecond: float64(temporalMaxParallelActivities), + TaskQueueActivitiesPerSecond: temporalMaxParallelActivities, }), triggers.NewListenerModule( stack, diff --git a/go.mod b/go.mod index 8b2d1f6..0a6759e 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,7 @@ require ( github.com/ThreeDotsLabs/watermill v1.5.1 github.com/expr-lang/expr v1.17.7 github.com/formancehq/formance-sdk-go/v3 v3.2.0 - github.com/formancehq/go-libs/v3 v3.3.0 - github.com/formancehq/go-libs/v5 v5.1.1-0.20260522083443-d2a60ed2e0dd + github.com/formancehq/go-libs/v5 v5.3.0 github.com/go-chi/chi/v5 v5.2.5 github.com/go-playground/validator/v10 v10.24.0 github.com/google/uuid v1.6.0 @@ -42,6 +41,7 @@ require ( github.com/ajg/form v1.7.1 // indirect github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 // indirect github.com/aws/aws-sdk-go-v2 v1.41.5 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect github.com/aws/aws-sdk-go-v2/config v1.32.12 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.19.12 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.20 // indirect @@ -49,8 +49,12 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 // indirect github.com/aws/aws-sdk-go-v2/service/signin v1.0.8 // indirect github.com/aws/aws-sdk-go-v2/service/sns v1.39.14 // indirect github.com/aws/aws-sdk-go-v2/service/sqs v1.42.24 // indirect @@ -67,7 +71,6 @@ require ( github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/dnwe/otelsarama v0.0.0-20240308230250-9388d9d40bc0 // indirect github.com/docker/cli v29.3.0+incompatible // indirect @@ -79,7 +82,6 @@ require ( github.com/ebitengine/purego v0.10.0 // indirect github.com/ericlagergren/decimal v0.0.0-20240411145413-00de7ca16731 // indirect github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect - github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/gabriel-vasile/mimetype v1.4.8 // indirect github.com/getkin/kin-openapi v0.134.0 // indirect @@ -96,7 +98,6 @@ require ( github.com/go-sql-driver/mysql v1.9.3 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect - github.com/goccy/go-json v0.10.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/mock v1.7.0-rc.1 // indirect @@ -104,13 +105,11 @@ require ( github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/gorilla/mux v1.8.1 // indirect - github.com/gorilla/schema v1.4.1 // indirect github.com/gorilla/securecookie v1.1.2 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-hclog v1.6.3 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-retryablehttp v0.7.8 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect @@ -131,17 +130,9 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/klauspost/compress v1.18.4 // indirect github.com/leodido/go-urn v1.4.0 // indirect - github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect - github.com/lestrrat-go/blackmagic v1.0.2 // indirect - github.com/lestrrat-go/httpcc v1.0.1 // indirect - github.com/lestrrat-go/iter v1.0.2 // indirect - github.com/lestrrat-go/jwx v1.2.31 // indirect - github.com/lestrrat-go/option v1.0.1 // indirect github.com/lithammer/shortuuid/v3 v3.0.7 // indirect github.com/lufia/plan9stats v0.0.0-20260216142805-b3301c5f2a88 // indirect github.com/mailru/easyjson v0.9.2 // indirect - github.com/mattn/go-colorable v0.1.14 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/moby/api v1.54.0 // indirect github.com/moby/moby/client v0.3.0 // indirect @@ -149,7 +140,6 @@ require ( github.com/moby/term v0.5.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/muhlemmer/gu v0.3.1 // indirect - github.com/muhlemmer/httpforwarded v0.1.0 // indirect github.com/nats-io/nats.go v1.49.0 // indirect github.com/nats-io/nkeys v0.4.15 // indirect github.com/nats-io/nuid v1.0.1 // indirect @@ -171,7 +161,6 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect github.com/riandyrn/otelchi v0.12.2 // indirect github.com/robfig/cron v1.2.0 // indirect - github.com/rs/cors v1.11.1 // indirect github.com/shirou/gopsutil/v4 v4.26.2 // indirect github.com/sirupsen/logrus v1.9.4 // indirect github.com/stretchr/objx v0.5.3 // indirect @@ -195,7 +184,6 @@ require ( github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/xo/dburl v0.24.2 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - github.com/zitadel/oidc/v2 v2.12.2 // indirect github.com/zitadel/oidc/v3 v3.45.3 // indirect github.com/zitadel/schema v1.3.2 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect @@ -232,5 +220,4 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect google.golang.org/grpc v1.80.0 // indirect google.golang.org/protobuf v1.36.11 // indirect - gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect ) diff --git a/go.sum b/go.sum index 990b9fb..fbad656 100644 --- a/go.sum +++ b/go.sum @@ -31,6 +31,8 @@ github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 h1:2jAwFwA0Xgcx94dUId+K24yFabsK github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4/go.mod h1:MVYeeOhILFFemC/XlYTClvBjYZrg/EPd3ts885KrNTI= github.com/aws/aws-sdk-go-v2 v1.41.5 h1:dj5kopbwUsVUVFgO4Fi5BIT3t4WyqIDjGKCangnV/yY= github.com/aws/aws-sdk-go-v2 v1.41.5/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 h1:eBMB84YGghSocM7PsjmmPffTa+1FBUeNvGvFou6V/4o= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI= github.com/aws/aws-sdk-go-v2/config v1.32.12 h1:O3csC7HUGn2895eNrLytOJQdoL2xyJy0iYXhoZ1OmP0= github.com/aws/aws-sdk-go-v2/config v1.32.12/go.mod h1:96zTvoOFR4FURjI+/5wY1vc1ABceROO4lWgWJuxgy0g= github.com/aws/aws-sdk-go-v2/credentials v1.19.12 h1:oqtA6v+y5fZg//tcTWahyN9PEn5eDU/Wpvc2+kJ4aY8= @@ -45,10 +47,18 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 h1:PEgGVtPoB6NTpPrBgq github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21/go.mod h1:p+hz+PRAYlY3zcpJhPwXlLC4C+kqn70WIHwnzAfs6ps= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 h1:qYQ4pzQ2Oz6WpQ8T3HvGHnZydA72MnLuFK9tJwmrbHw= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6/go.mod h1:O3h0IK87yXci+kg6flUKzJnWeziQUKciKrLjcatSNcY= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 h1:rWyie/PxDRIdhNf4DzRk0lvjVOqFJuNnO8WwaIRVxzQ= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22/go.mod h1:zd/JsJ4P7oGfUhXn1VyLqaRZwPmZwg44Jf2dS84Dm3Y= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 h1:5EniKhLZe4xzL7a+fU3C2tfUN4nWIqlLesfrjkuPFTY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7/go.mod h1:x0nZssQ3qZSnIcePWLvcoFisRXJzcTVvYpAAdYX8+GI= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 h1:JRaIgADQS/U6uXDqlPiefP32yXTda7Kqfx+LgspooZM= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13/go.mod h1:CEuVn5WqOMilYl+tbccq8+N2ieCy0gVn3OtRb0vBNNM= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 h1:c31//R3xgIJMSC8S6hEVq+38DcvUlgFY0FM6mSI5oto= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21/go.mod h1:r6+pf23ouCB718FUxaqzZdbpYFyDtehyZcmP5KL9FkA= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 h1:ZlvrNcHSFFWURB8avufQq9gFsheUgjVD9536obIknfM= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21/go.mod h1:cv3TNhVrssKR0O/xxLJVRfd2oazSnZnkUeTf6ctUwfQ= +github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 h1:HwxWTbTrIHm5qY+CAEur0s/figc3qwvLWsNkF4RPToo= +github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3/go.mod h1:uoA43SdFwacedBfSgfFSjjCvYe8aYBS7EnU5GZ/YKMM= github.com/aws/aws-sdk-go-v2/service/signin v1.0.8 h1:0GFOLzEbOyZABS3PhYfBIx2rNBACYcKty+XGkTgw1ow= github.com/aws/aws-sdk-go-v2/service/signin v1.0.8/go.mod h1:LXypKvk85AROkKhOG6/YEcHFPoX+prKTowKnVdcaIxE= github.com/aws/aws-sdk-go-v2/service/sns v1.39.14 h1:p8WdWDh5AwSZdp19Haa3XMyPCICi9Z375a/Nu3IIEZY= @@ -86,8 +96,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnwe/otelsarama v0.0.0-20240308230250-9388d9d40bc0 h1:R2zQhFwSCyyd7L43igYjDrH0wkC/i+QBPELuY0HOu84= @@ -112,17 +120,14 @@ github.com/expr-lang/expr v1.17.7 h1:Q0xY/e/2aCIp8g9s/LGvMDCC5PxYlvHgDZRQ4y16JX8 github.com/expr-lang/expr v1.17.7/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4= github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw= github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/formancehq/formance-sdk-go/v3 v3.2.0 h1:3zxYSu71jjCj5XMBvT6bTm2HlbZWvm3txYcuONJUbWw= github.com/formancehq/formance-sdk-go/v3 v3.2.0/go.mod h1:XivkqQzjOtR3W7hqIFYcUN11UIf+X8/V1yoPPnGBQVU= -github.com/formancehq/go-libs/v3 v3.3.0 h1:Qs6oPRNHJbR4xu3Lzl2zGAiQD94XLpabAFYPq3YBqK0= -github.com/formancehq/go-libs/v3 v3.3.0/go.mod h1:kr5pgap99LPdSVcYWgI+mCN51wr5D+YxEnt9A6JUiFU= -github.com/formancehq/go-libs/v5 v5.1.1-0.20260522083443-d2a60ed2e0dd h1:bXQ9pFcrDoaBFMzAyRNac5EWRuBn//wtQPzl5sXJcvU= -github.com/formancehq/go-libs/v5 v5.1.1-0.20260522083443-d2a60ed2e0dd/go.mod h1:0zJ6yzF4/Pu9lmKpswaEdQChpnxuMFsTxmhTCE1raXk= +github.com/formancehq/go-libs/v5 v5.3.0 h1:1+rXYjCNGZG0tQayESllEassrejzI/vc4Gz3p568tnU= +github.com/formancehq/go-libs/v5 v5.3.0/go.mod h1:ms6tCGw1yqB4qtEbAuqPOQegWo4rU48vDobNkK7Ak6U= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= @@ -171,8 +176,6 @@ github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro= github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= -github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= -github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -200,8 +203,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= -github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E= -github.com/gorilla/schema v1.4.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= @@ -254,8 +255,6 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/jeremija/gosubmit v0.2.8 h1:mmSITBz9JxVtu8eqbN+zmmwX7Ij2RidQxhcwRVI4wqA= -github.com/jeremija/gosubmit v0.2.8/go.mod h1:Ui+HS073lCFREXBbdfrJzMB57OI/bdxTiLtrDHHhFPI= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -272,19 +271,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A= -github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y= -github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N+AkAr5k= -github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU= -github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= -github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= -github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI= -github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= -github.com/lestrrat-go/jwx v1.2.31 h1:/OM9oNl/fzyldpv5HKZ9m7bTywa7COUfg8gujd9nJ54= -github.com/lestrrat-go/jwx v1.2.31/go.mod h1:eQJKoRwWcLg4PfD5CFA5gIZGxhPgoPYq9pZISdxLf0c= -github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= -github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= -github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lithammer/shortuuid/v3 v3.0.7 h1:trX0KTHy4Pbwo/6ia8fscyHoGA+mf1jWbPJVuvyJQQ8= @@ -295,12 +281,8 @@ github.com/mailru/easyjson v0.9.2 h1:dX8U45hQsZpxd80nLvDGihsQ/OxlvTkVUXH2r/8cb2M github.com/mailru/easyjson v0.9.2/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo= github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE= @@ -321,8 +303,6 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/muhlemmer/gu v0.3.1 h1:7EAqmFrW7n3hETvuAdmFmn4hS8W+z3LgKtrnow+YzNM= github.com/muhlemmer/gu v0.3.1/go.mod h1:YHtHR+gxM+bKEIIs7Hmi9sPT3ZDUvTN/i88wQpZkrdM= -github.com/muhlemmer/httpforwarded v0.1.0 h1:x4DLrzXdliq8mprgUMR0olDvHGkou5BJsK/vWUetyzY= -github.com/muhlemmer/httpforwarded v0.1.0/go.mod h1:yo9czKedo2pdZhoXe+yDkGVbU0TJ0q9oQ90BVoDEtw0= github.com/nats-io/jwt/v2 v2.8.1 h1:V0xpGuD/N8Mi+fQNDynXohVvp7ZztevW5io8CUWlPmU= github.com/nats-io/jwt/v2 v2.8.1/go.mod h1:nWnOEEiVMiKHQpnAy4eXlizVEtSfzacZ1Q43LIRavZg= github.com/nats-io/nats-server/v2 v2.12.6 h1:Egbx9Vl7Ch8wTtpXPGqbehkZ+IncKqShUxvrt1+Enc8= @@ -374,8 +354,6 @@ github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= -github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shirou/gopsutil/v4 v4.26.2 h1:X8i6sicvUFih4BmYIGT1m2wwgw2VG9YgrDTi7cIRGUI= github.com/shirou/gopsutil/v4 v4.26.2/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ= @@ -393,10 +371,8 @@ github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4= github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= @@ -460,8 +436,6 @@ github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -github.com/zitadel/oidc/v2 v2.12.2 h1:3kpckg4rurgw7w7aLJrq7yvRxb2pkNOtD08RH42vPEs= -github.com/zitadel/oidc/v2 v2.12.2/go.mod h1:vhP26g1g4YVntcTi0amMYW3tJuid70nxqxf+kb6XKgg= github.com/zitadel/oidc/v3 v3.45.3 h1:iaicqH5M7L5a973DTaG9UVSE14Z6Nj6hN41pp7kYBIw= github.com/zitadel/oidc/v3 v3.45.3/go.mod h1:yerW4/1YA5rUgjSjHsJ4HRnMbaKsyeIJkzyQrwDQ4t8= github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI= @@ -561,23 +535,17 @@ golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -618,8 +586,6 @@ google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/go-jose/go-jose.v2 v2.6.3 h1:nt80fvSDlhKWQgSWyHyy5CfmlQr+asih51R8PTWNKKs= -gopkg.in/go-jose/go-jose.v2 v2.6.3/go.mod h1:zzZDPkNNw/c9IE7Z9jr11mBZQhKQTMzoEEIoEdZlFBI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/internal/api/backend.go b/internal/api/backend.go index 2fb14c6..dff2277 100644 --- a/internal/api/backend.go +++ b/internal/api/backend.go @@ -3,7 +3,7 @@ package api import ( "context" - "github.com/formancehq/go-libs/v3/bun/bunpaginate" + bunpaginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" "github.com/formancehq/orchestration/internal/triggers" "github.com/formancehq/orchestration/internal/workflow" diff --git a/internal/api/backend_generated.go b/internal/api/backend_generated.go index 73c8685..ff37c87 100644 --- a/internal/api/backend_generated.go +++ b/internal/api/backend_generated.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - bunpaginate "github.com/formancehq/go-libs/v3/bun/bunpaginate" + paginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" triggers "github.com/formancehq/orchestration/internal/triggers" workflow "github.com/formancehq/orchestration/internal/workflow" gomock "go.uber.org/mock/gomock" @@ -146,10 +146,10 @@ func (mr *MockBackendMockRecorder) GetTrigger(ctx, triggerID any) *gomock.Call { } // ListInstances mocks base method. -func (m *MockBackend) ListInstances(ctx context.Context, pagination workflow.ListInstancesQuery) (*bunpaginate.Cursor[workflow.Instance], error) { +func (m *MockBackend) ListInstances(ctx context.Context, pagination workflow.ListInstancesQuery) (*paginate.Cursor[workflow.Instance], error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ListInstances", ctx, pagination) - ret0, _ := ret[0].(*bunpaginate.Cursor[workflow.Instance]) + ret0, _ := ret[0].(*paginate.Cursor[workflow.Instance]) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -161,10 +161,10 @@ func (mr *MockBackendMockRecorder) ListInstances(ctx, pagination any) *gomock.Ca } // ListTriggers mocks base method. -func (m *MockBackend) ListTriggers(ctx context.Context, query triggers.ListTriggersQuery) (*bunpaginate.Cursor[triggers.Trigger], error) { +func (m *MockBackend) ListTriggers(ctx context.Context, query triggers.ListTriggersQuery) (*paginate.Cursor[triggers.Trigger], error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ListTriggers", ctx, query) - ret0, _ := ret[0].(*bunpaginate.Cursor[triggers.Trigger]) + ret0, _ := ret[0].(*paginate.Cursor[triggers.Trigger]) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -176,10 +176,10 @@ func (mr *MockBackendMockRecorder) ListTriggers(ctx, query any) *gomock.Call { } // ListTriggersOccurrences mocks base method. -func (m *MockBackend) ListTriggersOccurrences(ctx context.Context, query triggers.ListTriggersOccurrencesQuery) (*bunpaginate.Cursor[triggers.Occurrence], error) { +func (m *MockBackend) ListTriggersOccurrences(ctx context.Context, query triggers.ListTriggersOccurrencesQuery) (*paginate.Cursor[triggers.Occurrence], error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ListTriggersOccurrences", ctx, query) - ret0, _ := ret[0].(*bunpaginate.Cursor[triggers.Occurrence]) + ret0, _ := ret[0].(*paginate.Cursor[triggers.Occurrence]) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -191,10 +191,10 @@ func (mr *MockBackendMockRecorder) ListTriggersOccurrences(ctx, query any) *gomo } // ListWorkflows mocks base method. -func (m *MockBackend) ListWorkflows(ctx context.Context, query bunpaginate.OffsetPaginatedQuery[any]) (*bunpaginate.Cursor[workflow.Workflow], error) { +func (m *MockBackend) ListWorkflows(ctx context.Context, query paginate.OffsetPaginatedQuery[any]) (*paginate.Cursor[workflow.Workflow], error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ListWorkflows", ctx, query) - ret0, _ := ret[0].(*bunpaginate.Cursor[workflow.Workflow]) + ret0, _ := ret[0].(*paginate.Cursor[workflow.Workflow]) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/internal/api/handler_info.go b/internal/api/handler_info.go index 983ca3a..1dfed4a 100644 --- a/internal/api/handler_info.go +++ b/internal/api/handler_info.go @@ -3,7 +3,7 @@ package api import ( "net/http" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" ) type ServiceInfo struct { diff --git a/internal/api/module.go b/internal/api/module.go index a0429ec..41a5e45 100644 --- a/internal/api/module.go +++ b/internal/api/module.go @@ -2,8 +2,8 @@ package api import ( "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/v3/auth" - "github.com/formancehq/go-libs/v3/health" + auth "github.com/formancehq/go-libs/v5/pkg/authn/jwt" + "github.com/formancehq/go-libs/v5/pkg/service/health" "github.com/go-chi/chi/v5" "go.uber.org/fx" ) diff --git a/internal/api/module_test.go b/internal/api/module_test.go index c71fcc1..5e467f0 100644 --- a/internal/api/module_test.go +++ b/internal/api/module_test.go @@ -8,12 +8,13 @@ import ( "github.com/ThreeDotsLabs/watermill/message" "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/bun/bunpaginate" + sharedapi "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" - "github.com/formancehq/go-libs/v3/auth" + auth "github.com/formancehq/go-libs/v5/pkg/authn/jwt" - "github.com/formancehq/go-libs/v3/health" + "github.com/formancehq/go-libs/v5/pkg/fx/authnfx" "github.com/formancehq/go-libs/v5/pkg/messaging/publish" + "github.com/formancehq/go-libs/v5/pkg/service/health" "github.com/formancehq/orchestration/internal/api" v1 "github.com/formancehq/orchestration/internal/api/v1" v2 "github.com/formancehq/orchestration/internal/api/v2" @@ -31,7 +32,7 @@ func TestModule(t *testing.T) { var mux *chi.Mux app := fxtest.New(t, - auth.Module(auth.ModuleConfig{Enabled: false}), + authnfx.JWTModule(auth.Config{Enabled: false}), fx.Supply(&health.HealthController{}), fx.Supply(api.ServiceInfo{}), fx.Provide(func() message.Publisher { return publish.InMemory() }), diff --git a/internal/api/router.go b/internal/api/router.go index 8868db5..5821f9c 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -6,9 +6,9 @@ import ( "sort" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/v3/auth" - "github.com/formancehq/go-libs/v3/health" "github.com/formancehq/go-libs/v5/pkg/audit/httpaudit" + auth "github.com/formancehq/go-libs/v5/pkg/authn/jwt" + "github.com/formancehq/go-libs/v5/pkg/service/health" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" ) diff --git a/internal/api/v1/handler_abort_workflow_instance.go b/internal/api/v1/handler_abort_workflow_instance.go index ea151fe..f5bc524 100644 --- a/internal/api/v1/handler_abort_workflow_instance.go +++ b/internal/api/v1/handler_abort_workflow_instance.go @@ -5,7 +5,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func abortWorkflowInstance(backend api2.Backend) http.HandlerFunc { diff --git a/internal/api/v1/handler_create_trigger.go b/internal/api/v1/handler_create_trigger.go index 359f93a..4985d9b 100644 --- a/internal/api/v1/handler_create_trigger.go +++ b/internal/api/v1/handler_create_trigger.go @@ -6,7 +6,7 @@ import ( "github.com/formancehq/orchestration/internal/api" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/triggers" "github.com/pkg/errors" ) diff --git a/internal/api/v1/handler_create_workflow.go b/internal/api/v1/handler_create_workflow.go index 926f637..b72eb3b 100644 --- a/internal/api/v1/handler_create_workflow.go +++ b/internal/api/v1/handler_create_workflow.go @@ -6,7 +6,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" api2 "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" "github.com/pkg/errors" diff --git a/internal/api/v1/handler_delete_trigger.go b/internal/api/v1/handler_delete_trigger.go index a10787d..be34b1d 100644 --- a/internal/api/v1/handler_delete_trigger.go +++ b/internal/api/v1/handler_delete_trigger.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/api" "github.com/pkg/errors" ) diff --git a/internal/api/v1/handler_delete_workflow.go b/internal/api/v1/handler_delete_workflow.go index a187a47..34a6afc 100644 --- a/internal/api/v1/handler_delete_workflow.go +++ b/internal/api/v1/handler_delete_workflow.go @@ -6,7 +6,7 @@ import ( "github.com/go-playground/validator/v10" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" api2 "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" ) diff --git a/internal/api/v1/handler_delete_workflow_test.go b/internal/api/v1/handler_delete_workflow_test.go index 6a78b98..3a6fb8b 100644 --- a/internal/api/v1/handler_delete_workflow_test.go +++ b/internal/api/v1/handler_delete_workflow_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/testing/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/testing/api" "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" diff --git a/internal/api/v1/handler_get_trigger.go b/internal/api/v1/handler_get_trigger.go index 1bdb81e..7bb2a03 100644 --- a/internal/api/v1/handler_get_trigger.go +++ b/internal/api/v1/handler_get_trigger.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/api" "github.com/pkg/errors" ) diff --git a/internal/api/v1/handler_list_instances.go b/internal/api/v1/handler_list_instances.go index 0aa5a68..e2a7ea0 100644 --- a/internal/api/v1/handler_list_instances.go +++ b/internal/api/v1/handler_list_instances.go @@ -7,7 +7,7 @@ import ( api "github.com/formancehq/orchestration/internal/api" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func listInstances(backend api.Backend) http.HandlerFunc { diff --git a/internal/api/v1/handler_list_instances_test.go b/internal/api/v1/handler_list_instances_test.go index 4421d12..1447306 100644 --- a/internal/api/v1/handler_list_instances_test.go +++ b/internal/api/v1/handler_list_instances_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/formancehq/go-libs/v3/logging" + "github.com/formancehq/go-libs/v5/pkg/observe/log" "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/testing/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/testing/api" "github.com/google/uuid" diff --git a/internal/api/v1/handler_list_triggers.go b/internal/api/v1/handler_list_triggers.go index cba54a6..c948100 100644 --- a/internal/api/v1/handler_list_triggers.go +++ b/internal/api/v1/handler_list_triggers.go @@ -3,12 +3,12 @@ package v1 import ( "net/http" - "github.com/formancehq/go-libs/v3/bun/bunpaginate" + bunpaginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" "github.com/formancehq/orchestration/internal/triggers" "github.com/formancehq/orchestration/internal/api" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func listTriggers(backend api.Backend) func(writer http.ResponseWriter, request *http.Request) { diff --git a/internal/api/v1/handler_list_triggers_occurrences.go b/internal/api/v1/handler_list_triggers_occurrences.go index beda917..84cf312 100644 --- a/internal/api/v1/handler_list_triggers_occurrences.go +++ b/internal/api/v1/handler_list_triggers_occurrences.go @@ -5,7 +5,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/triggers" ) diff --git a/internal/api/v1/handler_list_workflows.go b/internal/api/v1/handler_list_workflows.go index fd72af0..b7c6aa4 100644 --- a/internal/api/v1/handler_list_workflows.go +++ b/internal/api/v1/handler_list_workflows.go @@ -3,11 +3,11 @@ package v1 import ( "net/http" - "github.com/formancehq/go-libs/v3/bun/bunpaginate" + bunpaginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func listWorkflows(backend api2.Backend) http.HandlerFunc { diff --git a/internal/api/v1/handler_post_event.go b/internal/api/v1/handler_post_event.go index 5d5ce64..9349666 100644 --- a/internal/api/v1/handler_post_event.go +++ b/internal/api/v1/handler_post_event.go @@ -6,7 +6,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/workflow" ) diff --git a/internal/api/v1/handler_read_instance.go b/internal/api/v1/handler_read_instance.go index d0b94a8..4e27292 100644 --- a/internal/api/v1/handler_read_instance.go +++ b/internal/api/v1/handler_read_instance.go @@ -5,7 +5,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func readInstance(backend api2.Backend) http.HandlerFunc { diff --git a/internal/api/v1/handler_read_instance_history.go b/internal/api/v1/handler_read_instance_history.go index 4fc6de9..1617fc9 100644 --- a/internal/api/v1/handler_read_instance_history.go +++ b/internal/api/v1/handler_read_instance_history.go @@ -5,7 +5,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func readInstanceHistory(backend api2.Backend) http.HandlerFunc { diff --git a/internal/api/v1/handler_read_instance_test.go b/internal/api/v1/handler_read_instance_test.go index 00f88ca..6e751a6 100644 --- a/internal/api/v1/handler_read_instance_test.go +++ b/internal/api/v1/handler_read_instance_test.go @@ -10,9 +10,9 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/testing/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/testing/api" - "github.com/formancehq/go-libs/v3/logging" + "github.com/formancehq/go-libs/v5/pkg/observe/log" "github.com/google/uuid" "github.com/formancehq/orchestration/internal/api" diff --git a/internal/api/v1/handler_read_stage_history.go b/internal/api/v1/handler_read_stage_history.go index 0865357..6f6906a 100644 --- a/internal/api/v1/handler_read_stage_history.go +++ b/internal/api/v1/handler_read_stage_history.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" api2 "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" "github.com/pkg/errors" diff --git a/internal/api/v1/handler_read_workflow.go b/internal/api/v1/handler_read_workflow.go index e00432c..0af13a8 100644 --- a/internal/api/v1/handler_read_workflow.go +++ b/internal/api/v1/handler_read_workflow.go @@ -5,7 +5,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func readWorkflow(backend api2.Backend) http.HandlerFunc { diff --git a/internal/api/v1/handler_run_workflow.go b/internal/api/v1/handler_run_workflow.go index a0ac1a2..10a71e8 100644 --- a/internal/api/v1/handler_run_workflow.go +++ b/internal/api/v1/handler_run_workflow.go @@ -7,7 +7,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/workflow" ) diff --git a/internal/api/v1/handler_run_workflow_test.go b/internal/api/v1/handler_run_workflow_test.go index c89bd98..d220b9b 100644 --- a/internal/api/v1/handler_run_workflow_test.go +++ b/internal/api/v1/handler_run_workflow_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/testing/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/testing/api" "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" diff --git a/internal/api/v1/main_test.go b/internal/api/v1/main_test.go index 0853ede..eb8c5d5 100644 --- a/internal/api/v1/main_test.go +++ b/internal/api/v1/main_test.go @@ -6,15 +6,15 @@ import ( "net/http" "testing" - "github.com/formancehq/go-libs/v3/auth" - "github.com/formancehq/go-libs/v3/bun/bunconnect" - "github.com/formancehq/go-libs/v3/bun/bundebug" - "github.com/formancehq/go-libs/v3/logging" - "github.com/formancehq/go-libs/v3/publish" - "github.com/formancehq/go-libs/v3/temporal" - "github.com/formancehq/go-libs/v3/testing/docker" - "github.com/formancehq/go-libs/v3/testing/platform/pgtesting" - "github.com/formancehq/go-libs/v3/testing/utils" + auth "github.com/formancehq/go-libs/v5/pkg/authn/jwt" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" + "github.com/formancehq/go-libs/v5/pkg/observe/log" + bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect" + bundebug "github.com/formancehq/go-libs/v5/pkg/storage/bun/debug" + "github.com/formancehq/go-libs/v5/pkg/testing/docker" + "github.com/formancehq/go-libs/v5/pkg/testing/platform/pgtesting" + "github.com/formancehq/go-libs/v5/pkg/testing/utils" + "github.com/formancehq/go-libs/v5/pkg/workflow/temporal" "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/storage" "github.com/formancehq/orchestration/internal/temporalworker" diff --git a/internal/api/v1/router.go b/internal/api/v1/router.go index e8f2f3d..f0cf564 100644 --- a/internal/api/v1/router.go +++ b/internal/api/v1/router.go @@ -5,9 +5,9 @@ import ( "github.com/go-chi/chi/v5" - "github.com/formancehq/go-libs/v3/service" + "github.com/formancehq/go-libs/v5/pkg/transport/httpserver" - "github.com/formancehq/go-libs/v3/auth" + auth "github.com/formancehq/go-libs/v5/pkg/authn/jwt" "github.com/formancehq/orchestration/internal/api" ) @@ -16,7 +16,7 @@ func newRouter(backend api.Backend, authenticator auth.Authenticator, debug bool r.Group(func(r chi.Router) { // Plug middleware to handle traces r.Use(auth.Middleware(authenticator)) - r.Use(service.OTLPMiddleware("orchestration", debug)) + r.Use(httpserver.OTLPMiddleware("orchestration", debug)) r.Route("/triggers", func(r chi.Router) { r.Get("/", listTriggers(backend)) r.Post("/", createTrigger(backend)) diff --git a/internal/api/v2/handler_abort_workflow_instance.go b/internal/api/v2/handler_abort_workflow_instance.go index 4d16f8e..05cb2e1 100644 --- a/internal/api/v2/handler_abort_workflow_instance.go +++ b/internal/api/v2/handler_abort_workflow_instance.go @@ -5,7 +5,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func abortWorkflowInstance(backend api2.Backend) http.HandlerFunc { diff --git a/internal/api/v2/handler_create_trigger.go b/internal/api/v2/handler_create_trigger.go index 8ca5c20..d774f83 100644 --- a/internal/api/v2/handler_create_trigger.go +++ b/internal/api/v2/handler_create_trigger.go @@ -6,7 +6,7 @@ import ( "github.com/formancehq/orchestration/internal/api" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/triggers" "github.com/pkg/errors" ) diff --git a/internal/api/v2/handler_create_workflow.go b/internal/api/v2/handler_create_workflow.go index 0fe7292..9cbbaec 100644 --- a/internal/api/v2/handler_create_workflow.go +++ b/internal/api/v2/handler_create_workflow.go @@ -6,7 +6,7 @@ import ( "gopkg.in/yaml.v3" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" "github.com/pkg/errors" diff --git a/internal/api/v2/handler_delete_trigger.go b/internal/api/v2/handler_delete_trigger.go index 40572f2..cce2673 100644 --- a/internal/api/v2/handler_delete_trigger.go +++ b/internal/api/v2/handler_delete_trigger.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/api" "github.com/pkg/errors" ) diff --git a/internal/api/v2/handler_delete_workflow.go b/internal/api/v2/handler_delete_workflow.go index daf6d2f..5be4e0b 100644 --- a/internal/api/v2/handler_delete_workflow.go +++ b/internal/api/v2/handler_delete_workflow.go @@ -6,7 +6,7 @@ import ( "github.com/go-playground/validator/v10" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" api2 "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" ) diff --git a/internal/api/v2/handler_delete_workflow_test.go b/internal/api/v2/handler_delete_workflow_test.go index 47e590f..ffa73f1 100644 --- a/internal/api/v2/handler_delete_workflow_test.go +++ b/internal/api/v2/handler_delete_workflow_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/testing/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/testing/api" "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" diff --git a/internal/api/v2/handler_get_trigger.go b/internal/api/v2/handler_get_trigger.go index c62651a..4dfcfa6 100644 --- a/internal/api/v2/handler_get_trigger.go +++ b/internal/api/v2/handler_get_trigger.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/api" "github.com/pkg/errors" ) diff --git a/internal/api/v2/handler_list_instances.go b/internal/api/v2/handler_list_instances.go index 4cb5513..7586ab0 100644 --- a/internal/api/v2/handler_list_instances.go +++ b/internal/api/v2/handler_list_instances.go @@ -3,12 +3,12 @@ package v2 import ( "net/http" - "github.com/formancehq/go-libs/v3/bun/bunpaginate" + bunpaginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" "github.com/formancehq/orchestration/internal/workflow" api "github.com/formancehq/orchestration/internal/api" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func listInstances(backend api.Backend) http.HandlerFunc { diff --git a/internal/api/v2/handler_list_instances_test.go b/internal/api/v2/handler_list_instances_test.go index 9915810..59cf6ab 100644 --- a/internal/api/v2/handler_list_instances_test.go +++ b/internal/api/v2/handler_list_instances_test.go @@ -10,9 +10,9 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/testing/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/testing/api" - "github.com/formancehq/go-libs/v3/bun/bunpaginate" + bunpaginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" "github.com/google/uuid" diff --git a/internal/api/v2/handler_list_triggers.go b/internal/api/v2/handler_list_triggers.go index 78c240f..1b1607f 100644 --- a/internal/api/v2/handler_list_triggers.go +++ b/internal/api/v2/handler_list_triggers.go @@ -3,12 +3,12 @@ package v2 import ( "net/http" - "github.com/formancehq/go-libs/v3/bun/bunpaginate" + bunpaginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" "github.com/formancehq/orchestration/internal/triggers" "github.com/formancehq/orchestration/internal/api" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func listTriggers(backend api.Backend) func(writer http.ResponseWriter, request *http.Request) { diff --git a/internal/api/v2/handler_list_triggers_occurrences.go b/internal/api/v2/handler_list_triggers_occurrences.go index fc4e39c..e024d03 100644 --- a/internal/api/v2/handler_list_triggers_occurrences.go +++ b/internal/api/v2/handler_list_triggers_occurrences.go @@ -5,10 +5,10 @@ import ( "github.com/go-chi/chi/v5" - "github.com/formancehq/go-libs/v3/bun/bunpaginate" + bunpaginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" "github.com/formancehq/orchestration/internal/triggers" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/api" ) diff --git a/internal/api/v2/handler_list_workflows.go b/internal/api/v2/handler_list_workflows.go index e28e840..c302a7b 100644 --- a/internal/api/v2/handler_list_workflows.go +++ b/internal/api/v2/handler_list_workflows.go @@ -3,11 +3,11 @@ package v2 import ( "net/http" - "github.com/formancehq/go-libs/v3/bun/bunpaginate" + bunpaginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" "github.com/formancehq/orchestration/internal/api" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func listWorkflows(backend api.Backend) http.HandlerFunc { diff --git a/internal/api/v2/handler_post_event.go b/internal/api/v2/handler_post_event.go index 2f6afea..d314f6b 100644 --- a/internal/api/v2/handler_post_event.go +++ b/internal/api/v2/handler_post_event.go @@ -6,7 +6,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/workflow" ) diff --git a/internal/api/v2/handler_read_instance.go b/internal/api/v2/handler_read_instance.go index 2ac07d4..6fee757 100644 --- a/internal/api/v2/handler_read_instance.go +++ b/internal/api/v2/handler_read_instance.go @@ -5,7 +5,7 @@ import ( "github.com/formancehq/orchestration/internal/api" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func readInstance(backend api.Backend) http.HandlerFunc { diff --git a/internal/api/v2/handler_read_instance_history.go b/internal/api/v2/handler_read_instance_history.go index 11a25be..2f9f2e0 100644 --- a/internal/api/v2/handler_read_instance_history.go +++ b/internal/api/v2/handler_read_instance_history.go @@ -5,7 +5,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func readInstanceHistory(backend api2.Backend) http.HandlerFunc { diff --git a/internal/api/v2/handler_read_instance_test.go b/internal/api/v2/handler_read_instance_test.go index a881b31..1edbe50 100644 --- a/internal/api/v2/handler_read_instance_test.go +++ b/internal/api/v2/handler_read_instance_test.go @@ -10,7 +10,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/testing/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/testing/api" "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" diff --git a/internal/api/v2/handler_read_stage_history.go b/internal/api/v2/handler_read_stage_history.go index 9244218..78ab12a 100644 --- a/internal/api/v2/handler_read_stage_history.go +++ b/internal/api/v2/handler_read_stage_history.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" "github.com/pkg/errors" diff --git a/internal/api/v2/handler_read_workflow.go b/internal/api/v2/handler_read_workflow.go index 024e772..2d6ec38 100644 --- a/internal/api/v2/handler_read_workflow.go +++ b/internal/api/v2/handler_read_workflow.go @@ -5,7 +5,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" ) func readWorkflow(backend api2.Backend) http.HandlerFunc { diff --git a/internal/api/v2/handler_run_workflow.go b/internal/api/v2/handler_run_workflow.go index 8bc56ab..801a5a3 100644 --- a/internal/api/v2/handler_run_workflow.go +++ b/internal/api/v2/handler_run_workflow.go @@ -7,7 +7,7 @@ import ( api2 "github.com/formancehq/orchestration/internal/api" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/workflow" ) diff --git a/internal/api/v2/handler_run_workflow_test.go b/internal/api/v2/handler_run_workflow_test.go index 9cbbc61..53eaa51 100644 --- a/internal/api/v2/handler_run_workflow_test.go +++ b/internal/api/v2/handler_run_workflow_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/testing/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/testing/api" "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/workflow" diff --git a/internal/api/v2/handler_test_trigger.go b/internal/api/v2/handler_test_trigger.go index 152537e..a4be567 100644 --- a/internal/api/v2/handler_test_trigger.go +++ b/internal/api/v2/handler_test_trigger.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/formancehq/orchestration/internal/api" ) diff --git a/internal/api/v2/handler_test_trigger_test.go b/internal/api/v2/handler_test_trigger_test.go index ed55f89..add8743 100644 --- a/internal/api/v2/handler_test_trigger_test.go +++ b/internal/api/v2/handler_test_trigger_test.go @@ -10,9 +10,9 @@ import ( "github.com/go-chi/chi/v5" - sharedapi "github.com/formancehq/go-libs/v3/testing/api" + sharedapi "github.com/formancehq/go-libs/v5/pkg/testing/api" - "github.com/formancehq/go-libs/v3/pointer" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" "github.com/formancehq/orchestration/internal/triggers" "github.com/formancehq/orchestration/internal/api" diff --git a/internal/api/v2/main_test.go b/internal/api/v2/main_test.go index 7f2d2df..bd28b32 100644 --- a/internal/api/v2/main_test.go +++ b/internal/api/v2/main_test.go @@ -6,15 +6,15 @@ import ( "net/http" "testing" - "github.com/formancehq/go-libs/v3/auth" - "github.com/formancehq/go-libs/v3/bun/bunconnect" - "github.com/formancehq/go-libs/v3/bun/bundebug" - "github.com/formancehq/go-libs/v3/logging" - "github.com/formancehq/go-libs/v3/publish" - "github.com/formancehq/go-libs/v3/temporal" - "github.com/formancehq/go-libs/v3/testing/docker" - "github.com/formancehq/go-libs/v3/testing/platform/pgtesting" - "github.com/formancehq/go-libs/v3/testing/utils" + auth "github.com/formancehq/go-libs/v5/pkg/authn/jwt" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" + "github.com/formancehq/go-libs/v5/pkg/observe/log" + bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect" + bundebug "github.com/formancehq/go-libs/v5/pkg/storage/bun/debug" + "github.com/formancehq/go-libs/v5/pkg/testing/docker" + "github.com/formancehq/go-libs/v5/pkg/testing/platform/pgtesting" + "github.com/formancehq/go-libs/v5/pkg/testing/utils" + "github.com/formancehq/go-libs/v5/pkg/workflow/temporal" "github.com/formancehq/orchestration/internal/api" "github.com/formancehq/orchestration/internal/storage" "github.com/formancehq/orchestration/internal/temporalworker" diff --git a/internal/api/v2/router.go b/internal/api/v2/router.go index 1058a02..1126022 100644 --- a/internal/api/v2/router.go +++ b/internal/api/v2/router.go @@ -5,9 +5,9 @@ import ( "github.com/go-chi/chi/v5" - "github.com/formancehq/go-libs/v3/service" + "github.com/formancehq/go-libs/v5/pkg/transport/httpserver" - "github.com/formancehq/go-libs/v3/auth" + auth "github.com/formancehq/go-libs/v5/pkg/authn/jwt" "github.com/formancehq/orchestration/internal/api" ) @@ -16,7 +16,7 @@ func newRouter(backend api.Backend, authenticator auth.Authenticator, debug bool r.Group(func(r chi.Router) { // Plug middleware to handle traces r.Use(auth.Middleware(authenticator)) - r.Use(service.OTLPMiddleware("orchestration", debug)) + r.Use(httpserver.OTLPMiddleware("orchestration", debug)) r.Route("/triggers", func(r chi.Router) { r.Get("/", listTriggers(backend)) r.Post("/", createTrigger(backend)) diff --git a/internal/schema/map.go b/internal/schema/map.go index 8586a2f..ae2dc8d 100644 --- a/internal/schema/map.go +++ b/internal/schema/map.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/formancehq/go-libs/v3/time" + "github.com/formancehq/go-libs/v5/pkg/types/time" "github.com/formancehq/orchestration/internal/workflow/stages" "github.com/pkg/errors" diff --git a/internal/storage/main_test.go b/internal/storage/main_test.go index 230d333..b612c31 100644 --- a/internal/storage/main_test.go +++ b/internal/storage/main_test.go @@ -3,11 +3,11 @@ package storage import ( "testing" - "github.com/formancehq/go-libs/v3/logging" - "github.com/formancehq/go-libs/v3/testing/docker" - "github.com/formancehq/go-libs/v3/testing/utils" + "github.com/formancehq/go-libs/v5/pkg/observe/log" + "github.com/formancehq/go-libs/v5/pkg/testing/docker" + "github.com/formancehq/go-libs/v5/pkg/testing/utils" - "github.com/formancehq/go-libs/v3/testing/platform/pgtesting" + "github.com/formancehq/go-libs/v5/pkg/testing/platform/pgtesting" ) var srv *pgtesting.PostgresServer diff --git a/internal/storage/migrations.go b/internal/storage/migrations.go index 33ff453..3e0131c 100644 --- a/internal/storage/migrations.go +++ b/internal/storage/migrations.go @@ -3,7 +3,7 @@ package storage import ( "context" - "github.com/formancehq/go-libs/v3/migrations" + "github.com/formancehq/go-libs/v5/pkg/storage/migrations" "github.com/uptrace/bun" ) diff --git a/internal/storage/migrations_test.go b/internal/storage/migrations_test.go index 5918cec..098b0c1 100644 --- a/internal/storage/migrations_test.go +++ b/internal/storage/migrations_test.go @@ -3,11 +3,11 @@ package storage import ( "testing" - "github.com/formancehq/go-libs/v3/bun/bundebug" + bundebug "github.com/formancehq/go-libs/v5/pkg/storage/bun/debug" "github.com/uptrace/bun" - "github.com/formancehq/go-libs/v3/bun/bunconnect" - "github.com/formancehq/go-libs/v3/logging" + "github.com/formancehq/go-libs/v5/pkg/observe/log" + bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect" "github.com/stretchr/testify/require" ) diff --git a/internal/temporalworker/module.go b/internal/temporalworker/module.go index d7e6bad..bacb42f 100644 --- a/internal/temporalworker/module.go +++ b/internal/temporalworker/module.go @@ -3,7 +3,7 @@ package temporalworker import ( "context" - "github.com/formancehq/go-libs/v3/logging" + "github.com/formancehq/go-libs/v5/pkg/observe/log" "go.temporal.io/api/enums/v1" "go.temporal.io/sdk/activity" "go.temporal.io/sdk/client" diff --git a/internal/triggers/activities.go b/internal/triggers/activities.go index d4eedd1..4a8e820 100644 --- a/internal/triggers/activities.go +++ b/internal/triggers/activities.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/v3/collectionutils" - "github.com/formancehq/go-libs/v3/pointer" + collectionutils "github.com/formancehq/go-libs/v5/pkg/types/collections" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" "github.com/formancehq/orchestration/internal/temporalworker" "github.com/formancehq/orchestration/internal/tracer" "github.com/formancehq/orchestration/internal/workflow" diff --git a/internal/triggers/expression.go b/internal/triggers/expression.go index b9ccd85..5f7c13c 100644 --- a/internal/triggers/expression.go +++ b/internal/triggers/expression.go @@ -7,10 +7,10 @@ import ( "go.temporal.io/sdk/temporal" - "github.com/formancehq/go-libs/v3/collectionutils" + collectionutils "github.com/formancehq/go-libs/v5/pkg/types/collections" "github.com/expr-lang/expr" - "github.com/formancehq/go-libs/v3/api" + "github.com/formancehq/go-libs/v5/pkg/transport/api" "github.com/pkg/errors" ) diff --git a/internal/triggers/listener.go b/internal/triggers/listener.go index de0cc17..ffa265d 100644 --- a/internal/triggers/listener.go +++ b/internal/triggers/listener.go @@ -9,19 +9,19 @@ import ( "go.temporal.io/api/enums/v1" - "github.com/formancehq/go-libs/v3/collectionutils" + collectionutils "github.com/formancehq/go-libs/v5/pkg/types/collections" "github.com/formancehq/orchestration/internal/tracer" "github.com/formancehq/orchestration/internal/workflow" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "github.com/formancehq/go-libs/v3/pointer" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" "go.temporal.io/api/serviceerror" - "github.com/formancehq/go-libs/v3/logging" + "github.com/formancehq/go-libs/v5/pkg/observe/log" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/v3/publish" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" "github.com/pkg/errors" "github.com/uptrace/bun" "go.temporal.io/sdk/client" diff --git a/internal/triggers/listener_test.go b/internal/triggers/listener_test.go index fb25dfd..5a7e959 100644 --- a/internal/triggers/listener_test.go +++ b/internal/triggers/listener_test.go @@ -4,11 +4,11 @@ import ( "testing" "time" - "github.com/formancehq/go-libs/v3/bun/bunconnect" - "github.com/formancehq/go-libs/v3/bun/bundebug" - "github.com/formancehq/go-libs/v3/logging" - "github.com/formancehq/go-libs/v3/pointer" - "github.com/formancehq/go-libs/v3/publish" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" + "github.com/formancehq/go-libs/v5/pkg/observe/log" + bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect" + bundebug "github.com/formancehq/go-libs/v5/pkg/storage/bun/debug" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" "github.com/formancehq/orchestration/internal/storage" "github.com/formancehq/orchestration/internal/temporalworker" "github.com/formancehq/orchestration/internal/workflow" diff --git a/internal/triggers/main_test.go b/internal/triggers/main_test.go index 42cad95..ff0a2a5 100644 --- a/internal/triggers/main_test.go +++ b/internal/triggers/main_test.go @@ -3,14 +3,14 @@ package triggers import ( "testing" - "github.com/formancehq/go-libs/v3/testing/docker" - "github.com/formancehq/go-libs/v3/testing/utils" + "github.com/formancehq/go-libs/v5/pkg/testing/docker" + "github.com/formancehq/go-libs/v5/pkg/testing/utils" "github.com/stretchr/testify/require" - "github.com/formancehq/go-libs/v3/logging" + "github.com/formancehq/go-libs/v5/pkg/observe/log" "go.temporal.io/sdk/testsuite" - "github.com/formancehq/go-libs/v3/testing/platform/pgtesting" + "github.com/formancehq/go-libs/v5/pkg/testing/platform/pgtesting" ) var ( diff --git a/internal/triggers/manager.go b/internal/triggers/manager.go index 5d35766..2111367 100644 --- a/internal/triggers/manager.go +++ b/internal/triggers/manager.go @@ -5,7 +5,7 @@ import ( "database/sql" "time" - "github.com/formancehq/go-libs/v3/bun/bunpaginate" + bunpaginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" "github.com/formancehq/orchestration/internal/workflow" "github.com/pkg/errors" diff --git a/internal/triggers/module.go b/internal/triggers/module.go index e512770..02070f6 100644 --- a/internal/triggers/module.go +++ b/internal/triggers/module.go @@ -7,7 +7,7 @@ import ( "github.com/formancehq/orchestration/internal/temporalworker" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/v3/logging" + "github.com/formancehq/go-libs/v5/pkg/observe/log" "github.com/formancehq/orchestration/internal/workflow" "github.com/uptrace/bun" "go.temporal.io/sdk/client" diff --git a/internal/triggers/trigger.go b/internal/triggers/trigger.go index ad2860c..85a4dcf 100644 --- a/internal/triggers/trigger.go +++ b/internal/triggers/trigger.go @@ -6,7 +6,7 @@ import ( "github.com/formancehq/orchestration/internal/workflow" - "github.com/formancehq/go-libs/v3/publish" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" "github.com/expr-lang/expr" "github.com/google/uuid" diff --git a/internal/triggers/workflow_trigger.go b/internal/triggers/workflow_trigger.go index 16bbf2a..47543b9 100644 --- a/internal/triggers/workflow_trigger.go +++ b/internal/triggers/workflow_trigger.go @@ -3,8 +3,8 @@ package triggers import ( "time" - "github.com/formancehq/go-libs/v3/pointer" - "github.com/formancehq/go-libs/v3/publish" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" "github.com/formancehq/orchestration/internal/temporalworker" "github.com/formancehq/orchestration/internal/workflow" "go.temporal.io/api/enums/v1" diff --git a/internal/triggers/workflow_trigger_test.go b/internal/triggers/workflow_trigger_test.go index eb2be47..e928b02 100644 --- a/internal/triggers/workflow_trigger_test.go +++ b/internal/triggers/workflow_trigger_test.go @@ -4,11 +4,11 @@ import ( "testing" "time" - "github.com/formancehq/go-libs/v3/bun/bunconnect" - "github.com/formancehq/go-libs/v3/bun/bundebug" - "github.com/formancehq/go-libs/v3/logging" - "github.com/formancehq/go-libs/v3/pointer" - "github.com/formancehq/go-libs/v3/publish" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" + "github.com/formancehq/go-libs/v5/pkg/observe/log" + bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect" + bundebug "github.com/formancehq/go-libs/v5/pkg/storage/bun/debug" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" "github.com/formancehq/orchestration/internal/storage" "github.com/formancehq/orchestration/internal/temporalworker" "github.com/formancehq/orchestration/internal/workflow" diff --git a/internal/workflow/activities/activity.go b/internal/workflow/activities/activity.go index a762050..bdd8fcd 100644 --- a/internal/workflow/activities/activity.go +++ b/internal/workflow/activities/activity.go @@ -5,7 +5,7 @@ import ( "fmt" sdk "github.com/formancehq/formance-sdk-go/v3" - "github.com/formancehq/go-libs/v3/pointer" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" "github.com/formancehq/orchestration/internal/temporalworker" "github.com/pkg/errors" "go.temporal.io/sdk/activity" diff --git a/internal/workflow/activities/activity_ledger_create_transaction.go b/internal/workflow/activities/activity_ledger_create_transaction.go index bbf9436..32a6ac1 100644 --- a/internal/workflow/activities/activity_ledger_create_transaction.go +++ b/internal/workflow/activities/activity_ledger_create_transaction.go @@ -5,7 +5,7 @@ import ( stdtime "time" "github.com/formancehq/formance-sdk-go/v3/pkg/models/sdkerrors" - "github.com/formancehq/go-libs/v3/time" + "github.com/formancehq/go-libs/v5/pkg/types/time" "github.com/formancehq/formance-sdk-go/v3/pkg/models/operations" "github.com/formancehq/formance-sdk-go/v3/pkg/models/shared" diff --git a/internal/workflow/activities/activity_wallet_credit.go b/internal/workflow/activities/activity_wallet_credit.go index 0256d88..229497d 100644 --- a/internal/workflow/activities/activity_wallet_credit.go +++ b/internal/workflow/activities/activity_wallet_credit.go @@ -4,7 +4,7 @@ import ( "context" stdtime "time" - "github.com/formancehq/go-libs/v3/time" + "github.com/formancehq/go-libs/v5/pkg/types/time" "github.com/formancehq/formance-sdk-go/v3/pkg/models/operations" "github.com/formancehq/formance-sdk-go/v3/pkg/models/shared" diff --git a/internal/workflow/activities/activity_wallet_debit.go b/internal/workflow/activities/activity_wallet_debit.go index 3f84ba6..a57ba95 100644 --- a/internal/workflow/activities/activity_wallet_debit.go +++ b/internal/workflow/activities/activity_wallet_debit.go @@ -7,7 +7,7 @@ import ( "github.com/formancehq/formance-sdk-go/v3/pkg/models/sdkerrors" "github.com/pkg/errors" - "github.com/formancehq/go-libs/v3/time" + "github.com/formancehq/go-libs/v5/pkg/types/time" "github.com/formancehq/formance-sdk-go/v3/pkg/models/operations" "github.com/formancehq/formance-sdk-go/v3/pkg/models/shared" diff --git a/internal/workflow/activities/activity_wallet_list.go b/internal/workflow/activities/activity_wallet_list.go index 182d34a..5b61284 100644 --- a/internal/workflow/activities/activity_wallet_list.go +++ b/internal/workflow/activities/activity_wallet_list.go @@ -3,7 +3,7 @@ package activities import ( "context" - "github.com/formancehq/go-libs/v3/pointer" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" "github.com/formancehq/formance-sdk-go/v3/pkg/models/operations" "github.com/formancehq/formance-sdk-go/v3/pkg/models/shared" diff --git a/internal/workflow/activities_test.go b/internal/workflow/activities_test.go index 413adc6..5c229aa 100644 --- a/internal/workflow/activities_test.go +++ b/internal/workflow/activities_test.go @@ -3,12 +3,12 @@ package workflow import ( "testing" - "github.com/formancehq/go-libs/v3/bun/bundebug" + bundebug "github.com/formancehq/go-libs/v5/pkg/storage/bun/debug" "github.com/uptrace/bun" - "github.com/formancehq/go-libs/v3/bun/bunconnect" - "github.com/formancehq/go-libs/v3/logging" - "github.com/formancehq/go-libs/v3/publish" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" + "github.com/formancehq/go-libs/v5/pkg/observe/log" + bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect" "github.com/stretchr/testify/require" "go.temporal.io/sdk/testsuite" ) diff --git a/internal/workflow/main_test.go b/internal/workflow/main_test.go index 3404e9c..f2b7fdd 100644 --- a/internal/workflow/main_test.go +++ b/internal/workflow/main_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/formancehq/go-libs/v3/logging" - "github.com/formancehq/go-libs/v3/temporal" - "github.com/formancehq/go-libs/v3/testing/docker" - "github.com/formancehq/go-libs/v3/testing/platform/pgtesting" - "github.com/formancehq/go-libs/v3/testing/utils" + "github.com/formancehq/go-libs/v5/pkg/observe/log" + "github.com/formancehq/go-libs/v5/pkg/testing/docker" + "github.com/formancehq/go-libs/v5/pkg/testing/platform/pgtesting" + "github.com/formancehq/go-libs/v5/pkg/testing/utils" + "github.com/formancehq/go-libs/v5/pkg/workflow/temporal" "github.com/stretchr/testify/require" "go.temporal.io/sdk/testsuite" ) diff --git a/internal/workflow/manager.go b/internal/workflow/manager.go index 8460c61..f405986 100644 --- a/internal/workflow/manager.go +++ b/internal/workflow/manager.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - "github.com/formancehq/go-libs/v3/pointer" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" enums "go.temporal.io/api/enums/v1" history "go.temporal.io/api/history/v1" - "github.com/formancehq/go-libs/v3/bun/bunpaginate" + bunpaginate "github.com/formancehq/go-libs/v5/pkg/storage/bun/paginate" "github.com/pkg/errors" "github.com/uptrace/bun" diff --git a/internal/workflow/manager_test.go b/internal/workflow/manager_test.go index 1ce2646..e616f81 100644 --- a/internal/workflow/manager_test.go +++ b/internal/workflow/manager_test.go @@ -4,17 +4,17 @@ import ( "testing" "time" - "github.com/formancehq/go-libs/v3/bun/bundebug" + bundebug "github.com/formancehq/go-libs/v5/pkg/storage/bun/debug" "github.com/uptrace/bun" "go.temporal.io/sdk/worker" - "github.com/formancehq/go-libs/v3/logging" - "github.com/formancehq/go-libs/v3/publish" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" + "github.com/formancehq/go-libs/v5/pkg/observe/log" "github.com/formancehq/orchestration/internal/temporalworker" "github.com/formancehq/orchestration/internal/workflow/stages" "github.com/google/uuid" - "github.com/formancehq/go-libs/v3/bun/bunconnect" + bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect" "github.com/formancehq/orchestration/internal/storage" "github.com/stretchr/testify/require" diff --git a/internal/workflow/stage.go b/internal/workflow/stage.go index 5131b63..406f1db 100644 --- a/internal/workflow/stage.go +++ b/internal/workflow/stage.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/formancehq/go-libs/v3/pointer" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" "github.com/uptrace/bun" ) diff --git a/internal/workflow/stages/delay/delay.go b/internal/workflow/stages/delay/delay.go index 9ed7f82..5015f80 100644 --- a/internal/workflow/stages/delay/delay.go +++ b/internal/workflow/stages/delay/delay.go @@ -1,7 +1,7 @@ package delay import ( - "github.com/formancehq/go-libs/v3/time" + "github.com/formancehq/go-libs/v5/pkg/types/time" "github.com/formancehq/orchestration/internal/schema" "github.com/formancehq/orchestration/internal/workflow/stages" ) diff --git a/internal/workflow/stages/delay/run.go b/internal/workflow/stages/delay/run.go index a8c087c..c851f7c 100644 --- a/internal/workflow/stages/delay/run.go +++ b/internal/workflow/stages/delay/run.go @@ -1,7 +1,7 @@ package delay import ( - "github.com/formancehq/go-libs/v3/time" + "github.com/formancehq/go-libs/v5/pkg/types/time" "go.temporal.io/sdk/workflow" ) diff --git a/internal/workflow/stages/delay/run_test.go b/internal/workflow/stages/delay/run_test.go index a6e98a7..a146cca 100644 --- a/internal/workflow/stages/delay/run_test.go +++ b/internal/workflow/stages/delay/run_test.go @@ -3,7 +3,7 @@ package delay import ( "testing" - "github.com/formancehq/go-libs/v3/time" + "github.com/formancehq/go-libs/v5/pkg/types/time" "github.com/formancehq/orchestration/internal/schema" "github.com/formancehq/orchestration/internal/workflow/stages/internal/stagestesting" diff --git a/internal/workflow/stages/send/run.go b/internal/workflow/stages/send/run.go index 4270353..e024413 100644 --- a/internal/workflow/stages/send/run.go +++ b/internal/workflow/stages/send/run.go @@ -5,10 +5,10 @@ import ( "reflect" "strings" - "github.com/formancehq/go-libs/v3/time" + "github.com/formancehq/go-libs/v5/pkg/types/time" - "github.com/formancehq/go-libs/v3/collectionutils" - "github.com/formancehq/go-libs/v3/metadata" + collectionutils "github.com/formancehq/go-libs/v5/pkg/types/collections" + "github.com/formancehq/go-libs/v5/pkg/types/metadata" "github.com/formancehq/formance-sdk-go/v3/pkg/models/shared" "github.com/formancehq/orchestration/internal/workflow/activities" diff --git a/internal/workflow/stages/send/run_test.go b/internal/workflow/stages/send/run_test.go index 24a0a15..9270cd0 100644 --- a/internal/workflow/stages/send/run_test.go +++ b/internal/workflow/stages/send/run_test.go @@ -4,10 +4,10 @@ import ( "math/big" "testing" - "github.com/formancehq/go-libs/v3/time" + "github.com/formancehq/go-libs/v5/pkg/types/time" "github.com/formancehq/formance-sdk-go/v3/pkg/models/shared" - "github.com/formancehq/go-libs/v3/pointer" + "github.com/formancehq/go-libs/v5/pkg/types/pointer" "github.com/formancehq/orchestration/internal/workflow/activities" "github.com/formancehq/orchestration/internal/workflow/stages/internal/stagestesting" "github.com/stretchr/testify/mock" diff --git a/internal/workflow/stages/send/send.go b/internal/workflow/stages/send/send.go index 329db11..fa50c0e 100644 --- a/internal/workflow/stages/send/send.go +++ b/internal/workflow/stages/send/send.go @@ -2,8 +2,8 @@ package send import ( "github.com/formancehq/formance-sdk-go/v3/pkg/models/shared" - "github.com/formancehq/go-libs/v3/metadata" - "github.com/formancehq/go-libs/v3/time" + "github.com/formancehq/go-libs/v5/pkg/types/metadata" + "github.com/formancehq/go-libs/v5/pkg/types/time" "github.com/formancehq/orchestration/internal/schema" "github.com/formancehq/orchestration/internal/workflow/stages" ) diff --git a/pkg/events/events.go b/pkg/events/events.go index 420d765..ad20bcb 100644 --- a/pkg/events/events.go +++ b/pkg/events/events.go @@ -5,7 +5,7 @@ import ( "time" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/v3/publish" + "github.com/formancehq/go-libs/v5/pkg/messaging/publish" ) const (