diff --git a/.github/labeler.yml b/.github/labeler.yml index 1e8d7d63fc..65ae1c6579 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -35,9 +35,6 @@ github: 'ee/orchestration': - changed-files: - any-glob-to-any-file: "ee/orchestration/*" -'ee/search': - - changed-files: - - any-glob-to-any-file: "ee/search/*" 'ee/stargate': - changed-files: - any-glob-to-any-file: "ee/stargate/*" diff --git a/.github/scripts/generate-changelog.sh b/.github/scripts/generate-changelog.sh index 13ce105531..15e837e125 100755 --- a/.github/scripts/generate-changelog.sh +++ b/.github/scripts/generate-changelog.sh @@ -13,10 +13,17 @@ PAYMENTS_VERSION=$(extract_version "PAYMENTS_VERSION") WALLETS_VERSION=$(extract_version "WALLETS_VERSION") WEBHOOKS_VERSION=$(extract_version "WEBHOOKS_VERSION") AUTH_VERSION=$(extract_version "AUTH_VERSION") -SEARCH_VERSION=$(extract_version "SEARCH_VERSION") ORCHESTRATION_VERSION=$(extract_version "ORCHESTRATION_VERSION") RECONCILIATION_VERSION=$(extract_version "RECONCILIATION_VERSION") GATEWAY_VERSION=$(extract_version "GATEWAY_VERSION") +CONNECTIVITY_VERSION=$(extract_version "CONNECTIVITY_VERSION") + +# Connectivity can be pinned to a branch until its releases publish an OpenAPI asset. +if [[ "$CONNECTIVITY_VERSION" == v* ]]; then + CONNECTIVITY_LINK="[Release notes](https://github.com/formancehq/connectivity/releases/tag/${CONNECTIVITY_VERSION})" +else + CONNECTIVITY_LINK="[Source](https://github.com/formancehq/connectivity/tree/${CONNECTIVITY_VERSION})" +fi { echo "## Component Versions" @@ -28,10 +35,10 @@ GATEWAY_VERSION=$(extract_version "GATEWAY_VERSION") echo "| Wallets | \`${WALLETS_VERSION}\` | [Release notes](https://github.com/formancehq/wallets/releases/tag/${WALLETS_VERSION}) |" echo "| Webhooks | \`${WEBHOOKS_VERSION}\` | [Release notes](https://github.com/formancehq/webhooks/releases/tag/${WEBHOOKS_VERSION}) |" echo "| Auth | \`${AUTH_VERSION}\` | [Release notes](https://github.com/formancehq/auth/releases/tag/${AUTH_VERSION}) |" - echo "| Search | \`${SEARCH_VERSION}\` | [Release notes](https://github.com/formancehq/search/releases/tag/${SEARCH_VERSION}) |" echo "| Orchestration | \`${ORCHESTRATION_VERSION}\` | [Release notes](https://github.com/formancehq/flows/releases/tag/${ORCHESTRATION_VERSION}) |" echo "| Reconciliation | \`${RECONCILIATION_VERSION}\` | [Release notes](https://github.com/formancehq/reconciliation/releases/tag/${RECONCILIATION_VERSION}) |" echo "| Gateway | \`${GATEWAY_VERSION}\` | [Release notes](https://github.com/formancehq/gateway/releases/tag/${GATEWAY_VERSION}) |" + echo "| Connectivity | \`${CONNECTIVITY_VERSION}\` | ${CONNECTIVITY_LINK} |" } > "$OUTPUT" echo "Changelog written to $OUTPUT" diff --git a/.speakeasy/workflow.lock b/.speakeasy/workflow.lock index ed08ee4b6f..c16179c706 100644 --- a/.speakeasy/workflow.lock +++ b/.speakeasy/workflow.lock @@ -1,9 +1,9 @@ -speakeasyVersion: 1.804.0 +speakeasyVersion: 1.805.0 sources: stacks-source: sourceNamespace: stacks-source - sourceRevisionDigest: sha256:9df14dce9ad22e9a6989dda36e511ab3ce3973fcad5f1bbfce8118cc49f2e3e6 - sourceBlobDigest: sha256:da34e684e433e7d236caa00e25f3a97d66ad660153d0201f78ffaecfde5b2b00 + sourceRevisionDigest: sha256:fba801496873ebea55167ee39b289c4b9a84de63e907ee88c660e2353d065860 + sourceBlobDigest: sha256:161ec02ee4dc73636b93aa44f4226b397c1ca2dd784b9574213f4259626a90eb tags: - latest - SDK_VERSION @@ -24,8 +24,6 @@ workflow: modelNamespace: ledger - location: ./components/payments.openapi.yaml modelNamespace: payments - - location: ./components/search.openapi.yaml - modelNamespace: search - location: ./components/webhooks.openapi.yaml modelNamespace: webhooks - location: ./components/wallets.openapi.yaml diff --git a/.speakeasy/workflow.yaml b/.speakeasy/workflow.yaml index 63ff5df2d3..80ad42d12b 100644 --- a/.speakeasy/workflow.yaml +++ b/.speakeasy/workflow.yaml @@ -13,8 +13,6 @@ sources: modelNamespace: ledger - location: ./components/payments.openapi.yaml modelNamespace: payments - - location: ./components/search.openapi.yaml - modelNamespace: search - location: ./components/webhooks.openapi.yaml modelNamespace: webhooks - location: ./components/wallets.openapi.yaml diff --git a/Justfile b/Justfile index 4641997e9c..e08a98abcb 100644 --- a/Justfile +++ b/Justfile @@ -1,27 +1,26 @@ # Component versions -LEDGER_VERSION := "v3.0.0-beta.3" -LEDGER_V2_VERSION := "v2.4.12" -PAYMENTS_VERSION := "v3.4.4" -WALLETS_VERSION := "v2.2.1" -WEBHOOKS_VERSION := "v2.5.4" -AUTH_VERSION := "v2.5.1" -SEARCH_VERSION := "v2.1.0" -ORCHESTRATION_VERSION := "v2.6.4" -RECONCILIATION_VERSION := "v2.5.0" -GATEWAY_VERSION := "v2.3.2" +LEDGER_VERSION := "v3.0.0-rc.2" +LEDGER_V2_VERSION := "v2.4.17" +PAYMENTS_VERSION := "v3.4.9" +WALLETS_VERSION := "v2.2.2" +WEBHOOKS_VERSION := "v2.5.5" +AUTH_VERSION := "v2.6.3" +ORCHESTRATION_VERSION := "v2.7.1" +RECONCILIATION_VERSION := "v2.5.1" +GATEWAY_VERSION := "v2.3.3" # Connectivity API releases do not yet publish an OpenAPI asset. CONNECTIVITY_VERSION := "main" -# Download component OpenAPI specs from GitHub releases or source +# Download component OpenAPI specs from GitHub releases or source. +# Private repositories (gateway, auth) go through gh, which needs GH_TOKEN or gh auth. download-specs: mkdir -p components gh api -H "Accept: application/vnd.github.raw+json" "repos/formancehq/connectivity/contents/misc/connectivity-api/openapi.yaml?ref={{ CONNECTIVITY_VERSION }}" > components/connectivity.openapi.yaml wget -q https://github.com/formancehq/ledger/releases/download/{{ LEDGER_VERSION }}/openapi.yml -O components/ledger.openapi.yaml wget -q https://github.com/formancehq/ledger/releases/download/{{ LEDGER_V2_VERSION }}/openapi.yaml -O components/ledger-v2.openapi.yaml wget -q https://github.com/formancehq/payments/releases/download/{{ PAYMENTS_VERSION }}/openapi.yaml -O components/payments.openapi.yaml - wget -q https://raw.githubusercontent.com/formancehq/gateway/{{ GATEWAY_VERSION }}/openapi.yaml -O components/gateway.openapi.yaml - wget -q https://github.com/formancehq/auth/releases/download/{{ AUTH_VERSION }}/openapi.yaml -O components/auth.openapi.yaml - wget -q https://github.com/formancehq/search/releases/download/{{ SEARCH_VERSION }}/openapi.yaml -O components/search.openapi.yaml + gh api -H "Accept: application/vnd.github.raw+json" "repos/formancehq/gateway/contents/openapi.yaml?ref={{ GATEWAY_VERSION }}" > components/gateway.openapi.yaml + gh release download {{ AUTH_VERSION }} -R formancehq/auth -p openapi.yaml -O components/auth.openapi.yaml --clobber wget -q https://github.com/formancehq/webhooks/releases/download/{{ WEBHOOKS_VERSION }}/openapi.yaml -O components/webhooks.openapi.yaml wget -q https://github.com/formancehq/wallets/releases/download/{{ WALLETS_VERSION }}/openapi.yaml -O components/wallets.openapi.yaml wget -q https://github.com/formancehq/reconciliation/releases/download/{{ RECONCILIATION_VERSION }}/openapi.yaml -O components/reconciliation.openapi.yaml @@ -34,7 +33,6 @@ prepend-paths: download-specs yq -i '.paths |= (to_entries | map(select(.key == "/*").key = "/api/ledger" + .key) | from_entries) | (.paths[] | .. | select(has("tags")).tags) = ["ledger.v3"]' components/ledger.openapi.yaml yq -i '.paths |= (to_entries | map(select(.key == "/*").key = "/api/ledger" + .key) | from_entries) | del(.paths."/api/ledger/_info")' components/ledger-v2.openapi.yaml yq -i '.paths |= (to_entries | map(select(.key == "/*").key = "/api/payments" + .key) | from_entries)' components/payments.openapi.yaml - yq -i '.paths |= (to_entries | map(select(.key == "/*").key = "/api/search" + .key) | from_entries)' components/search.openapi.yaml yq -i '.paths |= (to_entries | map(select(.key == "/*").key = "/api/webhooks" + .key) | from_entries)' components/webhooks.openapi.yaml yq -i '.paths |= (to_entries | map(select(.key == "/*").key = "/api/wallets" + .key) | from_entries)' components/wallets.openapi.yaml yq -i '.paths |= (to_entries | map(select(.key == "/*").key = "/api/orchestration" + .key) | from_entries)' components/orchestration.openapi.yaml diff --git a/releases/base.yaml b/releases/base.yaml index 044cdc858b..3886da0aef 100644 --- a/releases/base.yaml +++ b/releases/base.yaml @@ -50,7 +50,6 @@ tags: - name: orchestration.v1 - name: orchestration.v2 - name: reconciliation.v1 - - name: search.v1 - name: webhooks.v1 - name: wallets.v1 @@ -80,9 +79,6 @@ x-tagGroups: tags: - payments.v1 - payments.v3 - - name: Search - tags: - - search.v1 - name: Wallets tags: - wallets.v1