From ea3d600bc0870b0a6e4b94891c7431bbc1389732 Mon Sep 17 00:00:00 2001 From: Geoffrey Ragot Date: Tue, 15 Oct 2024 13:45:49 +0200 Subject: [PATCH] chore: upgrade under v2 --- api/logging_chi.go | 2 +- api/response.go | 2 +- api/response_test.go | 2 +- api/response_utils.go | 2 +- api/utils.go | 4 ++-- auth/auth.go | 4 ++-- auth/module.go | 2 +- bun/bunconnect/connect.go | 2 +- bun/bunconnect/flags.go | 4 ++-- bun/bunconnect/iam.go | 2 +- bun/bunconnect/module.go | 4 ++-- bun/bundebug/debug_hook.go | 2 +- bun/bunmigrate/command.go | 2 +- bun/bunmigrate/run.go | 6 +++--- bun/bunmigrate/run_test.go | 8 ++++---- bun/bunpaginate/cursor.go | 2 +- bun/bunpaginate/main_test.go | 8 ++++---- bun/bunpaginate/pagination_column.go | 2 +- bun/bunpaginate/pagination_column_test.go | 8 ++++---- bun/bunpaginate/pagination_offset_test.go | 8 ++++---- bun/bunpaginate/pagination_query_options.go | 2 +- go.mod | 2 +- health/controller_test.go | 2 +- httpclient/debug.go | 2 +- httpserver/middlewares.go | 2 +- httpserver/serverport.go | 2 +- licence/cli.go | 4 ++-- licence/licence.go | 2 +- migrations/collect_test.go | 2 +- migrations/migrator.go | 2 +- migrations/migrator_test.go | 6 +++--- otlp/otlpmetrics/cli.go | 2 +- otlp/otlpmetrics/module.go | 4 ++-- otlp/otlptraces/cli.go | 2 +- otlp/otlptraces/cli_test.go | 2 +- otlp/otlptraces/traces.go | 2 +- otlp/otlptraces/traces_test.go | 2 +- publish/circuit_breaker/circuit_breaker.go | 4 ++-- publish/circuit_breaker/circuit_breaker_test.go | 2 +- publish/circuit_breaker/module.go | 6 +++--- publish/circuit_breaker/storage/migrations.go | 2 +- publish/circuit_breaker/storage/module.go | 4 ++-- publish/circuit_breaker/utils_test.go | 2 +- publish/cli.go | 6 +++--- publish/logging.go | 2 +- publish/module.go | 4 ++-- publish/module_test.go | 4 ++-- publish/nats.go | 2 +- service/app.go | 6 +++--- temporal/client_module.go | 2 +- temporal/logger.go | 2 +- temporal/worker.go | 2 +- testing/api/matchers.go | 2 +- testing/api/utils.go | 4 ++-- testing/docker/ginkgo/ginkgo.go | 4 ++-- testing/docker/pool.go | 2 +- testing/migrations/testing.go | 4 ++-- testing/platform/clickhousetesting/clickhouse.go | 2 +- testing/platform/clickhousetesting/ginkgo.go | 4 ++-- testing/platform/elastictesting/elastic.go | 2 +- testing/platform/natstesting/ginkgo.go | 4 ++-- testing/platform/natstesting/nats.go | 2 +- testing/platform/pgtesting/ginkgo.go | 4 ++-- testing/platform/pgtesting/postgres.go | 6 +++--- testing/platform/pgtesting/postgres_test.go | 6 +++--- 65 files changed, 107 insertions(+), 107 deletions(-) diff --git a/api/logging_chi.go b/api/logging_chi.go index d807f112..6a7b20f1 100644 --- a/api/logging_chi.go +++ b/api/logging_chi.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "github.com/go-chi/chi/v5/middleware" ) diff --git a/api/response.go b/api/response.go index e628ae91..eb3f4057 100644 --- a/api/response.go +++ b/api/response.go @@ -7,7 +7,7 @@ import ( "net/http" "net/url" - "github.com/formancehq/go-libs/bun/bunpaginate" + "github.com/formancehq/go-libs/v2/bun/bunpaginate" "github.com/pkg/errors" ) diff --git a/api/response_test.go b/api/response_test.go index 2e0c9f51..309e1c10 100644 --- a/api/response_test.go +++ b/api/response_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/formancehq/go-libs/bun/bunpaginate" + "github.com/formancehq/go-libs/v2/bun/bunpaginate" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/api/response_utils.go b/api/response_utils.go index 452e16f3..a9199f11 100644 --- a/api/response_utils.go +++ b/api/response_utils.go @@ -5,7 +5,7 @@ import ( "encoding/json" "io" - "github.com/formancehq/go-libs/bun/bunpaginate" + "github.com/formancehq/go-libs/v2/bun/bunpaginate" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/api/utils.go b/api/utils.go index 09a0c280..7ec9796e 100644 --- a/api/utils.go +++ b/api/utils.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/formancehq/go-libs/bun/bunpaginate" + "github.com/formancehq/go-libs/v2/bun/bunpaginate" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" ) const ( diff --git a/auth/auth.go b/auth/auth.go index 26963a47..071472ea 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/formancehq/go-libs/collectionutils" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/collectionutils" + "github.com/formancehq/go-libs/v2/logging" "github.com/hashicorp/go-retryablehttp" "github.com/zitadel/oidc/v2/pkg/client/rp" "github.com/zitadel/oidc/v2/pkg/oidc" diff --git a/auth/module.go b/auth/module.go index ac6e971f..a5326025 100644 --- a/auth/module.go +++ b/auth/module.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "go.uber.org/fx" ) diff --git a/bun/bunconnect/connect.go b/bun/bunconnect/connect.go index 1c3c6d7b..94b935d4 100644 --- a/bun/bunconnect/connect.go +++ b/bun/bunconnect/connect.go @@ -10,7 +10,7 @@ import ( "github.com/uptrace/opentelemetry-go-extra/otelsql" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/pgdialect" diff --git a/bun/bunconnect/flags.go b/bun/bunconnect/flags.go index 8100141d..a3357f2c 100644 --- a/bun/bunconnect/flags.go +++ b/bun/bunconnect/flags.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/cobra" "github.com/aws/aws-sdk-go-v2/config" - "github.com/formancehq/go-libs/aws/iam" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/aws/iam" + "github.com/formancehq/go-libs/v2/logging" "github.com/spf13/pflag" ) diff --git a/bun/bunconnect/iam.go b/bun/bunconnect/iam.go index d187e2af..0821e92b 100644 --- a/bun/bunconnect/iam.go +++ b/bun/bunconnect/iam.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/feature/rds/auth" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" _ "github.com/go-sql-driver/mysql" "github.com/lib/pq" "github.com/pkg/errors" diff --git a/bun/bunconnect/module.go b/bun/bunconnect/module.go index fb90be4f..6fab6777 100644 --- a/bun/bunconnect/module.go +++ b/bun/bunconnect/module.go @@ -3,8 +3,8 @@ package bunconnect import ( "context" - "github.com/formancehq/go-libs/bun/bundebug" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/bun/bundebug" + "github.com/formancehq/go-libs/v2/logging" "github.com/uptrace/bun" "go.uber.org/fx" ) diff --git a/bun/bundebug/debug_hook.go b/bun/bundebug/debug_hook.go index 9b5b12b1..c96b20c2 100644 --- a/bun/bundebug/debug_hook.go +++ b/bun/bundebug/debug_hook.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "github.com/uptrace/bun" ) diff --git a/bun/bunmigrate/command.go b/bun/bunmigrate/command.go index 583813d4..25b1db21 100644 --- a/bun/bunmigrate/command.go +++ b/bun/bunmigrate/command.go @@ -1,7 +1,7 @@ package bunmigrate import ( - "github.com/formancehq/go-libs/bun/bunconnect" + "github.com/formancehq/go-libs/v2/bun/bunconnect" "github.com/spf13/cobra" "github.com/uptrace/bun" diff --git a/bun/bunmigrate/run.go b/bun/bunmigrate/run.go index c8c6ee6d..a641054a 100644 --- a/bun/bunmigrate/run.go +++ b/bun/bunmigrate/run.go @@ -6,9 +6,9 @@ import ( "fmt" "io" - "github.com/formancehq/go-libs/bun/bunconnect" - sharedlogging "github.com/formancehq/go-libs/logging" - "github.com/formancehq/go-libs/pointer" + "github.com/formancehq/go-libs/v2/bun/bunconnect" + sharedlogging "github.com/formancehq/go-libs/v2/logging" + "github.com/formancehq/go-libs/v2/pointer" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/uptrace/bun" diff --git a/bun/bunmigrate/run_test.go b/bun/bunmigrate/run_test.go index 1cd07ce5..0d1a2a88 100644 --- a/bun/bunmigrate/run_test.go +++ b/bun/bunmigrate/run_test.go @@ -4,12 +4,12 @@ import ( "os" "testing" - "github.com/formancehq/go-libs/testing/docker" + "github.com/formancehq/go-libs/v2/testing/docker" - "github.com/formancehq/go-libs/testing/platform/pgtesting" + "github.com/formancehq/go-libs/v2/testing/platform/pgtesting" - "github.com/formancehq/go-libs/bun/bunconnect" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/bun/bunconnect" + "github.com/formancehq/go-libs/v2/logging" "github.com/stretchr/testify/require" "github.com/uptrace/bun" ) diff --git a/bun/bunpaginate/cursor.go b/bun/bunpaginate/cursor.go index d80c2316..d1baf9f4 100644 --- a/bun/bunpaginate/cursor.go +++ b/bun/bunpaginate/cursor.go @@ -1,6 +1,6 @@ package bunpaginate -import "github.com/formancehq/go-libs/collectionutils" +import "github.com/formancehq/go-libs/v2/collectionutils" type Cursor[T any] struct { PageSize int `json:"pageSize,omitempty"` diff --git a/bun/bunpaginate/main_test.go b/bun/bunpaginate/main_test.go index b78dcdd5..639ea895 100644 --- a/bun/bunpaginate/main_test.go +++ b/bun/bunpaginate/main_test.go @@ -3,12 +3,12 @@ package bunpaginate_test import ( "testing" - "github.com/formancehq/go-libs/testing/docker" - "github.com/formancehq/go-libs/testing/utils" + "github.com/formancehq/go-libs/v2/testing/docker" + "github.com/formancehq/go-libs/v2/testing/utils" - "github.com/formancehq/go-libs/testing/platform/pgtesting" + "github.com/formancehq/go-libs/v2/testing/platform/pgtesting" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" ) var srv *pgtesting.PostgresServer diff --git a/bun/bunpaginate/pagination_column.go b/bun/bunpaginate/pagination_column.go index 52ab21ba..7b8d63ed 100644 --- a/bun/bunpaginate/pagination_column.go +++ b/bun/bunpaginate/pagination_column.go @@ -8,7 +8,7 @@ import ( "strings" "time" - libtime "github.com/formancehq/go-libs/time" + libtime "github.com/formancehq/go-libs/v2/time" "github.com/uptrace/bun" ) diff --git a/bun/bunpaginate/pagination_column_test.go b/bun/bunpaginate/pagination_column_test.go index c4c2bbc5..9dc15e9e 100644 --- a/bun/bunpaginate/pagination_column_test.go +++ b/bun/bunpaginate/pagination_column_test.go @@ -5,12 +5,12 @@ import ( "math/big" "testing" - "github.com/formancehq/go-libs/bun/bundebug" + "github.com/formancehq/go-libs/v2/bun/bundebug" "github.com/uptrace/bun" - "github.com/formancehq/go-libs/bun/bunconnect" - "github.com/formancehq/go-libs/bun/bunpaginate" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/bun/bunconnect" + "github.com/formancehq/go-libs/v2/bun/bunpaginate" + "github.com/formancehq/go-libs/v2/logging" "github.com/stretchr/testify/require" ) diff --git a/bun/bunpaginate/pagination_offset_test.go b/bun/bunpaginate/pagination_offset_test.go index 5b47dc18..b93e8505 100644 --- a/bun/bunpaginate/pagination_offset_test.go +++ b/bun/bunpaginate/pagination_offset_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/formancehq/go-libs/bun/bundebug" + "github.com/formancehq/go-libs/v2/bun/bundebug" "github.com/uptrace/bun" - "github.com/formancehq/go-libs/bun/bunconnect" - bunpaginate2 "github.com/formancehq/go-libs/bun/bunpaginate" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/bun/bunconnect" + bunpaginate2 "github.com/formancehq/go-libs/v2/bun/bunpaginate" + "github.com/formancehq/go-libs/v2/logging" "github.com/stretchr/testify/require" ) diff --git a/bun/bunpaginate/pagination_query_options.go b/bun/bunpaginate/pagination_query_options.go index 5461e647..9700a3ef 100644 --- a/bun/bunpaginate/pagination_query_options.go +++ b/bun/bunpaginate/pagination_query_options.go @@ -3,7 +3,7 @@ package bunpaginate import ( "encoding/json" - "github.com/formancehq/go-libs/query" + "github.com/formancehq/go-libs/v2/query" ) type PaginatedQueryOptions[T any] struct { diff --git a/go.mod b/go.mod index 73e540c2..6c3810dd 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/formancehq/go-libs +module github.com/formancehq/go-libs/v2 go 1.22.0 diff --git a/health/controller_test.go b/health/controller_test.go index 8345a64b..36448e4d 100644 --- a/health/controller_test.go +++ b/health/controller_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "github.com/formancehq/go-libs/health" + "github.com/formancehq/go-libs/v2/health" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/fx" diff --git a/httpclient/debug.go b/httpclient/debug.go index ff45e63f..ebf46593 100644 --- a/httpclient/debug.go +++ b/httpclient/debug.go @@ -4,7 +4,7 @@ import ( "net/http" "net/http/httputil" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" ) type httpTransport struct { diff --git a/httpserver/middlewares.go b/httpserver/middlewares.go index a7c1187b..cee95423 100644 --- a/httpserver/middlewares.go +++ b/httpserver/middlewares.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" ) func LoggerMiddleware(l logging.Logger) func(h http.Handler) http.Handler { diff --git a/httpserver/serverport.go b/httpserver/serverport.go index e1efc8de..63b75778 100644 --- a/httpserver/serverport.go +++ b/httpserver/serverport.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "go.uber.org/fx" ) diff --git a/licence/cli.go b/licence/cli.go index 6cc5286d..06494031 100644 --- a/licence/cli.go +++ b/licence/cli.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/pflag" - "github.com/formancehq/go-libs/errorsutils" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/errorsutils" + "github.com/formancehq/go-libs/v2/logging" "github.com/spf13/cobra" "go.uber.org/fx" ) diff --git a/licence/licence.go b/licence/licence.go index 4db02e01..b87669ba 100644 --- a/licence/licence.go +++ b/licence/licence.go @@ -3,7 +3,7 @@ package licence import ( "time" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" ) type Licence struct { diff --git a/migrations/collect_test.go b/migrations/collect_test.go index e4f9371f..c4ef7b08 100644 --- a/migrations/collect_test.go +++ b/migrations/collect_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/formancehq/go-libs/collectionutils" + "github.com/formancehq/go-libs/v2/collectionutils" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/migrations/migrator.go b/migrations/migrator.go index eb5b9bea..48940ade 100644 --- a/migrations/migrator.go +++ b/migrations/migrator.go @@ -6,7 +6,7 @@ import ( "embed" "fmt" - "github.com/formancehq/go-libs/time" + "github.com/formancehq/go-libs/v2/time" "github.com/lib/pq" diff --git a/migrations/migrator_test.go b/migrations/migrator_test.go index 66b66b99..55b82bf0 100644 --- a/migrations/migrator_test.go +++ b/migrations/migrator_test.go @@ -5,10 +5,10 @@ import ( "database/sql" "testing" - "github.com/formancehq/go-libs/logging" - "github.com/formancehq/go-libs/testing/docker" + "github.com/formancehq/go-libs/v2/logging" + "github.com/formancehq/go-libs/v2/testing/docker" - "github.com/formancehq/go-libs/testing/platform/pgtesting" + "github.com/formancehq/go-libs/v2/testing/platform/pgtesting" _ "github.com/jackc/pgx/v5/stdlib" "github.com/stretchr/testify/require" diff --git a/otlp/otlpmetrics/cli.go b/otlp/otlpmetrics/cli.go index 0b0e1358..d9cf8fc1 100644 --- a/otlp/otlpmetrics/cli.go +++ b/otlp/otlpmetrics/cli.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/formancehq/go-libs/otlp" + "github.com/formancehq/go-libs/v2/otlp" flag "github.com/spf13/pflag" "go.uber.org/fx" ) diff --git a/otlp/otlpmetrics/module.go b/otlp/otlpmetrics/module.go index dedc9da1..664cbeb2 100644 --- a/otlp/otlpmetrics/module.go +++ b/otlp/otlpmetrics/module.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "go.opentelemetry.io/contrib/instrumentation/host" "go.opentelemetry.io/contrib/instrumentation/runtime" "go.opentelemetry.io/contrib/propagators/b3" @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/otel/propagation" sdkmetric "go.opentelemetry.io/otel/sdk/metric" - "github.com/formancehq/go-libs/otlp" + "github.com/formancehq/go-libs/v2/otlp" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp" "go.opentelemetry.io/otel/metric" diff --git a/otlp/otlptraces/cli.go b/otlp/otlptraces/cli.go index d79bc3c3..3f7389cd 100644 --- a/otlp/otlptraces/cli.go +++ b/otlp/otlptraces/cli.go @@ -1,7 +1,7 @@ package otlptraces import ( - "github.com/formancehq/go-libs/otlp" + "github.com/formancehq/go-libs/v2/otlp" "github.com/spf13/cobra" flag "github.com/spf13/pflag" "go.uber.org/fx" diff --git a/otlp/otlptraces/cli_test.go b/otlp/otlptraces/cli_test.go index ac944f60..0216c784 100644 --- a/otlp/otlptraces/cli_test.go +++ b/otlp/otlptraces/cli_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/formancehq/go-libs/otlp" + "github.com/formancehq/go-libs/v2/otlp" "github.com/spf13/cobra" "github.com/stretchr/testify/require" diff --git a/otlp/otlptraces/traces.go b/otlp/otlptraces/traces.go index 2dc83779..46e77e4f 100644 --- a/otlp/otlptraces/traces.go +++ b/otlp/otlptraces/traces.go @@ -5,7 +5,7 @@ import ( "go.opentelemetry.io/otel/trace/noop" - "github.com/formancehq/go-libs/otlp" + "github.com/formancehq/go-libs/v2/otlp" "go.opentelemetry.io/contrib/propagators/b3" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" diff --git a/otlp/otlptraces/traces_test.go b/otlp/otlptraces/traces_test.go index 342b5f92..ca930eb9 100644 --- a/otlp/otlptraces/traces_test.go +++ b/otlp/otlptraces/traces_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/formancehq/go-libs/otlp" + "github.com/formancehq/go-libs/v2/otlp" "github.com/stretchr/testify/assert" "go.uber.org/fx" ) diff --git a/publish/circuit_breaker/circuit_breaker.go b/publish/circuit_breaker/circuit_breaker.go index 041e62a9..74a9d069 100644 --- a/publish/circuit_breaker/circuit_breaker.go +++ b/publish/circuit_breaker/circuit_breaker.go @@ -7,8 +7,8 @@ import ( "time" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/logging" - "github.com/formancehq/go-libs/publish/circuit_breaker/storage" + "github.com/formancehq/go-libs/v2/logging" + "github.com/formancehq/go-libs/v2/publish/circuit_breaker/storage" "github.com/google/uuid" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" diff --git a/publish/circuit_breaker/circuit_breaker_test.go b/publish/circuit_breaker/circuit_breaker_test.go index 3c34d374..b9003efc 100644 --- a/publish/circuit_breaker/circuit_breaker_test.go +++ b/publish/circuit_breaker/circuit_breaker_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/publish/circuit_breaker/module.go b/publish/circuit_breaker/module.go index 9038ac8e..bde927a1 100644 --- a/publish/circuit_breaker/module.go +++ b/publish/circuit_breaker/module.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/formancehq/go-libs/logging" - "github.com/formancehq/go-libs/publish/circuit_breaker/storage" - topicmapper "github.com/formancehq/go-libs/publish/topic_mapper" + "github.com/formancehq/go-libs/v2/logging" + "github.com/formancehq/go-libs/v2/publish/circuit_breaker/storage" + topicmapper "github.com/formancehq/go-libs/v2/publish/topic_mapper" "go.uber.org/fx" ) diff --git a/publish/circuit_breaker/storage/migrations.go b/publish/circuit_breaker/storage/migrations.go index a57e7740..443cff65 100644 --- a/publish/circuit_breaker/storage/migrations.go +++ b/publish/circuit_breaker/storage/migrations.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/formancehq/go-libs/migrations" + "github.com/formancehq/go-libs/v2/migrations" "github.com/uptrace/bun" ) diff --git a/publish/circuit_breaker/storage/module.go b/publish/circuit_breaker/storage/module.go index 982ea104..425b302a 100644 --- a/publish/circuit_breaker/storage/module.go +++ b/publish/circuit_breaker/storage/module.go @@ -3,8 +3,8 @@ package storage import ( "context" - "github.com/formancehq/go-libs/bun/bunconnect" - "github.com/formancehq/go-libs/bun/bundebug" + "github.com/formancehq/go-libs/v2/bun/bunconnect" + "github.com/formancehq/go-libs/v2/bun/bundebug" "github.com/uptrace/bun" "go.uber.org/fx" ) diff --git a/publish/circuit_breaker/utils_test.go b/publish/circuit_breaker/utils_test.go index 419e31f8..1c425918 100644 --- a/publish/circuit_breaker/utils_test.go +++ b/publish/circuit_breaker/utils_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/publish/circuit_breaker/storage" + "github.com/formancehq/go-libs/v2/publish/circuit_breaker/storage" ) type payload struct { diff --git a/publish/cli.go b/publish/cli.go index 90adf278..cdf8f882 100644 --- a/publish/cli.go +++ b/publish/cli.go @@ -9,9 +9,9 @@ import ( "github.com/IBM/sarama" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/aws/iam" - circuitbreaker "github.com/formancehq/go-libs/publish/circuit_breaker" - topicmapper "github.com/formancehq/go-libs/publish/topic_mapper" + "github.com/formancehq/go-libs/v2/aws/iam" + circuitbreaker "github.com/formancehq/go-libs/v2/publish/circuit_breaker" + topicmapper "github.com/formancehq/go-libs/v2/publish/topic_mapper" "github.com/nats-io/nats.go" "github.com/spf13/cobra" "github.com/xdg-go/scram" diff --git a/publish/logging.go b/publish/logging.go index 86c59986..3296042d 100644 --- a/publish/logging.go +++ b/publish/logging.go @@ -2,7 +2,7 @@ package publish import ( "github.com/ThreeDotsLabs/watermill" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "go.uber.org/fx" ) diff --git a/publish/module.go b/publish/module.go index e82312ca..6c144e13 100644 --- a/publish/module.go +++ b/publish/module.go @@ -3,7 +3,7 @@ package publish import ( "context" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "github.com/pkg/errors" "sync" @@ -11,7 +11,7 @@ import ( "github.com/ThreeDotsLabs/watermill" "github.com/ThreeDotsLabs/watermill/message" "github.com/ThreeDotsLabs/watermill/pubsub/gochannel" - topicmapper "github.com/formancehq/go-libs/publish/topic_mapper" + topicmapper "github.com/formancehq/go-libs/v2/publish/topic_mapper" "go.uber.org/fx" ) diff --git a/publish/module_test.go b/publish/module_test.go index 150c0eb9..bf9cfa50 100644 --- a/publish/module_test.go +++ b/publish/module_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - dockerlib "github.com/formancehq/go-libs/testing/docker" + dockerlib "github.com/formancehq/go-libs/v2/testing/docker" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" @@ -17,7 +17,7 @@ import ( "github.com/IBM/sarama" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" natsServer "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" "github.com/ory/dockertest/v3" diff --git a/publish/nats.go b/publish/nats.go index 8b2992ca..bd6beff0 100644 --- a/publish/nats.go +++ b/publish/nats.go @@ -7,7 +7,7 @@ import ( "github.com/ThreeDotsLabs/watermill" wNats "github.com/ThreeDotsLabs/watermill-nats/v2/pkg/nats" "github.com/ThreeDotsLabs/watermill/message" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "github.com/nats-io/nats.go" "github.com/pkg/errors" "go.uber.org/fx" diff --git a/service/app.go b/service/app.go index 5301b97c..26e899d6 100644 --- a/service/app.go +++ b/service/app.go @@ -9,12 +9,12 @@ import ( "github.com/spf13/pflag" - "github.com/formancehq/go-libs/otlp/otlptraces" + "github.com/formancehq/go-libs/v2/otlp/otlptraces" "github.com/sirupsen/logrus" "github.com/uptrace/opentelemetry-go-extra/otellogrus" - "github.com/formancehq/go-libs/errorsutils" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/errorsutils" + "github.com/formancehq/go-libs/v2/logging" "github.com/spf13/cobra" "go.uber.org/fx" ) diff --git a/temporal/client_module.go b/temporal/client_module.go index 560a11fe..c5ce4f1f 100644 --- a/temporal/client_module.go +++ b/temporal/client_module.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "time" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "github.com/spf13/cobra" "go.opentelemetry.io/otel/trace" "go.temporal.io/api/enums/v1" diff --git a/temporal/logger.go b/temporal/logger.go index 22fad576..63897179 100644 --- a/temporal/logger.go +++ b/temporal/logger.go @@ -1,7 +1,7 @@ package temporal import ( - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "go.temporal.io/sdk/log" ) diff --git a/temporal/worker.go b/temporal/worker.go index 2e8b29db..a548e4e0 100644 --- a/temporal/worker.go +++ b/temporal/worker.go @@ -3,7 +3,7 @@ package temporal import ( "context" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "go.temporal.io/sdk/activity" "go.temporal.io/sdk/client" "go.temporal.io/sdk/worker" diff --git a/testing/api/matchers.go b/testing/api/matchers.go index 1aac06e8..5245c82d 100644 --- a/testing/api/matchers.go +++ b/testing/api/matchers.go @@ -3,7 +3,7 @@ package api import ( "fmt" - "github.com/formancehq/go-libs/api" + "github.com/formancehq/go-libs/v2/api" "github.com/onsi/gomega/types" "github.com/pkg/errors" ) diff --git a/testing/api/utils.go b/testing/api/utils.go index 983bd3ac..dd92173f 100644 --- a/testing/api/utils.go +++ b/testing/api/utils.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "github.com/formancehq/go-libs/bun/bunpaginate" + "github.com/formancehq/go-libs/v2/bun/bunpaginate" - "github.com/formancehq/go-libs/api" + "github.com/formancehq/go-libs/v2/api" "github.com/stretchr/testify/require" ) diff --git a/testing/docker/ginkgo/ginkgo.go b/testing/docker/ginkgo/ginkgo.go index 7e3d8e60..2f536306 100644 --- a/testing/docker/ginkgo/ginkgo.go +++ b/testing/docker/ginkgo/ginkgo.go @@ -1,8 +1,8 @@ package ginkgo import ( - "github.com/formancehq/go-libs/logging" - "github.com/formancehq/go-libs/testing/docker" + "github.com/formancehq/go-libs/v2/logging" + "github.com/formancehq/go-libs/v2/testing/docker" . "github.com/onsi/ginkgo/v2" ) diff --git a/testing/docker/pool.go b/testing/docker/pool.go index 1ca67898..97ed4668 100644 --- a/testing/docker/pool.go +++ b/testing/docker/pool.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" diff --git a/testing/migrations/testing.go b/testing/migrations/testing.go index 7fe5fd44..d3f7a78f 100644 --- a/testing/migrations/testing.go +++ b/testing/migrations/testing.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/formancehq/go-libs/logging" - "github.com/formancehq/go-libs/migrations" + "github.com/formancehq/go-libs/v2/logging" + "github.com/formancehq/go-libs/v2/migrations" "github.com/stretchr/testify/require" "github.com/uptrace/bun" ) diff --git a/testing/platform/clickhousetesting/clickhouse.go b/testing/platform/clickhousetesting/clickhouse.go index f4efabbb..094cc2b7 100644 --- a/testing/platform/clickhousetesting/clickhouse.go +++ b/testing/platform/clickhousetesting/clickhouse.go @@ -11,7 +11,7 @@ import ( "github.com/ory/dockertest/v3" "github.com/pkg/errors" - "github.com/formancehq/go-libs/testing/docker" + "github.com/formancehq/go-libs/v2/testing/docker" _ "github.com/lib/pq" "github.com/stretchr/testify/require" diff --git a/testing/platform/clickhousetesting/ginkgo.go b/testing/platform/clickhousetesting/ginkgo.go index 44ac59da..09255817 100644 --- a/testing/platform/clickhousetesting/ginkgo.go +++ b/testing/platform/clickhousetesting/ginkgo.go @@ -1,8 +1,8 @@ package clickhousetesting import ( - . "github.com/formancehq/go-libs/testing/docker/ginkgo" - . "github.com/formancehq/go-libs/testing/utils" + . "github.com/formancehq/go-libs/v2/testing/docker/ginkgo" + . "github.com/formancehq/go-libs/v2/testing/utils" . "github.com/onsi/ginkgo/v2" ) diff --git a/testing/platform/elastictesting/elastic.go b/testing/platform/elastictesting/elastic.go index 1f0580ed..07b007ad 100644 --- a/testing/platform/elastictesting/elastic.go +++ b/testing/platform/elastictesting/elastic.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/formancehq/go-libs/testing/docker" + "github.com/formancehq/go-libs/v2/testing/docker" "github.com/olivere/elastic/v7" "github.com/ory/dockertest/v3" "github.com/pkg/errors" diff --git a/testing/platform/natstesting/ginkgo.go b/testing/platform/natstesting/ginkgo.go index 57176d59..2b623845 100644 --- a/testing/platform/natstesting/ginkgo.go +++ b/testing/platform/natstesting/ginkgo.go @@ -1,8 +1,8 @@ package natstesting import ( - "github.com/formancehq/go-libs/logging" - . "github.com/formancehq/go-libs/testing/utils" + "github.com/formancehq/go-libs/v2/logging" + . "github.com/formancehq/go-libs/v2/testing/utils" . "github.com/onsi/ginkgo/v2" ) diff --git a/testing/platform/natstesting/nats.go b/testing/platform/natstesting/nats.go index 1bd11e94..118c0403 100644 --- a/testing/platform/natstesting/nats.go +++ b/testing/platform/natstesting/nats.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/formancehq/go-libs/logging" + "github.com/formancehq/go-libs/v2/logging" natsserver "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" "github.com/stretchr/testify/require" diff --git a/testing/platform/pgtesting/ginkgo.go b/testing/platform/pgtesting/ginkgo.go index 63c9c75f..6ee3cfff 100644 --- a/testing/platform/pgtesting/ginkgo.go +++ b/testing/platform/pgtesting/ginkgo.go @@ -1,8 +1,8 @@ package pgtesting import ( - . "github.com/formancehq/go-libs/testing/docker/ginkgo" - . "github.com/formancehq/go-libs/testing/utils" + . "github.com/formancehq/go-libs/v2/testing/docker/ginkgo" + . "github.com/formancehq/go-libs/v2/testing/utils" . "github.com/onsi/ginkgo/v2" ) diff --git a/testing/platform/pgtesting/postgres.go b/testing/platform/pgtesting/postgres.go index 5cee0c1e..24876edb 100644 --- a/testing/platform/pgtesting/postgres.go +++ b/testing/platform/pgtesting/postgres.go @@ -8,12 +8,12 @@ import ( "strconv" "time" - sharedlogging "github.com/formancehq/go-libs/logging" + sharedlogging "github.com/formancehq/go-libs/v2/logging" "github.com/ory/dockertest/v3" - "github.com/formancehq/go-libs/bun/bunconnect" + "github.com/formancehq/go-libs/v2/bun/bunconnect" - "github.com/formancehq/go-libs/testing/docker" + "github.com/formancehq/go-libs/v2/testing/docker" "github.com/google/uuid" _ "github.com/lib/pq" "github.com/pkg/errors" diff --git a/testing/platform/pgtesting/postgres_test.go b/testing/platform/pgtesting/postgres_test.go index 4c665bb5..7d9e3c1d 100644 --- a/testing/platform/pgtesting/postgres_test.go +++ b/testing/platform/pgtesting/postgres_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/formancehq/go-libs/logging" - "github.com/formancehq/go-libs/testing/docker" - "github.com/formancehq/go-libs/testing/utils" + "github.com/formancehq/go-libs/v2/logging" + "github.com/formancehq/go-libs/v2/testing/docker" + "github.com/formancehq/go-libs/v2/testing/utils" "github.com/jackc/pgx/v5" "github.com/stretchr/testify/require"