chore: Improvement for SDK generation (#984)

Earthfile

@@ -22,10 +22,10 @@ speakeasy:
 build-final-spec:
     FROM core+base-image
     RUN apk update && apk add yarn nodejs npm jq
-    WORKDIR /src/openapi
+    WORKDIR /src/libs/clients
     RUN mkdir build
-    COPY openapi/base.yaml .
-    COPY openapi/package.* .
+    COPY libs/clients/base.yaml .
+    COPY libs/clients/package.* .
     RUN npm install
     WORKDIR /src/components
     FOR c IN ledger payments
@@ -35,13 +35,13 @@ build-final-spec:
     FOR c IN auth webhooks search wallets orchestration reconciliation
         COPY ee/$c/openapi.yaml $c/openapi.yaml
     END
-    WORKDIR /src/openapi
-    COPY openapi/openapi-merge.json .
+    WORKDIR /src/libs/clients
+    COPY libs/clients/openapi-merge.json .
     RUN npm run build
     LET VERSION=$(date +%Y%m%d)
     RUN jq '.info.version = "v1.0.${VERSION}"' build/generate.json > build/generate-with-version.json
     SAVE ARTIFACT build/generate-with-version.json
-    SAVE ARTIFACT build/generate-with-version.json AS LOCAL openapi/build/generate.json
+    SAVE ARTIFACT build/generate-with-version.json AS LOCAL libs/clients/build/generate.json
 
 build-sdk:
     BUILD --pass-args +build-final-spec # Force output of the final spec
@@ -50,18 +50,18 @@ build-sdk:
     RUN apk update && apk add yq
     COPY (+speakeasy/speakeasy) /bin/speakeasy
     COPY (+build-final-spec/generate-with-version.json) final-spec.json
-    ARG LANG=go
-    COPY --dir openapi/templates/${LANG} sdks/${LANG}
-    RUN --secret SPEAKEASY_API_KEY speakeasy generate sdk -s ./final-spec.json -o ./sdks/${LANG} -l ${LANG}
-    SAVE ARTIFACT sdks/${LANG} AS LOCAL ./sdks/${LANG}
-    SAVE ARTIFACT sdks/${LANG}
+    COPY --dir libs/clients/go ./sdks/go
+    RUN --secret SPEAKEASY_API_KEY speakeasy generate sdk -s ./final-spec.json -o ./sdks/go -l go
+    RUN rm -rf ./libs/clients/go
+    SAVE ARTIFACT sdks/go AS LOCAL ./libs/clients/go
+    SAVE ARTIFACT sdks/go
 
 goreleaser:
     FROM core+builder-image
     ARG --required components
     ARG --required type
     COPY . /src
-    COPY (+build-sdk/go --LANG=go) /src/sdks/go
+    COPY (+build-sdk/go --LANG=go) /src/libs/clients/go
     WORKDIR /src/$type/$components
     ARG mode=local
     LET buildArgs = --clean

components/fctl/Earthfile

@@ -18,7 +18,7 @@ tests:
 
 sources:
     WORKDIR src
-    COPY --pass-args (stack+build-sdk/go --LANG=go) sdks/go
+    COPY --pass-args (stack+build-sdk/go) libs/clients/go
     DO stack+INCLUDE_GO_LIBS --LOCATION libs/go-libs
     WORKDIR /src/components/fctl
     COPY go.* .

components/fctl/go.mod

@@ -82,4 +82,4 @@ replace github.com/formancehq/fctl/membershipclient => ./membershipclient
 
 replace github.com/spf13/cobra v1.6.1 => github.com/formancehq/cobra v0.0.0-20221112160629-60a6d6d55ef9
 
-replace github.com/formancehq/formance-sdk-go => ../../sdks/go
+replace github.com/formancehq/formance-sdk-go => ../../libs/clients/go

components/fctl/go.sum

@@ -104,7 +104,6 @@ github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lL
 github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0=
 github.com/mattn/go-tty v0.0.4 h1:NVikla9X8MN0SQAqCYzpGyXv0jY7MNl3HOWD2dkle7E=
 github.com/mattn/go-tty v0.0.4/go.mod h1:u5GGXBtZU6RQoKV8gY5W6UhMudbR5vXnUe7j3pxse28=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/muhlemmer/gu v0.3.1 h1:7EAqmFrW7n3hETvuAdmFmn4hS8W+z3LgKtrnow+YzNM=
 github.com/muhlemmer/gu v0.3.1/go.mod h1:YHtHR+gxM+bKEIIs7Hmi9sPT3ZDUvTN/i88wQpZkrdM=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
@@ -144,7 +143,6 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spyzhov/ajson v0.8.0/go.mod h1:63V+CGM6f1Bu/p4nLIN8885ojBdt88TbLoSFzyqMuVA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=

components/payments/Earthfile

@@ -10,7 +10,7 @@ FROM core+base-image
 sources:
     WORKDIR src
     DO stack+INCLUDE_GO_LIBS --LOCATION libs/go-libs
-    COPY --pass-args (stack+build-sdk/go --LANG=go) sdks/go
+    COPY --pass-args (stack+build-sdk/go) libs/clients/go
     WORKDIR /src/components/payments
     COPY go.* .
     COPY --dir pkg cmd internal .

ee/orchestration/Earthfile

@@ -10,7 +10,7 @@ FROM core+base-image
 sources:
     WORKDIR src
     DO stack+INCLUDE_GO_LIBS --LOCATION libs/go-libs
-    COPY --pass-args (stack+build-sdk/go --LANG=go) sdks/go
+    COPY --pass-args (stack+build-sdk/go) libs/clients/go
     WORKDIR /src/ee/orchestration
     COPY go.* .
     COPY --dir pkg cmd internal .

ee/orchestration/go.mod

@@ -157,4 +157,4 @@ require (
 
 replace github.com/formancehq/stack/libs/go-libs => ../../libs/go-libs
 
-replace github.com/formancehq/formance-sdk-go => ../../sdks/go
+replace github.com/formancehq/formance-sdk-go => ../../libs/clients/go

ee/reconciliation/Earthfile

@@ -10,7 +10,7 @@ FROM core+base-image
 sources:
     WORKDIR src
     DO stack+INCLUDE_GO_LIBS --LOCATION libs/go-libs
-    COPY --pass-args (stack+build-sdk/go --LANG=go) sdks/go
+    COPY --pass-args (stack+build-sdk/go) libs/clients/go
     WORKDIR /src/ee/reconciliation
     COPY go.* .
     COPY --dir cmd internal .

ee/reconciliation/go.mod

@@ -117,4 +117,4 @@ require (
 
 replace github.com/formancehq/stack/libs/go-libs => ../../libs/go-libs
 
-replace github.com/formancehq/formance-sdk-go => ../../sdks/go
+replace github.com/formancehq/formance-sdk-go => ../../libs/clients/go

ee/wallets/Dockerfile

@@ -2,7 +2,7 @@ FROM golang:1.20 AS builder
 ARG APP_SHA
 ARG VERSION
 WORKDIR /src
-COPY sdks/go /src/sdks/go
+COPY libs/clients/go /src/libs/clients/go
 COPY libs /src/libs
 COPY components/wallets /src/ee/wallets
 WORKDIR /src/ee/wallets

ee/wallets/Earthfile

@@ -10,7 +10,7 @@ FROM core+base-image
 sources:
     WORKDIR src
     DO stack+INCLUDE_GO_LIBS --LOCATION libs/go-libs
-    COPY --pass-args (stack+build-sdk/go --LANG=go) sdks/go
+    COPY --pass-args (stack+build-sdk/go) libs/clients/go
     WORKDIR /src/ee/wallets
     COPY go.* .
     COPY --dir pkg cmd .

ee/wallets/go.mod

@@ -77,4 +77,4 @@ require (
 
 replace github.com/formancehq/stack/libs/go-libs => ../../libs/go-libs
 
-replace github.com/formancehq/formance-sdk-go => ../../sdks/go
+replace github.com/formancehq/formance-sdk-go => ../../libs/clients/go

libs/clients/.gitignore

@@ -0,0 +1 @@
+build

openapi/base.yaml → libs/clients/base.yaml

@@ -105,6 +105,9 @@ x-tagGroups:
   - name: Flows
     tags:
       - Orchestration
+  - name: Reconciliation
+    tags:
+      - Reconciliation
 
 paths:
   /versions:

libs/clients/go/.gitattributes

@@ -0,0 +1,2 @@
+# This allows generated code to be indexed correctly
+*.go linguist-generated=false

libs/clients/go/.gitignore

@@ -0,0 +1 @@
+# .gitignore