Merge branch 'main' into releases/v2.0.0

formancehq · May 21, 2024 · 3316b72 · 3316b72
2 parents b4a1f03 + 21aebfb
commit 3316b72
Show file tree

Hide file tree

Showing 287 changed files with 9,987 additions and 4,769 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+indent_style = space
+indent_size = 4
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
         uses: ./.github/actions/env
       - run: >
           earthly
-          --allow-privileged
+          --allow-privileged --auto-skip
           --secret SPEAKEASY_API_KEY=$SPEAKEASY_API_KEY
           ${{ contains(github.event.pull_request.labels.*.name, 'no-cache') && '--no-cache' || '' }}
           +pre-commit
@@ -40,7 +40,7 @@ jobs:
             exit 1
           fi
 
-  Main:
+  Tests:
     runs-on: "formance-runner"
     needs:
       - Dirty
@@ -60,6 +60,26 @@ jobs:
         env:
           SPEAKEASY_API_KEY: ${{ secrets.SPEAKEASY_API_KEY }}
 
+  TestsIntegration:
+    runs-on: "formance-runner"
+    needs:
+      - Dirty
+    steps:
+      - uses: 'actions/checkout@v4'
+        with:
+          fetch-depth: 0
+      - name: Setup Env
+        uses: ./.github/actions/env
+      - run: >
+          earthly
+          --no-output
+          --allow-privileged
+          --secret SPEAKEASY_API_KEY=$SPEAKEASY_API_KEY
+          ${{ contains(github.event.pull_request.labels.*.name, 'no-cache') && '--no-cache' || '' }}
+          +tests-integration
+        env:
+          SPEAKEASY_API_KEY: ${{ secrets.SPEAKEASY_API_KEY }}
+
   Extract:
     name: Extract
     runs-on: "ubuntu-latest"
@@ -121,7 +141,8 @@ jobs:
     if: github.ref == 'refs/heads/main'
     needs:
       - GoReleaser
-      - Main
+      - Tests
+      - TestsIntegration
     steps:
       - uses: earthly/actions-setup@v1
         with:

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -17,7 +17,7 @@ jobs:
         uses: ./.github/actions/env
       - run: >
           earthly
-          --allow-privileged
+          --allow-privileged --auto-skip
           --secret SPEAKEASY_API_KEY=$SPEAKEASY_API_KEY
           ${{ contains(github.event.pull_request.labels.*.name, 'no-cache') && '--no-cache' || '' }}
           +pre-commit
@@ -89,7 +89,7 @@ jobs:
           FURY_TOKEN: ${{ secrets.FURY_TOKEN }}
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
 
-  Sdks:
+  OpenAPI:
     runs-on: "ubuntu-latest"
     needs:
       - GoReleaser
@@ -129,7 +129,7 @@ jobs:
       - name: Publish Helm
         run: >
           earthly
-          --allow-privileged
+          --allow-privileged --auto-skip
           --secret GITHUB_TOKEN=$GITHUB_TOKEN
           +helm-publish
         env:

diff --git a/Earthfile b/Earthfile
@@ -1,7 +1,7 @@
 VERSION 0.8
+PROJECT FormanceHQ/stack
 
-ARG core=github.com/formancehq/earthly
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 
 sources:
     FROM core+base-image
@@ -12,7 +12,7 @@ sources:
 speakeasy:
     FROM core+base-image
     RUN apk update && apk add yarn jq unzip curl
-    ARG VERSION=v1.147.0
+    ARG VERSION=v1.292.0
     ARG TARGETARCH
     RUN curl -fsSL https://github.com/speakeasy-api/speakeasy/releases/download/${VERSION}/speakeasy_linux_$TARGETARCH.zip -o /tmp/speakeasy_linux_$TARGETARCH.zip
     RUN unzip /tmp/speakeasy_linux_$TARGETARCH.zip speakeasy
@@ -157,53 +157,39 @@ staging-application-set:
 staging-application-sync:
     BUILD core+application-sync --APPLICATION=staging-eu-west-1-hosting-regions
 
