Skip to content

chore: upgrade under v2 #134

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 1 commit into from
Oct 15, 2024
Merged

chore: upgrade under v2 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion api/logging_chi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion api/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion api/response_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion api/response_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions api/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion auth/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package auth

import (
"github.com/formancehq/go-libs/logging"
"github.com/formancehq/go-libs/v2/logging"
"go.uber.org/fx"
)

Expand Down
2 changes: 1 addition & 1 deletion bun/bunconnect/connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions bun/bunconnect/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion bun/bunconnect/iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions bun/bunconnect/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion bun/bundebug/debug_hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/formancehq/go-libs/logging"
"github.com/formancehq/go-libs/v2/logging"

"github.com/uptrace/bun"
)
Expand Down
2 changes: 1 addition & 1 deletion bun/bunmigrate/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
6 changes: 3 additions & 3 deletions bun/bunmigrate/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions bun/bunmigrate/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion bun/bunpaginate/cursor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"`
Expand Down
8 changes: 4 additions & 4 deletions bun/bunpaginate/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bun/bunpaginate/pagination_column.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions bun/bunpaginate/pagination_column_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions bun/bunpaginate/pagination_offset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion bun/bunpaginate/pagination_query_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/formancehq/go-libs
module github.com/formancehq/go-libs/v2

go 1.22.0

Expand Down
2 changes: 1 addition & 1 deletion health/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion httpclient/debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/middlewares.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/serverport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"time"

"github.com/formancehq/go-libs/logging"
"github.com/formancehq/go-libs/v2/logging"

"go.uber.org/fx"
)
Expand Down
4 changes: 2 additions & 2 deletions licence/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion licence/licence.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package licence
import (
"time"

"github.com/formancehq/go-libs/logging"
"github.com/formancehq/go-libs/v2/logging"
)

type Licence struct {
Expand Down
2 changes: 1 addition & 1 deletion migrations/collect_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion migrations/migrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"embed"
"fmt"

"github.com/formancehq/go-libs/time"
"github.com/formancehq/go-libs/v2/time"

"github.com/lib/pq"

Expand Down
6 changes: 3 additions & 3 deletions migrations/migrator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion otlp/otlpmetrics/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions otlp/otlpmetrics/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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"
"go.opentelemetry.io/otel"
"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"
Expand Down
2 changes: 1 addition & 1 deletion otlp/otlptraces/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion otlp/otlptraces/cli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion otlp/otlptraces/traces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion otlp/otlptraces/traces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading