chain gateway build fix

ci/scripts/billing_fees/build-image.sh

@@ -36,7 +36,7 @@ FEES_ENV_NAME="${FEES_ENV:-prod}"
 RUNTIME_ENV_FILE="./ci/${FEES_ENV_NAME}/.env.runtime"
 
 if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[fees-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
+  echo "[billing-fees-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
   exit 1
 fi
 

ci/scripts/billing_fees/deploy.sh

@@ -36,7 +36,7 @@ FEES_ENV_NAME="${FEES_ENV:-prod}"
 RUNTIME_ENV_FILE="./ci/${FEES_ENV_NAME}/.env.runtime"
 
 if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[fees-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
+  echo "[billing-fees-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
   exit 1
 fi
 
@@ -58,4 +58,4 @@ export NATS_PASSWORD="$(./ci/vlt kv_get kv sendico/nats password)"
 export NATS_URL="nats://${NATS_USER}:${NATS_PASSWORD}@${NATS_HOST}:${NATS_PORT}"
 
 bash ci/prod/scripts/bootstrap/network.sh
-bash ci/prod/scripts/deploy/fees.sh
+bash ci/prod/scripts/deploy/billing_fees.sh

ci/scripts/chain_gateway/build-image.sh

@@ -1,85 +0,0 @@
-#!/bin/sh
-set -eu
-
-if ! set -o pipefail 2>/dev/null; then
-  :
-fi
-
-REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
-cd "${REPO_ROOT}"
-
-sh ci/scripts/common/ensure_env_version.sh
-
-normalize_env_file() {
-  file="$1"
-  tmp="${file}.tmp.$$"
-  tr -d '\r' <"$file" >"$tmp"
-  mv "$tmp" "$file"
-}
-
-load_env_file() {
-  file="$1"
-  while IFS= read -r line || [ -n "$line" ]; do
-    case "$line" in
-      ''|\#*) continue ;;
-    esac
-    key="${line%%=*}"
-    value="${line#*=}"
-    key="$(printf '%s' "$key" | tr -d '[:space:]')"
-    value="${value#"${value%%[![:space:]]*}"}"
-    value="${value%"${value##*[![:space:]]}"}"
-    export "$key=$value"
-  done <"$file"
-}
-
-CHAIN_GATEWAY_ENV_NAME="${CHAIN_GATEWAY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${CHAIN_GATEWAY_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[chain-gateway-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
-
-REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
-APP_V="${APP_V:?missing APP_V}"
-CHAIN_GATEWAY_DOCKERFILE="${CHAIN_GATEWAY_DOCKERFILE:?missing CHAIN_GATEWAY_DOCKERFILE}"
-CHAIN_GATEWAY_IMAGE_PATH="${CHAIN_GATEWAY_IMAGE_PATH:?missing CHAIN_GATEWAY_IMAGE_PATH}"
-
-REGISTRY_HOST="${REGISTRY_URL#http://}"
-REGISTRY_HOST="${REGISTRY_HOST#https://}"
-REGISTRY_USER="$(cat secrets/REGISTRY_USER)"
-REGISTRY_PASSWORD="$(cat secrets/REGISTRY_PASSWORD)"
-: "${REGISTRY_USER:?missing registry user}"
-: "${REGISTRY_PASSWORD:?missing registry password}"
-
-mkdir -p /kaniko/.docker
-AUTH_B64="$(printf '%s:%s' "$REGISTRY_USER" "$REGISTRY_PASSWORD" | base64 | tr -d '\n')"
-cat <<EOF >/kaniko/.docker/config.json
-{
-  "auths": {
-    "https://${REGISTRY_HOST}": { "auth": "${AUTH_B64}" }
-  }
-}
-EOF
-
-BUILD_CONTEXT="${CHAIN_GATEWAY_BUILD_CONTEXT:-${WOODPECKER_WORKSPACE:-${CI_WORKSPACE:-${PWD:-/workspace}}}}"
-if [ ! -d "${BUILD_CONTEXT}" ]; then
-  BUILD_CONTEXT="/workspace"
-fi
-
-/kaniko/executor \
-  --context "${BUILD_CONTEXT}" \
-  --dockerfile "${CHAIN_GATEWAY_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${CHAIN_GATEWAY_IMAGE_PATH}:${APP_V}" \
-  --build-arg APP_VERSION="${APP_V}" \
-  --build-arg GIT_REV="${GIT_REV}" \
-  --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \
-  --build-arg BUILD_DATE="${BUILD_DATE}" \
-  --build-arg BUILD_USER="${BUILD_USER}" \
-  --single-snapshot

ci/scripts/chain_gateway/deploy.sh

@@ -1,66 +0,0 @@
-#!/bin/sh
-set -eu
-
-if ! set -o pipefail 2>/dev/null; then
-  :
-fi
-
-REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
-cd "${REPO_ROOT}"
-
-sh ci/scripts/common/ensure_env_version.sh
-
-normalize_env_file() {
-  file="$1"
-  tmp="${file}.tmp.$$"
-  tr -d '\r' <"$file" >"$tmp"
-  mv "$tmp" "$file"
-}
-
-load_env_file() {
-  file="$1"
-  while IFS= read -r line || [ -n "$line" ]; do
-    case "$line" in
-      ''|\#*) continue ;;
-    esac
-    key="${line%%=*}"
-    value="${line#*=}"
-    key="$(printf '%s' "$key" | tr -d '[:space:]')"
-    value="${value#"${value%%[![:space:]]*}"}"
-    value="${value%"${value##*[![:space:]]}"}"
-    export "$key=$value"
-  done <"$file"
-}
-
-CHAIN_GATEWAY_ENV_NAME="${CHAIN_GATEWAY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${CHAIN_GATEWAY_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[chain-gateway-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-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 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}"
-
-export CHAIN_GATEWAY_MONGO_USER="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_MONGO_SECRET_PATH}" user)"
-export CHAIN_GATEWAY_MONGO_PASSWORD="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_MONGO_SECRET_PATH}" password)"
-
-export NATS_USER="$(./ci/vlt kv_get kv sendico/nats user)"
-export NATS_PASSWORD="$(./ci/vlt kv_get kv sendico/nats password)"
-export NATS_URL="nats://${NATS_USER}:${NATS_PASSWORD}@${NATS_HOST}:${NATS_PORT}"
-
-export CHAIN_GATEWAY_ARBITRUM_RPC_URL="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_RUNTIME_SECRET_PATH}" arbitrum_rpc_url)"
-export CHAIN_GATEWAY_SERVICE_WALLET_KEY="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_RUNTIME_SECRET_PATH}" service_wallet_key)"
-export CHAIN_GATEWAY_VAULT_TOKEN="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_RUNTIME_SECRET_PATH}" vault_token)"
-
-bash ci/prod/scripts/bootstrap/network.sh
-bash ci/prod/scripts/deploy/chain_gateway.sh