-tests-all:
+tests:
     LOCALLY
-    FOR component IN $(cd ./components && ls -d */)
-        BUILD --pass-args ./components/${component}+tests
-    END
-    FOR component IN $(cd ./ee && ls -d */)
-        BUILD --pass-args ./ee/${component}+tests
-    END
+    BUILD ./components+run --TARGET=tests
+    BUILD ./ee+run --TARGET=tests
 
 tests-integration:
     FROM core+base-image
-    BUILD --pass-args ./tests/integration+tests
+    BUILD ./tests/integration+tests
 
 pre-commit: # Generate the final spec and run all the pre-commit hooks
     LOCALLY
-    BUILD --pass-args ./releases+sdk-generate
-    FOR component IN $(cd ./libs && ls -d */)
-        BUILD --pass-args ./libs/${component}+pre-commit
-    END
-    FOR component IN $(cd ./components && ls -d */)
-        BUILD --pass-args ./components/${component}+pre-commit
-    END
-    FOR component IN $(cd ./ee && ls -d */)
-        BUILD --pass-args ./ee/${component}+pre-commit
-    END
-    BUILD --pass-args ./helm/+pre-commit
-    BUILD --pass-args ./tests/integration+pre-commit
+    BUILD ./releases+sdk-generate
+    BUILD ./libs+run --TARGET=pre-commit
+    BUILD ./components+run --TARGET=pre-commit
+    BUILD ./ee+run --TARGET=pre-commit
+    BUILD ./helm/+pre-commit
+    BUILD ./tests/integration+pre-commit
 
 tidy: # Run tidy on all the components
     LOCALLY
-    FOR component IN $(cd ./components && ls -d */)
-        BUILD --pass-args ./components/${component}+tidy
-    END
-    FOR component IN $(cd ./ee && ls -d */)
-        BUILD --pass-args ./ee/${component}+tidy
-    END
-    BUILD --pass-args ./tests/integration+tidy
+    BUILD ./components+run --TARGET=tidy
+    BUILD ./ee+run --TARGET=tidy
+    BUILD ./tests/integration+tidy
 
-tests:
+tests-all:
     LOCALLY
-    BUILD --pass-args +tests-all
-    BUILD --pass-args +tests-integration
+    BUILD +tests
+    BUILD +tests-integration
 
 helm-publish:
     LOCALLY
-    BUILD --pass-args ./helm/+publish
-    BUILD --pass-args ./components/operator+helm-publish
+    BUILD ./helm/+publish
+    BUILD ./components/operator+helm-publish
 
 HELM_PUBLISH:
     FUNCTION

diff --git a/components/Earthfile b/components/Earthfile
@@ -1,8 +1,6 @@
 VERSION 0.8
 
-ARG core=github.com/formancehq/earthly
-
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 IMPORT .. AS stack
 
 deploy:
@@ -13,4 +11,11 @@ deploy:
 deploy-staging:
     FROM core+base-image
     ARG --required components
-    BUILD --pass-args ./$components+deploy-staging
+    BUILD --pass-args ./$components+deploy-staging
+
+run:
+    LOCALLY
+    ARG --required TARGET
+    BUILD ./ledger+$TARGET
+    BUILD ./operator+$TARGET
+    BUILD ./payments+$TARGET
diff --git a/components/fctl/.goreleaser.yml b/components/fctl/.goreleaser.yml
@@ -13,7 +13,7 @@ builds:
     id: fctl
     ldflags:
       - -X github.com/formancehq/fctl/cmd/version.BuildDate={{ .Date }}
-      - -X github.com/formancehq/fctl/cmd/version.Version={{ .Version }}
+      - -X github.com/formancehq/fctl/cmd/version.Version=v{{ .Version }}
       - -X github.com/formancehq/fctl/cmd/version.Commit={{ .ShortCommit }}
       - -extldflags "-static"
     env:

diff --git a/components/fctl/Earthfile b/components/fctl/Earthfile
@@ -1,8 +1,6 @@
 VERSION 0.8
 
