chore: import integration tests from stack repository

Author: gfyrag

cmd/root.go

@@ -1,10 +1,10 @@
 package cmd
 
 import (
-	"github.com/formancehq/go-libs/service"
+	"github.com/formancehq/go-libs/v2/service"
 
 	"github.com/formancehq/auth/pkg/storage/sqlstorage"
-	"github.com/formancehq/go-libs/bun/bunmigrate"
+	"github.com/formancehq/go-libs/v2/bun/bunmigrate"
 	"github.com/uptrace/bun"
 
 	"github.com/spf13/cobra"

cmd/serve.go

@@ -10,39 +10,39 @@ import (
 
 	"gopkg.in/yaml.v3"
 
-	"github.com/formancehq/go-libs/aws/iam"
-	"github.com/formancehq/go-libs/bun/bunconnect"
-	"github.com/formancehq/go-libs/collectionutils"
-	"github.com/formancehq/go-libs/licence"
-	"github.com/formancehq/go-libs/logging"
+	"github.com/formancehq/go-libs/v2/aws/iam"
+	"github.com/formancehq/go-libs/v2/bun/bunconnect"
+	"github.com/formancehq/go-libs/v2/collectionutils"
+	"github.com/formancehq/go-libs/v2/licence"
+	"github.com/formancehq/go-libs/v2/logging"
 
-	"github.com/formancehq/go-libs/otlp"
+	"github.com/formancehq/go-libs/v2/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/go-libs/api"
-	"github.com/formancehq/go-libs/otlp/otlptraces"
-	"github.com/formancehq/go-libs/service"
+	sharedapi "github.com/formancehq/go-libs/v2/api"
+	"github.com/formancehq/go-libs/v2/otlp/otlptraces"
+	"github.com/formancehq/go-libs/v2/service"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	zLogging "github.com/zitadel/logging"
 	"go.uber.org/fx"
 )
 
 const (
-	serviceName = "auth"
+	ServiceName = "auth"
 
-	delegatedClientIDFlag     = "delegated-client-id"
-	delegatedClientSecretFlag = "delegated-client-secret"
-	delegatedIssuerFlag       = "delegated-issuer"
-	baseUrlFlag               = "base-url"
-	listenFlag                = "listen"
-	signingKeyFlag            = "signing-key"
-	configFlag                = "config"
+	DelegatedClientIDFlag     = "delegated-client-id"
+	DelegatedClientSecretFlag = "delegated-client-secret"
+	DelegatedIssuerFlag       = "delegated-issuer"
+	BaseUrlFlag               = "base-url"
+	ListenFlag                = "listen"
+	SigningKeyFlag            = "signing-key"
+	ConfigFlag                = "config"
 
 	defaultSigningKey = `
 -----BEGIN RSA PRIVATE KEY-----
@@ -94,12 +94,12 @@ func newServeCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use: "serve",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			baseUrl, _ := cmd.Flags().GetString(baseUrlFlag)
+			baseUrl, _ := cmd.Flags().GetString(BaseUrlFlag)
 			if baseUrl == "" {
 				return errors.New("base url must be defined")
 			}
 
-			signingKey, _ := cmd.Flags().GetString(signingKeyFlag)
+			signingKey, _ := cmd.Flags().GetString(SigningKeyFlag)
 			if signingKey == "" {
 				return errors.New("signing key must be defined")
 			}
@@ -119,7 +119,7 @@ func newServeCommand() *cobra.Command {
 			}
 			o := configuration{}
 
-			config, _ := cmd.Flags().GetString(configFlag)
+			config, _ := cmd.Flags().GetString(ConfigFlag)
 			if config != "" {
 				configFile, err := os.Open(config)
 				if err != nil {
@@ -145,7 +145,7 @@ func newServeCommand() *cobra.Command {
 				return err
 			}
 
-			listen, _ := cmd.Flags().GetString(listenFlag)
+			listen, _ := cmd.Flags().GetString(ListenFlag)
 			options := []fx.Option{
 				otlpHttpClientModule(service.IsDebug(cmd)),
 				fx.Supply(fx.Annotate(cmd.Context(), fx.As(new(context.Context)))),
@@ -157,14 +157,14 @@ func newServeCommand() *cobra.Command {
 				}, service.IsDebug(cmd)),
 			}
 
-			delegatedIssuer, _ := cmd.Flags().GetString(delegatedIssuerFlag)
+			delegatedIssuer, _ := cmd.Flags().GetString(DelegatedIssuerFlag)
 			if delegatedIssuer != "" {
-				delegatedClientID, _ := cmd.Flags().GetString(delegatedClientIDFlag)
+				delegatedClientID, _ := cmd.Flags().GetString(DelegatedClientIDFlag)
 				if delegatedClientID == "" {
 					return errors.New("delegated client id must be defined")
 				}
 
-				delegatedClientSecret, _ := cmd.Flags().GetString(delegatedClientSecretFlag)
+				delegatedClientSecret, _ := cmd.Flags().GetString(DelegatedClientSecretFlag)
 				if delegatedClientSecret == "" {
 					return errors.New("delegated client secret must be defined")
 				}
@@ -177,23 +177,25 @@ func newServeCommand() *cobra.Command {
 						RedirectURL:  fmt.Sprintf("%s/authorize/callback", baseUrl),
 					}),
 					delegatedauth.Module(),
-					licence.FXModuleFromFlags(cmd, serviceName),
 				)
 			}
 
-			options = append(options, otlptraces.FXModuleFromFlags(cmd))
+			options = append(options,
+				otlptraces.FXModuleFromFlags(cmd),
+				licence.FXModuleFromFlags(cmd, ServiceName),
+			)
 
 			return service.New(cmd.OutOrStdout(), options...).Run(cmd)
 		},
 	}
 
-	cmd.Flags().String(delegatedIssuerFlag, "", "Delegated OIDC issuer")
-	cmd.Flags().String(delegatedClientIDFlag, "", "Delegated OIDC client id")
-	cmd.Flags().String(delegatedClientSecretFlag, "", "Delegated OIDC client secret")
-	cmd.Flags().String(baseUrlFlag, "http://localhost:8080", "Base service url")
-	cmd.Flags().String(signingKeyFlag, defaultSigningKey, "Signing key")
-	cmd.Flags().String(listenFlag, ":8080", "Listening address")
-	cmd.Flags().String(configFlag, "", "Config file name without extension")
+	cmd.Flags().String(DelegatedIssuerFlag, "", "Delegated OIDC issuer")
+	cmd.Flags().String(DelegatedClientIDFlag, "", "Delegated OIDC client id")
+	cmd.Flags().String(DelegatedClientSecretFlag, "", "Delegated OIDC client secret")
+	cmd.Flags().String(BaseUrlFlag, "http://localhost:8080", "Base service url")
+	cmd.Flags().String(SigningKeyFlag, defaultSigningKey, "Signing key")
+	cmd.Flags().String(ListenFlag, ":8080", "Listening address")
+	cmd.Flags().String(ConfigFlag, "", "Config file name without extension")
 
 	service.AddFlags(cmd.Flags())
 	licence.AddFlags(cmd.Flags())

go.mod

@@ -2,12 +2,18 @@ module github.com/formancehq/auth
 
 go 1.23.7
 
+replace github.com/formancehq/auth/pkg/client => ./pkg/client
+
 require (
+	github.com/formancehq/auth/pkg/client v0.0.0-00010101000000-000000000000
 	github.com/formancehq/go-libs v1.7.2
+	github.com/formancehq/go-libs/v2 v2.2.2
 	github.com/go-chi/chi/v5 v5.2.1
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/google/uuid v1.6.0
 	github.com/oauth2-proxy/mockoidc v0.0.0-20220308204021-b9169deeb282
+	github.com/onsi/ginkgo/v2 v2.22.1
+	github.com/onsi/gomega v1.36.2
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.9.1
 	github.com/stretchr/testify v1.10.0
@@ -62,76 +68,100 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
 	github.com/docker/cli v27.3.1+incompatible // indirect
-	github.com/docker/docker v27.3.1+incompatible // indirect
+	github.com/docker/docker v27.5.1+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
+	github.com/ebitengine/purego v0.8.2 // indirect
+	github.com/ericlagergren/decimal v0.0.0-20221120152707-495c53812d05 // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-sql-driver/mysql v1.9.1 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
-	github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gorilla/schema v1.4.1 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/invopop/jsonschema v0.13.0 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgx/v5 v5.7.2 // indirect
+	github.com/jackc/pgxlisten v0.0.0-20241005155529-9d952acd6a6c // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
 	github.com/lestrrat-go/blackmagic v1.0.2 // indirect
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
 	github.com/lestrrat-go/jwx v1.2.30 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
-	github.com/lib/pq v1.10.9 // indirect
 	github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
+	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/muhlemmer/gu v0.3.1 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/opencontainers/runc v1.1.14 // indirect
 	github.com/ory/dockertest/v3 v3.11.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	github.com/riandyrn/otelchi v0.12.1 // indirect
 	github.com/rs/cors v1.11.1 // indirect
+	github.com/shirou/gopsutil/v4 v4.24.12 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/tklauser/go-sysconf v0.3.14 // indirect
+	github.com/tklauser/numcpus v0.9.0 // indirect
 	github.com/uptrace/opentelemetry-go-extra/otellogrus v0.3.2 // indirect
 	github.com/uptrace/opentelemetry-go-extra/otelutil v0.3.2 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xo/dburl v0.23.4 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/host v0.59.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/runtime v0.59.0 // indirect
 	go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.35.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.35.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.35.0 // indirect
 	go.opentelemetry.io/otel/log v0.11.0 // indirect
 	go.opentelemetry.io/otel/metric v1.35.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
 	go.uber.org/dig v1.18.1 // indirect
 	go.uber.org/mock v0.5.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/tools v0.25.0 // indirect
+	golang.org/x/tools v0.30.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
 	google.golang.org/grpc v1.71.1 // indirect