From a6da4d08bc1dcd9dc6eb40cd26d049e8e4de09a9 Mon Sep 17 00:00:00 2001 From: Stephan D Date: Tue, 11 Nov 2025 00:35:23 +0100 Subject: [PATCH] chain gateway build fix --- api/chain/gateway/config.yml | 2 +- .../gateway/internal/appversion/version.go | 2 +- .../ingestor/internal/appversion/version.go | 2 +- api/fx/oracle/internal/appversion/version.go | 2 +- api/ledger/internal/appversion/version.go | 2 +- api/notification/config.yml | 2 +- .../internal/appversion/version.go | 2 +- api/server/internal/appversion/version.go | 2 +- ci/scripts/chain_gateway/deploy.sh | 2 +- ci/scripts/common/ensure_env_version.sh | 30 ++++++++++++------- 10 files changed, 28 insertions(+), 20 deletions(-) diff --git a/api/chain/gateway/config.yml b/api/chain/gateway/config.yml index 33d08bf..4c7884c 100644 --- a/api/chain/gateway/config.yml +++ b/api/chain/gateway/config.yml @@ -50,7 +50,7 @@ service_wallet: key_management: driver: vault settings: - address: "http://vault:8200" + address: "https://vault.sendico.io:8200" token_env: CHAIN_GATEWAY_VAULT_TOKEN namespace: "" mount_path: secret diff --git a/api/chain/gateway/internal/appversion/version.go b/api/chain/gateway/internal/appversion/version.go index d159c12..ffa97bc 100644 --- a/api/chain/gateway/internal/appversion/version.go +++ b/api/chain/gateway/internal/appversion/version.go @@ -16,7 +16,7 @@ var ( func Create() version.Printer { info := version.Info{ - Program: "MeetX Connectica Chain Gateway Service", + Program: "Sendico Chain Gateway Service", Revision: Revision, Branch: Branch, BuildUser: BuildUser, diff --git a/api/fx/ingestor/internal/appversion/version.go b/api/fx/ingestor/internal/appversion/version.go index d947434..030c39f 100644 --- a/api/fx/ingestor/internal/appversion/version.go +++ b/api/fx/ingestor/internal/appversion/version.go @@ -16,7 +16,7 @@ var ( func Create() version.Printer { vi := version.Info{ - Program: "MeetX Connectica FX Ingestor Service", + Program: "Sendico FX Ingestor Service", Revision: Revision, Branch: Branch, BuildUser: BuildUser, diff --git a/api/fx/oracle/internal/appversion/version.go b/api/fx/oracle/internal/appversion/version.go index cbadc55..82d4d58 100644 --- a/api/fx/oracle/internal/appversion/version.go +++ b/api/fx/oracle/internal/appversion/version.go @@ -16,7 +16,7 @@ var ( func Create() version.Printer { vi := version.Info{ - Program: "MeetX Connectica FX Oracle Service", + Program: "Sendico FX Oracle Service", Revision: Revision, Branch: Branch, BuildUser: BuildUser, diff --git a/api/ledger/internal/appversion/version.go b/api/ledger/internal/appversion/version.go index fa7d39d..befe39b 100644 --- a/api/ledger/internal/appversion/version.go +++ b/api/ledger/internal/appversion/version.go @@ -16,7 +16,7 @@ var ( func Create() version.Printer { vi := version.Info{ - Program: "MeetX Connectica Ledger Service", + Program: "Sendico Ledger Service", Revision: Revision, Branch: Branch, BuildUser: BuildUser, diff --git a/api/notification/config.yml b/api/notification/config.yml index 884d5ec..bbbd57b 100755 --- a/api/notification/config.yml +++ b/api/notification/config.yml @@ -59,7 +59,7 @@ api: localizer: path: "./i18n" languages: ["en", "ru", "uk"] - service_name: "MeetX Connectica" + service_name: "Sendico" support: "support@meetx.space" app: diff --git a/api/notification/internal/appversion/version.go b/api/notification/internal/appversion/version.go index fcfe94a..9959458 100755 --- a/api/notification/internal/appversion/version.go +++ b/api/notification/internal/appversion/version.go @@ -16,7 +16,7 @@ var ( func Create() version.Printer { vi := version.Info{ - Program: "MeetX Connectica Notification Service", + Program: "Sendico Notification Service", Revision: Revision, Branch: Branch, BuildUser: BuildUser, diff --git a/api/server/internal/appversion/version.go b/api/server/internal/appversion/version.go index 688b0c4..85e2245 100755 --- a/api/server/internal/appversion/version.go +++ b/api/server/internal/appversion/version.go @@ -16,7 +16,7 @@ var ( func Create() version.Printer { vi := version.Info{ - Program: "MeetX Connectica Backend Service", + Program: "Sendico Backend Service", Revision: Revision, Branch: Branch, BuildUser: BuildUser, diff --git a/ci/scripts/chain_gateway/deploy.sh b/ci/scripts/chain_gateway/deploy.sh index 20b99be..fc9dcbe 100644 --- a/ci/scripts/chain_gateway/deploy.sh +++ b/ci/scripts/chain_gateway/deploy.sh @@ -46,7 +46,7 @@ normalize_env_file ./.env.version load_env_file "${RUNTIME_ENV_FILE}" load_env_file ./.env.version -CHAIN_GATEWAY_MONGO_SECRET_PATH="${CHAIN_GATEWAY_MONGO_SECRET_PATH:?missing CHAIN_GATEWAY_MONGO_SECRET_PATH}" +CHAIN_GATEWAY_MONGO_SECRET_PATH="${CHAIN_GATEWAY_MONGO_SECRET_PATH:?missing CHAIsN_GATEWAY_MONGO_SECRET_PATH}" CHAIN_GATEWAY_RUNTIME_SECRET_PATH="${CHAIN_GATEWAY_RUNTIME_SECRET_PATH:?missing CHAIN_GATEWAY_RUNTIME_SECRET_PATH}" : "${NATS_HOST:?missing NATS_HOST}" : "${NATS_PORT:?missing NATS_PORT}" diff --git a/ci/scripts/common/ensure_env_version.sh b/ci/scripts/common/ensure_env_version.sh index f07b5cd..0c25d1f 100755 --- a/ci/scripts/common/ensure_env_version.sh +++ b/ci/scripts/common/ensure_env_version.sh @@ -3,30 +3,38 @@ set -eu echo "[fx-pipeline] rewriting .env.version" >&2 +if [ -f ./.env.version ]; then + # shellcheck disable=SC1091 + . ./.env.version || true +fi + if [ -n "${WOODPECKER_COMMIT:-}" ]; then GIT_REV="$(printf '%s' "${WOODPECKER_COMMIT}" | cut -c1-7)" elif command -v git >/dev/null 2>&1; then - GIT_REV="$(git rev-parse --short HEAD 2>/dev/null || echo dev)" -else - GIT_REV="dev" + GIT_REV="$(git rev-parse --short HEAD 2>/dev/null || true)" fi +: "${GIT_REV:=dev}" if [ -n "${WOODPECKER_BRANCH:-}" ]; then BUILD_BRANCH="${WOODPECKER_BRANCH}" elif command -v git >/dev/null 2>&1; then - BUILD_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo local)" -else - BUILD_BRANCH="local" + BUILD_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)" fi +: "${BUILD_BRANCH:=local}" if [ -f version ]; then - APP_V="$(cat version 2>/dev/null || echo dev)" -else - APP_V="dev" + APP_V="$(cat version 2>/dev/null || true)" +fi +: "${APP_V:=dev}" + +if [ -z "${BUILD_DATE:-}" ]; then + BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || echo unknown)" fi -BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || echo unknown)" -BUILD_USER="${WOODPECKER_MACHINE:-woodpecker}" +: "${WOODPECKER_MACHINE:=woodpecker}" +if [ -z "${BUILD_USER:-}" ]; then + BUILD_USER="${WOODPECKER_MACHINE}" +fi cat > .env.version <