-ARG core=github.com/formancehq/earthly
-
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 IMPORT ../.. AS stack
 IMPORT ../../releases AS releases
 IMPORT .. AS components

diff --git a/components/ledger/.goreleaser.ledger.yml b/components/ledger/.goreleaser.ledger.yml
@@ -4,7 +4,7 @@ builds:
     id: ledger
     ldflags:
       - -X github.com/formancehq/ledger/cmd.BuildDate={{ .Date }}
-      - -X github.com/formancehq/ledger/cmd.Version={{ .Version }}
+      - -X github.com/formancehq/ledger/cmd.Version=v{{ .Version }}
       - -X github.com/formancehq/ledger/cmd.Commit={{ .ShortCommit }}
       - -extldflags "-static"
     env:

diff --git a/components/ledger/.goreleaser.yml b/components/ledger/.goreleaser.yml
@@ -12,7 +12,7 @@ builds:
     id: ledger
     ldflags:
       - -X github.com/formancehq/ledger/cmd.BuildDate={{ .Date }}
-      - -X github.com/formancehq/ledger/cmd.Version={{ .Version }}
+      - -X github.com/formancehq/ledger/cmd.Version=v{{ .Version }}
       - -X github.com/formancehq/ledger/cmd.Commit={{ .ShortCommit }}
       - -extldflags "-static"
     env:

diff --git a/components/ledger/Earthfile b/components/ledger/Earthfile
@@ -1,8 +1,6 @@
 VERSION 0.8
 
-ARG core=github.com/formancehq/earthly
-
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 IMPORT ../.. AS stack
 IMPORT .. AS components
 

diff --git a/components/operator/.goreleaser.yml b/components/operator/.goreleaser.yml
@@ -13,7 +13,7 @@ builds:
     main: ./cmd
     ldflags:
       - -X github.com/formancehq/operator/cmd.BuildDate={{ .Date }}
-      - -X github.com/formancehq/operator/cmd.Version={{ .Version }}
+      - -X github.com/formancehq/operator/cmd.Version=v{{ .Version }}
       - -X github.com/formancehq/operator/cmd.Commit={{ .ShortCommit }}
       - -extldflags "-static"
     env:

diff --git a/components/operator/Earthfile b/components/operator/Earthfile
@@ -1,7 +1,6 @@
 VERSION 0.8
 
-ARG core=github.com/formancehq/earthly
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 IMPORT ../.. AS stack
 IMPORT .. AS components
 

diff --git a/components/operator/tools/utils/.goreleaser.yml b/components/operator/tools/utils/.goreleaser.yml
@@ -12,7 +12,7 @@ builds:
     id: operator-utils
     ldflags:
       - -X github.com/formancehq/operator-utils/cmd.BuildDate={{ .Date }}
-      - -X github.com/formancehq/operator-utils/cmd.Version={{ .Version }}
+      - -X github.com/formancehq/operator-utils/cmd.Version=v{{ .Version }}
       - -X github.com/formancehq/operator-utils/cmd.Commit={{ .ShortCommit }}
       - -extldflags "-static"
     env:

diff --git a/components/operator/tools/utils/Earthfile b/components/operator/tools/utils/Earthfile
@@ -1,7 +1,6 @@
 VERSION 0.8
 
-ARG core=github.com/formancehq/earthly
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 IMPORT ../../../.. AS stack
 IMPORT ../../.. AS components
 

diff --git a/components/payments/.goreleaser.yml b/components/payments/.goreleaser.yml
@@ -11,7 +11,7 @@ builds:
     id: payments
     ldflags:
       - -X github.com/formancehq/payments/cmd.BuildDate={{ .Date }}
-      - -X github.com/formancehq/payments/cmd.Version={{ .Version }}
+      - -X github.com/formancehq/payments/cmd.Version=v{{ .Version }}
       - -X github.com/formancehq/payments/cmd.Commit={{ .ShortCommit }}
       - -extldflags "-static"
     env:

