fix: prevent fallback to legacy store

.coderabbit.yaml

@@ -0,0 +1,247 @@
+language: en-US
+tone_instructions: ''
+early_access: true
+enable_free_tier: true
+reviews:
+  profile: chill
+  request_changes_workflow: false
+  high_level_summary: false
+  high_level_summary_placeholder: '@coderabbitai summary'
+  high_level_summary_in_walkthrough: false
+  auto_title_placeholder: '@coderabbitai'
+  auto_title_instructions: ''
+  review_status: true
+  commit_status: true
+  fail_commit_status: false
+  collapse_walkthrough: false
+  changed_files_summary: true
+  sequence_diagrams: true
+  assess_linked_issues: true
+  related_issues: true
+  related_prs: true
+  suggested_labels: true
+  auto_apply_labels: false
+  suggested_reviewers: true
+  auto_assign_reviewers: false
+  poem: true
+  labeling_instructions: []
+  path_filters:
+    - '!dist/**'
+    - '!**/*.app'
+    - '!**/*.bin'
+    - '!**/*.bz2'
+    - '!**/*.class'
+    - '!**/*.db'
+    - '!**/*.csv'
+    - '!**/*.tsv'
+    - '!**/*.dat'
+    - '!**/*.dll'
+    - '!**/*.dylib'
+    - '!**/*.egg'
+    - '!**/*.glif'
+    - '!**/*.gz'
+    - '!**/*.xz'
+    - '!**/*.zip'
+    - '!**/*.7z'
+    - '!**/*.rar'
+    - '!**/*.zst'
+    - '!**/*.ico'
+    - '!**/*.jar'
+    - '!**/*.tar'
+    - '!**/*.war'
+    - '!**/*.lo'
+    - '!**/*.log'
+    - '!**/*.mp3'
+    - '!**/*.wav'
+    - '!**/*.wma'
+    - '!**/*.mp4'
+    - '!**/*.avi'
+    - '!**/*.mkv'
+    - '!**/*.wmv'
+    - '!**/*.m4a'
+    - '!**/*.m4v'
+    - '!**/*.3gp'
+    - '!**/*.3g2'
+    - '!**/*.rm'
+    - '!**/*.mov'
+    - '!**/*.flv'
+    - '!**/*.iso'
+    - '!**/*.swf'
+    - '!**/*.flac'
+    - '!**/*.nar'
+    - '!**/*.o'
+    - '!**/*.ogg'
+    - '!**/*.otf'
+    - '!**/*.p'
+    - '!**/*.pdf'
+    - '!**/*.doc'
+    - '!**/*.docx'
+    - '!**/*.xls'
+    - '!**/*.xlsx'
+    - '!**/*.map'
+    - '!**/*.out'
+    - '!**/*.ppt'
+    - '!**/*.pptx'
+    - '!**/*.pkl'
+    - '!**/*.pickle'
+    - '!**/*.pyc'
+    - '!**/*.pyd'
+    - '!**/*.pyo'
+    - '!**/*.pub'
+    - '!**/*.pem'
+    - '!**/*.rkt'
+    - '!**/*.so'
+    - '!**/*.ss'
+    - '!**/*.eot'
+    - '!**/*.exe'
+    - '!**/*.pb.go'
+    - '!**/*.pb.gw.go'
+    - '!**/*.lock'
+    - '!**/*.ttf'
+    - '!**/*.yaml'
+    - '!**/*.yml'
+    - '!**/*.xml'
+    - '!**/*.cfg'
+    - '!**/*.toml'
+    - '!**/*.ini'
+    - '!**/*.mod'
+    - '!**/*.sum'
+    - '!**/*.work'
+    - '!**/*.json'
+    - '!**/*.mmd'
+    - '!**/*.svg'
+    - '!**/*.jpeg'
+    - '!**/*.jpg'
+    - '!**/*.png'
+    - '!**/*.gif'
+    - '!**/*.bmp'
+    - '!**/*.tiff'
+    - '!**/*.webm'
+    - '!**/*.woff'
+    - '!**/*.woff2'
+    - '!**/*.dot'
+    - '!**/*.md5sum'
+    - '!**/*.wasm'
+    - '!**/*.snap'
+    - '!**/*.parquet'
+    - '!**/gen/**'
+    - '!**/_gen/**'
+    - '!**/generated/**'
+    - '!**/@generated/**'
+    - '!**/vendor/**'
+    - '!**/*.min.js'
+    - '!**/*.min.js.map'
+    - '!**/*.min.js.css'
+    - '!**/*.tfstate'
+    - '!**/*.tfstate.backup'
+  path_instructions: []
+  abort_on_close: true
+  disable_cache: false
+  auto_review:
+    enabled: true
+    auto_incremental_review: true
+    ignore_title_keywords: []
+    labels: []
+    drafts: false
+    base_branches:
+      - main
+      - release/.*
+  finishing_touches:
+    docstrings:
+      enabled: true
+  tools:
+    ast-grep:
+      rule_dirs: []
+      util_dirs: []
+      essential_rules: true
+      packages: []
+    shellcheck:
+      enabled: true
+    ruff:
+      enabled: true
+    markdownlint:
+      enabled: true
+    github-checks:
+      enabled: true
+      timeout_ms: 90000
+    languagetool:
+      enabled: true
+      enabled_rules: []
+      disabled_rules: []
+      enabled_categories: []
+      disabled_categories: []
+      enabled_only: false
+      level: default
+    biome:
+      enabled: true
+    hadolint:
+      enabled: true
+    swiftlint:
+      enabled: true
+    phpstan:
+      enabled: true
+      level: default
+    golangci-lint:
+      enabled: true
+    yamllint:
+      enabled: true
+    gitleaks:
+      enabled: true
+    checkov:
+      enabled: true
+    detekt:
+      enabled: true
+    eslint:
+      enabled: true
+    rubocop:
+      enabled: true
+    buf:
+      enabled: true
+    regal:
+      enabled: true
+    actionlint:
+      enabled: true
+    pmd:
+      enabled: true
+    cppcheck:
+      enabled: true
+    semgrep:
+      enabled: true
+    circleci:
+      enabled: true
+    sqlfluff:
+      enabled: true
+    prismaLint:
+      enabled: true
+    oxc:
+      enabled: true
+    shopifyThemeCheck:
+      enabled: true
+chat:
+  auto_reply: true
+  create_issues: true
+  integrations:
+    jira:
+      usage: auto
+    linear:
+      usage: auto
+knowledge_base:
+  opt_out: false
+  web_search:
+    enabled: true
+  learnings:
+    scope: auto
+  issues:
+    scope: auto
+  jira:
+    usage: auto
+    project_keys: []
+  linear:
+    usage: auto
+    team_keys: []
+  pull_requests:
+    scope: auto
+code_generation:
+  docstrings:
+    language: en-US
+    path_instructions: []

