Skip to content

feat: use test server from go-libs #846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 8, 2025
Merged

feat: use test server from go-libs #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9eb8988
feat: use test server from go-libs
gfyrag Apr 3, 2025
a8720d0
feat: use instrumentations
gfyrag Apr 3, 2025
7e24697
chore: simplify testserver
gfyrag Apr 4, 2025
ca2917e
chore: upgrade under go-libs v3
gfyrag Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmd/buckets_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package cmd

import (
"github.com/formancehq/go-libs/v2/bun/bunconnect"
"github.com/formancehq/go-libs/v2/logging"
"github.com/formancehq/go-libs/v2/otlp"
"github.com/formancehq/go-libs/v2/otlp/otlptraces"
"github.com/formancehq/go-libs/v2/service"
"github.com/formancehq/go-libs/v3/bun/bunconnect"
"github.com/formancehq/go-libs/v3/logging"
"github.com/formancehq/go-libs/v3/otlp"
"github.com/formancehq/go-libs/v3/otlp/otlptraces"
"github.com/formancehq/go-libs/v3/service"
"github.com/formancehq/ledger/internal/storage"
"github.com/formancehq/ledger/internal/storage/driver"
"github.com/spf13/cobra"
Expand Down
8 changes: 4 additions & 4 deletions cmd/buckets_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"io"
"testing"

"github.com/formancehq/go-libs/v2/bun/bunconnect"
"github.com/formancehq/go-libs/v2/logging"
"github.com/formancehq/go-libs/v2/testing/docker"
"github.com/formancehq/go-libs/v2/testing/platform/pgtesting"
"github.com/formancehq/go-libs/v3/bun/bunconnect"
"github.com/formancehq/go-libs/v3/logging"
"github.com/formancehq/go-libs/v3/testing/docker"
"github.com/formancehq/go-libs/v3/testing/platform/pgtesting"
"github.com/stretchr/testify/require"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package cmd

import (
"github.com/formancehq/go-libs/v2/bun/bunmigrate"
"github.com/formancehq/go-libs/v2/otlp"
"github.com/formancehq/go-libs/v2/otlp/otlptraces"
"github.com/formancehq/go-libs/v2/service"
"github.com/formancehq/go-libs/v3/bun/bunmigrate"
"github.com/formancehq/go-libs/v3/otlp"
"github.com/formancehq/go-libs/v3/otlp/otlptraces"
"github.com/formancehq/go-libs/v3/service"
"github.com/formancehq/ledger/internal/storage/driver"
"github.com/spf13/cobra"
"github.com/uptrace/bun"
Expand Down
40 changes: 20 additions & 20 deletions cmd/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@ package cmd

import (
"fmt"
"github.com/formancehq/go-libs/v2/logging"
"github.com/formancehq/go-libs/v3/logging"
"github.com/formancehq/ledger/internal/api/common"
systemstore "github.com/formancehq/ledger/internal/storage/system"
"github.com/formancehq/ledger/internal/worker"
"net/http"
"net/http/pprof"
"time"

apilib "github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/go-libs/v2/health"
"github.com/formancehq/go-libs/v2/httpserver"
"github.com/formancehq/go-libs/v2/otlp"
apilib "github.com/formancehq/go-libs/v3/api"
"github.com/formancehq/go-libs/v3/health"
"github.com/formancehq/go-libs/v3/httpserver"
"github.com/formancehq/go-libs/v3/otlp"
"github.com/go-chi/chi/v5"
"go.opentelemetry.io/otel/sdk/metric"

"github.com/formancehq/ledger/internal/bus"

"github.com/formancehq/go-libs/v2/auth"
"github.com/formancehq/go-libs/v2/aws/iam"
"github.com/formancehq/go-libs/v2/bun/bunconnect"
"github.com/formancehq/go-libs/v2/otlp/otlpmetrics"
"github.com/formancehq/go-libs/v2/otlp/otlptraces"
"github.com/formancehq/go-libs/v2/publish"
"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/otlp/otlpmetrics"
"github.com/formancehq/go-libs/v3/otlp/otlptraces"
"github.com/formancehq/go-libs/v3/publish"
"github.com/formancehq/ledger/internal/api"

ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
systemcontroller "github.com/formancehq/ledger/internal/controller/system"
"github.com/formancehq/ledger/internal/storage"

"github.com/formancehq/go-libs/v2/ballast"
"github.com/formancehq/go-libs/v2/service"
"github.com/formancehq/go-libs/v3/ballast"
"github.com/formancehq/go-libs/v3/service"
"github.com/spf13/cobra"
"go.uber.org/fx"
)
Expand Down Expand Up @@ -125,15 +125,15 @@ func NewServeCommand() *cobra.Command {
}),
fx.Decorate(func(
params struct {
fx.In
fx.In

Handler chi.Router
HealthController *health.HealthController
Logger logging.Logger
Handler chi.Router
HealthController *health.HealthController
Logger logging.Logger

MeterProvider *metric.MeterProvider `optional:"true"`
Exporter *otlpmetrics.InMemoryExporter `optional:"true"`
},
MeterProvider *metric.MeterProvider `optional:"true"`
Exporter *otlpmetrics.InMemoryExporter `optional:"true"`
},
) chi.Router {
return assembleFinalRouter(
service.IsDebug(cmd),
Expand Down
10 changes: 5 additions & 5 deletions cmd/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package cmd

import (
"fmt"
"github.com/formancehq/go-libs/v2/bun/bunconnect"
"github.com/formancehq/go-libs/v2/otlp"
"github.com/formancehq/go-libs/v2/otlp/otlpmetrics"
"github.com/formancehq/go-libs/v2/otlp/otlptraces"
"github.com/formancehq/go-libs/v2/service"
"github.com/formancehq/go-libs/v3/bun/bunconnect"
"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/service"
"github.com/formancehq/ledger/internal/storage"
"github.com/formancehq/ledger/internal/worker"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion deployments/pulumi/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.23.1
toolchain go1.23.3

require (
github.com/formancehq/go-libs/v2 v2.2.2
github.com/formancehq/go-libs/v3 v3.0.0-20250407102820-68fa020e67bb
github.com/google/uuid v1.6.0
github.com/invopop/jsonschema v0.13.0
github.com/kos-v/dsnparser v1.1.0
Expand Down
4 changes: 2 additions & 2 deletions deployments/pulumi/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ 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/go-libs/v2 v2.2.2 h1:COVo8+wIybiiocw4NWl3W0dovQgkO/b/P1jTk1ItKGw=
github.com/formancehq/go-libs/v2 v2.2.2/go.mod h1:vIUz00DsuhjrRV7mimv3V/VXhYDRQXAEh2KWW16CAtM=
github.com/formancehq/go-libs/v3 v3.0.0-20250407102820-68fa020e67bb h1:bX/OQdZJryJlOzc1Ao8mMKg1kV9qSmmJ1aHxv5N71HE=
github.com/formancehq/go-libs/v3 v3.0.0-20250407102820-68fa020e67bb/go.mod h1:mRr5/y0I64iJ4I+BXNkUy49izwrh3SA5L+MTWD1d/7Q=
github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
Expand Down
14 changes: 7 additions & 7 deletions deployments/pulumi/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package config
import (
"errors"
"fmt"
. "github.com/formancehq/go-libs/v2/collectionutils"
. "github.com/formancehq/go-libs/v3/collectionutils"
pulumi_ledger "github.com/formancehq/ledger/deployments/pulumi/pkg"
"github.com/formancehq/ledger/deployments/pulumi/pkg/api"
"github.com/formancehq/ledger/deployments/pulumi/pkg/common"
Expand Down Expand Up @@ -70,7 +70,7 @@ func (a *RDSPostMigrateSnapshot) toInput() *storage.RDSPostMigrateSnapshotArgs {
}
return &storage.RDSPostMigrateSnapshotArgs{
SnapshotIdentifier: pulumi.String(a.SnapshotIdentifier),
RetainsOnDelete: a.RetainsOnDelete,
RetainsOnDelete: a.RetainsOnDelete,
}
}

Expand Down Expand Up @@ -140,7 +140,7 @@ func (a RDSClusterCreate) toInput() *storage.RDSClusterCreateArgs {
InstanceClass: pulumix.Val(rds.InstanceType(a.InstanceClass)),
Engine: pulumi.String(a.Engine),
EngineVersion: pulumi.String(a.EngineVersion),
RetainsOnDelete: a.RetainsOnDelete,
RetainsOnDelete: a.RetainsOnDelete,
}
}

Expand Down Expand Up @@ -247,7 +247,7 @@ func (s Storage) toInput() storage.Args {
RDS: s.RDS.toInput(),
ConnectivityDatabaseArgs: s.Connectivity.toInput(),
DisableUpgrade: pulumix.Val(s.DisableUpgrade),
Service: s.Service.toInput(),
Service: s.Service.toInput(),
}
}

Expand Down Expand Up @@ -540,7 +540,7 @@ func (g GeneratorLedgerConfiguration) toInput() generator.LedgerConfiguration {
ScriptFromFile: pulumix.Val(g.ScriptFromFile),
VUs: pulumix.Val(g.VUs),
HTTPClientTimeout: pulumix.Val(g.HTTPClientTimeout),
SkipAwait: pulumix.Val(g.SkipAwait),
SkipAwait: pulumix.Val(g.SkipAwait),
}
}

Expand All @@ -558,8 +558,8 @@ func (g *Generator) toInput() *generator.Args {
}

return &generator.Args{
GeneratorVersion: pulumix.Val(g.GeneratorVersion),
Ledgers: ConvertMap(g.Ledgers, GeneratorLedgerConfiguration.toInput),
GeneratorVersion: pulumix.Val(g.GeneratorVersion),
Ledgers: ConvertMap(g.Ledgers, GeneratorLedgerConfiguration.toInput),
}
}

Expand Down
2 changes: 1 addition & 1 deletion deployments/pulumi/pkg/monitoring/monitoring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package monitoring

import (
"github.com/formancehq/go-libs/v2/collectionutils"
"github.com/formancehq/go-libs/v3/collectionutils"
"github.com/formancehq/ledger/deployments/pulumi/pkg/utils"
corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/core/v1"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
Expand Down
Loading
Loading