Skip to content

Commit

Permalink
refactor(go-libs): Move to dedicated repository (#1709)
Browse files Browse the repository at this point in the history
  • Loading branch information
flemzord authored Sep 20, 2024
1 parent f523266 commit 6c0f217
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 54 deletions.
1 change: 0 additions & 1 deletion Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ FROM core+base-image

sources:
WORKDIR src
DO stack+INCLUDE_GO_LIBS --LOCATION libs/go-libs
WORKDIR /src/ee/auth
COPY go.* .
COPY --dir cmd pkg .
Expand Down
4 changes: 2 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package cmd

import (
"github.com/formancehq/stack/libs/go-libs/service"
"github.com/formancehq/go-libs/service"

"github.com/formancehq/auth/pkg/storage/sqlstorage"
"github.com/formancehq/stack/libs/go-libs/bun/bunmigrate"
"github.com/formancehq/go-libs/bun/bunmigrate"
"github.com/uptrace/bun"

"github.com/spf13/cobra"
Expand Down
14 changes: 7 additions & 7 deletions cmd/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ import (

"gopkg.in/yaml.v3"

"github.com/formancehq/stack/libs/go-libs/aws/iam"
"github.com/formancehq/stack/libs/go-libs/bun/bunconnect"
"github.com/formancehq/stack/libs/go-libs/licence"
"github.com/formancehq/go-libs/aws/iam"
"github.com/formancehq/go-libs/bun/bunconnect"
"github.com/formancehq/go-libs/licence"

"github.com/formancehq/stack/libs/go-libs/otlp"
"github.com/formancehq/go-libs/otlp"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"

auth "github.com/formancehq/auth/pkg"
"github.com/formancehq/auth/pkg/api"
"github.com/formancehq/auth/pkg/delegatedauth"
"github.com/formancehq/auth/pkg/oidc"
"github.com/formancehq/auth/pkg/storage/sqlstorage"
sharedapi "github.com/formancehq/stack/libs/go-libs/api"
"github.com/formancehq/stack/libs/go-libs/otlp/otlptraces"
"github.com/formancehq/stack/libs/go-libs/service"
sharedapi "github.com/formancehq/go-libs/api"
"github.com/formancehq/go-libs/otlp/otlptraces"
"github.com/formancehq/go-libs/service"
"github.com/pkg/errors"
"github.com/spf13/cobra"
zLogging "github.com/zitadel/logging"
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22
toolchain go1.22.6

require (
github.com/formancehq/stack/libs/go-libs v0.0.0-00010101000000-000000000000
github.com/formancehq/go-libs v1.5.0
github.com/go-chi/chi/v5 v5.1.0
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/google/uuid v1.6.0
Expand Down Expand Up @@ -133,5 +133,3 @@ require (
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

replace github.com/formancehq/stack/libs/go-libs => ../../libs/go-libs
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
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 v1.5.0 h1:jOVET378uquKvQBnSaS8ClLFbk7fB1Lhy4xM0+RK74o=
github.com/formancehq/go-libs v1.5.0/go.mod h1:rnvi4Au1DCNephaBEVzcv64BZEEksXiyKjwo/wHG51Y=
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
Expand Down
6 changes: 3 additions & 3 deletions pkg/api/authorization/accesstoken_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"net/http"
"testing"

"github.com/formancehq/stack/libs/go-libs/bun/bundebug"
"github.com/formancehq/go-libs/bun/bundebug"
"github.com/uptrace/bun"

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

"github.com/formancehq/stack/libs/go-libs/bun/bunconnect"
"github.com/formancehq/go-libs/bun/bunconnect"

auth "github.com/formancehq/auth/pkg"
"github.com/formancehq/auth/pkg/delegatedauth"
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/authorization/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package authorization
import (
"testing"

"github.com/formancehq/stack/libs/go-libs/logging"
"github.com/formancehq/stack/libs/go-libs/testing/docker"
"github.com/formancehq/stack/libs/go-libs/testing/utils"
"github.com/formancehq/go-libs/logging"
"github.com/formancehq/go-libs/testing/docker"
"github.com/formancehq/go-libs/testing/utils"

"github.com/formancehq/stack/libs/go-libs/testing/platform/pgtesting"
"github.com/formancehq/go-libs/testing/platform/pgtesting"
)

var srv *pgtesting.PostgresServer
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/clients.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/uptrace/bun"

auth "github.com/formancehq/auth/pkg"
_ "github.com/formancehq/stack/libs/go-libs/api"
_ "github.com/formancehq/go-libs/api"
)

func addClientRoutes(db *bun.DB, r chi.Router) {
Expand Down
10 changes: 5 additions & 5 deletions pkg/api/clients_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ import (
"net/http/httptest"
"testing"

"github.com/formancehq/stack/libs/go-libs/bun/bundebug"

"github.com/go-chi/chi/v5"

"github.com/formancehq/stack/libs/go-libs/logging"
"github.com/formancehq/go-libs/bun/bundebug"

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

"github.com/formancehq/stack/libs/go-libs/bun/bunconnect"
"github.com/formancehq/go-libs/bun/bunconnect"
"github.com/uptrace/bun"

auth "github.com/formancehq/auth/pkg"
"github.com/formancehq/auth/pkg/storage/sqlstorage"
"github.com/formancehq/stack/libs/go-libs/collectionutils"
"github.com/formancehq/go-libs/collectionutils"
"github.com/stretchr/testify/require"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/api/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package api
import (
"testing"

"github.com/formancehq/stack/libs/go-libs/logging"
"github.com/formancehq/stack/libs/go-libs/testing/docker"
"github.com/formancehq/stack/libs/go-libs/testing/utils"
"github.com/formancehq/go-libs/logging"
"github.com/formancehq/go-libs/testing/docker"
"github.com/formancehq/go-libs/testing/utils"

"github.com/formancehq/stack/libs/go-libs/testing/platform/pgtesting"
"github.com/formancehq/go-libs/testing/platform/pgtesting"
)

var srv *pgtesting.PostgresServer
Expand Down
11 changes: 6 additions & 5 deletions pkg/api/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ package api
import (
"net/http"

"github.com/formancehq/stack/libs/go-libs/service"
"github.com/go-chi/chi/v5"

"github.com/formancehq/go-libs/service"

"github.com/formancehq/auth/pkg/api/authorization"

"github.com/formancehq/stack/libs/go-libs/api"
"github.com/formancehq/stack/libs/go-libs/health"
"github.com/formancehq/stack/libs/go-libs/httpserver"
"github.com/go-chi/chi/v5"
"github.com/formancehq/go-libs/api"
"github.com/formancehq/go-libs/health"
"github.com/formancehq/go-libs/httpserver"
"github.com/zitadel/oidc/v2/pkg/op"
"go.uber.org/fx"
)
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/users_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"net/http/httptest"
"testing"

"github.com/formancehq/stack/libs/go-libs/bun/bundebug"

"github.com/go-chi/chi/v5"

"github.com/formancehq/stack/libs/go-libs/logging"
"github.com/formancehq/go-libs/bun/bundebug"

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

"github.com/formancehq/stack/libs/go-libs/bun/bunconnect"
"github.com/formancehq/go-libs/bun/bunconnect"
"github.com/uptrace/bun"

auth "github.com/formancehq/auth/pkg"
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/uptrace/bun"

"github.com/formancehq/stack/libs/go-libs/api"
"github.com/formancehq/stack/libs/go-libs/logging"
"github.com/formancehq/go-libs/api"
"github.com/formancehq/go-libs/logging"
"go.opentelemetry.io/otel/trace"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/api/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http/httptest"
"testing"

"github.com/formancehq/stack/libs/go-libs/api"
"github.com/formancehq/go-libs/api"
"github.com/stretchr/testify/require"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/oidc/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package oidc_test
import (
"testing"

"github.com/formancehq/stack/libs/go-libs/logging"
"github.com/formancehq/stack/libs/go-libs/testing/docker"
"github.com/formancehq/stack/libs/go-libs/testing/utils"
"github.com/formancehq/go-libs/logging"
"github.com/formancehq/go-libs/testing/docker"
"github.com/formancehq/go-libs/testing/utils"

"github.com/formancehq/stack/libs/go-libs/testing/platform/pgtesting"
"github.com/formancehq/go-libs/testing/platform/pgtesting"
)

var srv *pgtesting.PostgresServer
Expand Down
7 changes: 3 additions & 4 deletions pkg/oidc/oidc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ import (
"testing"
"time"

"github.com/formancehq/stack/libs/go-libs/bun/bundebug"
"github.com/formancehq/go-libs/bun/bundebug"
"github.com/uptrace/bun"

"github.com/formancehq/go-libs/logging"
"github.com/go-chi/chi/v5"

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

"github.com/formancehq/stack/libs/go-libs/bun/bunconnect"
"github.com/formancehq/go-libs/bun/bunconnect"

auth "github.com/formancehq/auth/pkg"
"github.com/formancehq/auth/pkg/delegatedauth"
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/sqlstorage/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

auth "github.com/formancehq/auth/pkg"
"github.com/formancehq/stack/libs/go-libs/migrations"
"github.com/formancehq/go-libs/migrations"
"github.com/uptrace/bun"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/storage/sqlstorage/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import (
"context"
"crypto/rsa"

"github.com/formancehq/stack/libs/go-libs/logging"
"github.com/formancehq/go-libs/logging"
"github.com/uptrace/bun"

"github.com/formancehq/stack/libs/go-libs/bun/bunconnect"
"github.com/formancehq/go-libs/bun/bunconnect"

auth "github.com/formancehq/auth/pkg"
"github.com/formancehq/auth/pkg/oidc"
"github.com/formancehq/stack/libs/go-libs/health"
"github.com/formancehq/go-libs/health"
"github.com/zitadel/oidc/v2/pkg/op"
"go.uber.org/fx"
)
Expand Down

0 comments on commit 6c0f217

Please sign in to comment.