.github/workflows/main.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - releases/*
+      - release/*
   pull_request:
     types: [ assigned, opened, synchronize, reopened, labeled ]
 

.gitignore

@@ -6,3 +6,4 @@ dist
 vendor
 worktrees
 dumps
+Pulumi.*.yaml

Earthfile

@@ -1,7 +1,7 @@
 VERSION --wildcard-builds 0.8
 PROJECT FormanceHQ/ledger
 
-IMPORT github.com/formancehq/earthly:tags/v0.19.0 AS core
+IMPORT github.com/formancehq/earthly:tags/v0.19.1 AS core
 
 FROM core+base-image
 
@@ -181,9 +181,14 @@ release:
 
 generate-client:
     FROM node:20-alpine
-    RUN apk update && apk add yq jq
+    RUN apk update && apk add yq jq curl
     WORKDIR /src
-    COPY (core+sources-speakeasy/speakeasy) /bin/speakeasy
+    ARG TARGETARCH
+    ARG SPEAKEASY_VERSION=v1.517.3
+    RUN curl -fsSL https://github.com/speakeasy-api/speakeasy/releases/download/${SPEAKEASY_VERSION}/speakeasy_linux_$TARGETARCH.zip -o /tmp/speakeasy_linux_$TARGETARCH.zip
+    RUN unzip /tmp/speakeasy_linux_$TARGETARCH.zip speakeasy
+    RUN chmod +x speakeasy
+    RUN mv speakeasy /bin/speakeasy
     COPY (+openapi/openapi.yaml) openapi.yaml
     RUN cat ./openapi.yaml |  yq e -o json > openapi.json
     COPY (core+sources/out --LOCATION=openapi-overlay.json) openapi-overlay.json

cmd/buckets_upgrade.go

@@ -3,13 +3,13 @@ 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/ledger/internal/storage/bucket"
+	"github.com/formancehq/ledger/internal/storage"
 	"github.com/formancehq/ledger/internal/storage/driver"
-	"github.com/formancehq/ledger/internal/storage/ledger"
-	systemstore "github.com/formancehq/ledger/internal/storage/system"
 	"github.com/spf13/cobra"
-	"github.com/uptrace/bun"
+	"go.uber.org/fx"
 )
 
 func NewBucketUpgrade() *cobra.Command {
@@ -18,22 +18,13 @@ func NewBucketUpgrade() *cobra.Command {
 		Args:         cobra.ExactArgs(1),
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			logger := logging.NewDefaultLogger(cmd.OutOrStdout(), service.IsDebug(cmd), false, false)
-			cmd.SetContext(logging.ContextWithLogger(cmd.Context(), logger))
+			return withStorageDriver(cmd, func(driver *driver.Driver) error {
+				if args[0] == "*" {
+					return driver.UpgradeAllBuckets(cmd.Context())
+				}
 
-			driver, db, err := getDriver(cmd)
-			if err != nil {
-				return err
-			}
-			defer func() {
-				_ = db.Close()
-			}()
-
-			if args[0] == "*" {
-				return driver.UpgradeAllBuckets(cmd.Context())
-			}
-
-			return driver.UpgradeBucket(cmd.Context(), args[0])
+				return driver.UpgradeBucket(cmd.Context(), args[0])
+			})
 		},
 	}
 
@@ -43,26 +34,32 @@ func NewBucketUpgrade() *cobra.Command {
 	return cmd
 }
 
-func getDriver(cmd *cobra.Command) (*driver.Driver, *bun.DB, error) {
+func withStorageDriver(cmd *cobra.Command, fn func(driver *driver.Driver) error) error {
 
-	connectionOptions, err := bunconnect.ConnectionOptionsFromFlags(cmd)
-	if err != nil {
-		return nil, nil, err
-	}
+	logger := logging.NewDefaultLogger(cmd.OutOrStdout(), service.IsDebug(cmd), false, false)
 
-	db, err := bunconnect.OpenSQLDB(cmd.Context(), *connectionOptions)
+	connectionOptions, err := bunconnect.ConnectionOptionsFromFlags(cmd)
 	if err != nil {
-		return nil, nil, err
+		return err
 	}
 
-	driver := driver.New(
-		ledger.NewFactory(db),
-		systemstore.New(db),
-		bucket.NewDefaultFactory(db),
+	var d *driver.Driver
+	app := fx.New(
+		fx.NopLogger,
+		otlp.FXModuleFromFlags(cmd, otlp.WithServiceVersion(Version)),
+		otlptraces.FXModuleFromFlags(cmd),
+		bunconnect.Module(*connectionOptions, service.IsDebug(cmd)),
+		storage.NewFXModule(false),
+		fx.Supply(fx.Annotate(logger, fx.As(new(logging.Logger)))),
+		fx.Populate(&d),
 	)
-	if err := driver.Initialize(cmd.Context()); err != nil {
-		return nil, nil, err
+	err = app.Start(cmd.Context())
+	if err != nil {
+		return err
 	}
+	defer func() {
+		_ = app.Stop(cmd.Context())
+	}()
 
-	return driver, db, nil
+	return fn(d)
 }