diff --git a/components/payments/Earthfile b/components/payments/Earthfile
@@ -1,8 +1,6 @@
 VERSION 0.8
 
-ARG core=github.com/formancehq/earthly
-
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 IMPORT ../.. AS stack
 IMPORT ../../releases AS releases
 IMPORT .. AS components

diff --git a/ee/Earthfile b/ee/Earthfile
@@ -1,8 +1,6 @@
 VERSION 0.8
 
-ARG core=github.com/formancehq/earthly
-
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 IMPORT .. AS stack
 
 deploy:
@@ -13,4 +11,17 @@ deploy:
 deploy-staging:
     FROM core+base-image
     ARG --required components
-    BUILD --pass-args ./$components+deploy-staging
+    BUILD --pass-args ./$components+deploy-staging
+
+run:
+    LOCALLY
+    ARG --required TARGET
+    BUILD ./agent+$TARGET
+    BUILD ./auth+$TARGET
+    BUILD ./gateway+$TARGET
+    BUILD ./orchestration+$TARGET
+    BUILD ./reconciliation+$TARGET
+    BUILD ./search+$TARGET
+    BUILD ./stargate+$TARGET
+    BUILD ./wallets+$TARGET
+    BUILD ./webhooks+$TARGET
diff --git a/ee/agent/.goreleaser.yml b/ee/agent/.goreleaser.yml
@@ -11,7 +11,7 @@ builds:
     id: agent
     ldflags:
       - -X github.com/formancehq/stack/components/agent/cmd.BuildDate={{ .Date }}
-      - -X github.com/formancehq/stack/components/agent/cmd.Version={{ .Version }}
+      - -X github.com/formancehq/stack/components/agent/cmd.Version=v{{ .Version }}
       - -X github.com/formancehq/stack/components/agent/cmd.Commit={{ .ShortCommit }}
       - -extldflags "-static"
     env:

diff --git a/ee/agent/Earthfile b/ee/agent/Earthfile
@@ -1,7 +1,6 @@
 VERSION 0.8
 
-ARG core=github.com/formancehq/earthly
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 
 IMPORT ../.. AS stack
 IMPORT .. AS ee

diff --git a/ee/auth/.goreleaser.yml b/ee/auth/.goreleaser.yml
@@ -11,7 +11,7 @@ builds:
     id: auth
     ldflags:
       - -X github.com/formancehq/auth/cmd.BuildDate={{ .Date }}
-      - -X github.com/formancehq/auth/cmd.Version={{ .Version }}
+      - -X github.com/formancehq/auth/cmd.Version=v{{ .Version }}
       - -X github.com/formancehq/auth/cmd.Commit={{ .ShortCommit }}
       - -extldflags "-static"
     env:

diff --git a/ee/auth/Earthfile b/ee/auth/Earthfile
@@ -1,8 +1,6 @@
 VERSION 0.8
 
-ARG core=github.com/formancehq/earthly
-
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 IMPORT ../.. AS stack
 IMPORT .. AS ee
 

diff --git a/ee/gateway/.goreleaser.yml b/ee/gateway/.goreleaser.yml
@@ -11,7 +11,7 @@ builds:
     id: gateway
     ldflags:
       - -X github.com/formancehq/stack/components/gateway/cmd.BuildDate={{ .Date }}
-      - -X github.com/formancehq/stack/components/gateway/cmd.Version={{ .Version }}
+      - -X github.com/formancehq/stack/components/gateway/cmd.Version=v{{ .Version }}
       - -X github.com/formancehq/stack/components/gateway/cmd.Commit={{ .ShortCommit }}
       - -extldflags "-static"
     env:

diff --git a/ee/gateway/Earthfile b/ee/gateway/Earthfile
@@ -1,8 +1,6 @@
 VERSION 0.8
 
-ARG core=github.com/formancehq/earthly
-
-IMPORT $core AS core
+IMPORT github.com/formancehq/earthly:tags/v0.12.0 AS core
 IMPORT ../.. AS stack
 IMPORT .. AS ee