Merge branch 'main' into fix/es_indexed_param

components/fctl/cmd/webhooks/activate.go

@@ -64,8 +64,8 @@ func (c *ActivateWebhookController) Run(cmd *cobra.Command, args []string) (fctl
 		return nil, errors.Wrap(err, "activating config")
 	}
 
-	if response.ErrorResponse != nil {
-		return nil, fmt.Errorf("%s: %s", response.ErrorResponse.ErrorCode, response.ErrorResponse.ErrorMessage)
+	if response.WebhooksErrorResponse != nil {
+		return nil, fmt.Errorf("%s: %s", response.WebhooksErrorResponse.ErrorCode, response.WebhooksErrorResponse.ErrorMessage)
 	}
 
 	if response.StatusCode >= 300 {

components/fctl/cmd/webhooks/create.go

@@ -81,8 +81,8 @@ func (c *CreateWebhookController) Run(cmd *cobra.Command, args []string) (fctl.R
 		return nil, errors.Wrap(err, "creating config")
 	}
 
-	if response.ErrorResponse != nil {
-		return nil, fmt.Errorf("%s: %s", response.ErrorResponse.ErrorCode, response.ErrorResponse.ErrorMessage)
+	if response.WebhooksErrorResponse != nil {
+		return nil, fmt.Errorf("%s: %s", response.WebhooksErrorResponse.ErrorCode, response.WebhooksErrorResponse.ErrorMessage)
 	}
 
 	if response.StatusCode >= 300 {

components/fctl/cmd/webhooks/deactivate.go

@@ -71,8 +71,8 @@ func (c *DesactivateWebhookController) Run(cmd *cobra.Command, args []string) (f
 	c.store.Success = !response.ConfigResponse.Data.Active
 
 	// Check if there is an error
-	if response.ErrorResponse != nil {
-		return nil, fmt.Errorf("%s: %s", response.ErrorResponse.ErrorCode, response.ErrorResponse.ErrorMessage)
+	if response.WebhooksErrorResponse != nil {
+		return nil, fmt.Errorf("%s: %s", response.WebhooksErrorResponse.ErrorCode, response.WebhooksErrorResponse.ErrorMessage)
 	}
 
 	// Check if the status code is >= 300

components/fctl/cmd/webhooks/delete.go

@@ -12,8 +12,8 @@ import (
 )
 
 type DeleteWebhookStore struct {
-	ErrorResponse *shared.ErrorResponse `json:"error"`
-	Success       bool                  `json:"success"`
+	ErrorResponse *shared.WebhooksErrorResponse `json:"error"`
+	Success       bool                          `json:"success"`
 }
 
 type DeleteWebhookController struct {
@@ -74,13 +74,13 @@ func (c *DeleteWebhookController) Run(cmd *cobra.Command, args []string) (fctl.R
 		return nil, errors.Wrap(err, "deleting config")
 	}
 
-	if response.ErrorResponse != nil {
-		if response.ErrorResponse.ErrorCode == "NOT_FOUND" {
-			c.store.ErrorResponse = response.ErrorResponse
+	if response.WebhooksErrorResponse != nil {
+		if response.WebhooksErrorResponse.ErrorCode == "NOT_FOUND" {
+			c.store.ErrorResponse = response.WebhooksErrorResponse
 			c.store.Success = false
 			return c, nil
 		}
-		return nil, fmt.Errorf("%s: %s", response.ErrorResponse.ErrorCode, response.ErrorResponse.ErrorMessage)
+		return nil, fmt.Errorf("%s: %s", response.WebhooksErrorResponse.ErrorCode, response.WebhooksErrorResponse.ErrorMessage)
 	}
 
 	if response.StatusCode >= 300 {

components/fctl/cmd/webhooks/list.go

@@ -64,8 +64,8 @@ func (c *ListWebhookController) Run(cmd *cobra.Command, args []string) (fctl.Ren
 		return nil, errors.Wrap(err, "listing all config")
 	}
 
-	if response.ErrorResponse != nil {
-		return nil, fmt.Errorf("%s: %s", response.ErrorResponse.ErrorCode, response.ErrorResponse.ErrorMessage)
+	if response.WebhooksErrorResponse != nil {
+		return nil, fmt.Errorf("%s: %s", response.WebhooksErrorResponse.ErrorCode, response.WebhooksErrorResponse.ErrorMessage)
 	}
 
 	if response.StatusCode >= 300 {

components/fctl/cmd/webhooks/secret.go

@@ -77,8 +77,8 @@ func (c *ChangeSecretWebhookController) Run(cmd *cobra.Command, args []string) (
 		return nil, errors.Wrap(err, "changing secret")
 	}
 
-	if response.ErrorResponse != nil {
-		return nil, fmt.Errorf("%s: %s", response.ErrorResponse.ErrorCode, response.ErrorResponse.ErrorMessage)
+	if response.WebhooksErrorResponse != nil {
+		return nil, fmt.Errorf("%s: %s", response.WebhooksErrorResponse.ErrorCode, response.WebhooksErrorResponse.ErrorMessage)
 	}
 
 	if response.StatusCode >= 300 {

components/ledger/internal/analytics/analytics.go

@@ -7,8 +7,9 @@ import (
 	"runtime"
 	"time"
 
+	storageerrors "github.com/formancehq/ledger/internal/storage/sqlutils"
+
 	ledger "github.com/formancehq/ledger/internal"
-	storageerrors "github.com/formancehq/ledger/internal/storage"
 	"github.com/formancehq/stack/libs/go-libs/logging"
 	"github.com/pbnjay/memory"
 	"gopkg.in/segmentio/analytics-go.v3"

components/ledger/internal/analytics/backend.go

@@ -3,7 +3,8 @@ package analytics
 import (
 	"context"
 
-	storageerrors "github.com/formancehq/ledger/internal/storage"
+	storageerrors "github.com/formancehq/ledger/internal/storage/sqlutils"
+
 	"github.com/formancehq/ledger/internal/storage/driver"
 	ledgerstore "github.com/formancehq/ledger/internal/storage/ledgerstore"
 	"github.com/google/uuid"

components/ledger/internal/api/backend/context.go

@@ -0,0 +1,17 @@
+package backend
+
+import (
+	"context"
+)
+
+type ledgerKey struct{}
+
+var _ledgerKey = ledgerKey{}
+
+func ContextWithLedger(ctx context.Context, ledger Ledger) context.Context {
+	return context.WithValue(ctx, _ledgerKey, ledger)
+}
+
+func LedgerFromContext(ctx context.Context) Ledger {
+	return ctx.Value(_ledgerKey).(Ledger)
+}

components/ledger/internal/api/backend/playnumscript.go

@@ -0,0 +1,24 @@
+package backend
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"strings"
+)
+
+func EncodeLink(errStr string) string {
+	if errStr == "" {
+		return ""
+	}
+
+	errStr = strings.ReplaceAll(errStr, "\n", "\r\n")
+	payload, err := json.Marshal(map[string]any{
+		"error": errStr,
+	})
+	if err != nil {
+		panic(err)
+	}
+	payloadB64 := base64.StdEncoding.EncodeToString(payload)
+	return fmt.Sprintf("https://play.numscript.org/?payload=%v", payloadB64)
+}

components/ledger/internal/api/shared/resolver.go → components/ledger/internal/api/backend/resolver.go

@@ -1,4 +1,4 @@
-package shared
+package backend
 
 import (
 	"math/rand"
@@ -7,9 +7,10 @@ import (
 	"sync"
 	"time"
 
+	sharedapi "github.com/formancehq/stack/libs/go-libs/api"
+
 	"github.com/pkg/errors"
 
-	"github.com/formancehq/ledger/internal/api/backend"
 	"github.com/formancehq/ledger/internal/opentelemetry/tracer"
 	"github.com/formancehq/stack/libs/go-libs/logging"
 	"github.com/go-chi/chi/v5"
@@ -20,6 +21,10 @@ var (
 	mu sync.Mutex
 )
 
+const (
+	ErrOutdatedSchema = "OUTDATED_SCHEMA"
+)
+
 func init() {
 	r = rand.New(rand.NewSource(time.Now().UnixNano()))
 }
@@ -38,7 +43,7 @@ func randomTraceID(n int) string {
 }
 
 func LedgerMiddleware(
-	resolver backend.Backend,
+	resolver Backend,
 	excludePathFromSchemaCheck []string,
 ) func(handler http.Handler) http.Handler {
 	return func(handler http.Handler) http.Handler {
@@ -67,7 +72,7 @@ func LedgerMiddleware(
 
 			l, err := resolver.GetLedger(r.Context(), name)
 			if err != nil {
-				ResponseError(w, r, err)
+				sharedapi.BadRequest(w, sharedapi.ErrorInternal, err)
 				return
 			}
 
@@ -82,11 +87,11 @@ func LedgerMiddleware(
 			if !excluded {
 				isUpToDate, err := l.IsDatabaseUpToDate(ctx)
 				if err != nil {
-					ResponseError(w, r, err)
+					sharedapi.BadRequest(w, sharedapi.ErrorInternal, err)
 					return
 				}
 				if !isUpToDate {
-					ResponseError(w, r, errors.New("outdated schema"))
+					sharedapi.BadRequest(w, ErrOutdatedSchema, errors.New("You need to upgrade your ledger schema to the last version"))
 					return
 				}
 			}

components/ledger/internal/api/router.go

@@ -18,6 +18,12 @@ func NewRouter(
 	readOnly bool,
 ) chi.Router {
 	mux := chi.NewRouter()
+	mux.Use(func(handler http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Set("Content-Type", "application/json")
+			handler.ServeHTTP(w, r)
+		})
+	})
 	if readOnly {
 		mux.Use(ReadOnly)
 	}