From c156346a9c8b15076340de9da0a0f9ae83eedcb2 Mon Sep 17 00:00:00 2001 From: RAGOT David <35502263+Dav-14@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:10:32 +0100 Subject: [PATCH] fix(go-libs): typo (#1268) Co-authored-by: David Ragot --- components/ledger/go.mod | 4 ++-- components/ledger/libs/bun/bunconnect/connect.go | 5 +++-- .../payments/cmd/connectors/internal/storage/module.go | 1 + components/payments/go.mod | 2 +- libs/go-libs/bun/bunconnect/connect.go | 5 +++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/components/ledger/go.mod b/components/ledger/go.mod index 5d1fef4fbe..789b711318 100644 --- a/components/ledger/go.mod +++ b/components/ledger/go.mod @@ -18,7 +18,6 @@ require ( github.com/jackc/pgx/v5 v5.3.0 github.com/lib/pq v1.10.7 github.com/logrusorgru/aurora v2.0.3+incompatible - github.com/ory/dockertest/v3 v3.9.1 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 github.com/pborman/uuid v1.2.1 github.com/pkg/errors v0.9.1 @@ -32,7 +31,6 @@ require ( go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 - go.uber.org/atomic v1.10.0 go.uber.org/fx v1.19.2 go.uber.org/mock v0.3.0 gopkg.in/segmentio/analytics-go.v3 v3.1.0 @@ -122,6 +120,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.5 // indirect + github.com/ory/dockertest/v3 v3.9.1 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -171,6 +170,7 @@ require ( go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect + go.uber.org/atomic v1.10.0 // indirect go.uber.org/dig v1.16.1 // indirect go.uber.org/multierr v1.9.0 // indirect go.uber.org/zap v1.24.0 // indirect diff --git a/components/ledger/libs/bun/bunconnect/connect.go b/components/ledger/libs/bun/bunconnect/connect.go index 90aadb972f..e048cf865b 100644 --- a/components/ledger/libs/bun/bunconnect/connect.go +++ b/components/ledger/libs/bun/bunconnect/connect.go @@ -5,10 +5,11 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/formancehq/stack/libs/go-libs/logging" "net/url" "time" + "github.com/formancehq/stack/libs/go-libs/logging" + "github.com/formancehq/stack/libs/go-libs/bun/bundebug" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/pgdialect" @@ -41,7 +42,7 @@ func OpenSQLDB(ctx context.Context, options ConnectionOptions, hooks ...bun.Quer return nil, err } } else { - logging.FromContext(ctx).Debugf("Opening database with iam connector and dsn: '%s'", options.DatabaseSourceName) + logging.FromContext(ctx).Debugf("Opening database with connector and dsn: '%s'", options.DatabaseSourceName) connector, err := options.Connector(options.DatabaseSourceName) if err != nil { return nil, err diff --git a/components/payments/cmd/connectors/internal/storage/module.go b/components/payments/cmd/connectors/internal/storage/module.go index 03a340307a..c6d79e5723 100644 --- a/components/payments/cmd/connectors/internal/storage/module.go +++ b/components/payments/cmd/connectors/internal/storage/module.go @@ -2,6 +2,7 @@ package storage import ( "context" + "github.com/formancehq/stack/libs/go-libs/bun/bunconnect" "github.com/formancehq/stack/libs/go-libs/logging" "github.com/uptrace/bun" diff --git a/components/payments/go.mod b/components/payments/go.mod index e0e3a986c1..df29391323 100644 --- a/components/payments/go.mod +++ b/components/payments/go.mod @@ -32,7 +32,6 @@ require ( github.com/uptrace/bun v1.1.16 github.com/uptrace/bun/dialect/pgdialect v1.1.16 github.com/uptrace/bun/extra/bundebug v1.1.16 - github.com/uptrace/bun/extra/bunotel v1.1.16 go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.39.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 go.opentelemetry.io/otel v1.22.0 @@ -154,6 +153,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect + github.com/uptrace/bun/extra/bunotel v1.1.16 // indirect github.com/uptrace/opentelemetry-go-extra/otellogrus v0.1.21 // indirect github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.2 // indirect github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.21 // indirect diff --git a/libs/go-libs/bun/bunconnect/connect.go b/libs/go-libs/bun/bunconnect/connect.go index 90aadb972f..e048cf865b 100644 --- a/libs/go-libs/bun/bunconnect/connect.go +++ b/libs/go-libs/bun/bunconnect/connect.go @@ -5,10 +5,11 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/formancehq/stack/libs/go-libs/logging" "net/url" "time" + "github.com/formancehq/stack/libs/go-libs/logging" + "github.com/formancehq/stack/libs/go-libs/bun/bundebug" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/pgdialect" @@ -41,7 +42,7 @@ func OpenSQLDB(ctx context.Context, options ConnectionOptions, hooks ...bun.Quer return nil, err } } else { - logging.FromContext(ctx).Debugf("Opening database with iam connector and dsn: '%s'", options.DatabaseSourceName) + logging.FromContext(ctx).Debugf("Opening database with connector and dsn: '%s'", options.DatabaseSourceName) connector, err := options.Connector(options.DatabaseSourceName) if err != nil { return nil, err