+notification from site +version bump fix

ci/prod/.env.runtime

@@ -15,9 +15,9 @@ PERMISSION_IS_FILTERED=false
 AMPLI_ENVIRONMENT=production
 API_PROTOCOL=https
 SERVICE_HOST=app.sendico.io
-API_ENDPOINT=https://app.sendico.io/api
+API_ENDPOINT=/api/v1
 WS_PROTOCOL=wss
-WS_ENDPOINT=wss://app.sendico.io/ws
+WS_ENDPOINT=/ws
 AMPLITUDE_SECRET=c3d75b3e2520d708440acbb16b923e79
 DEFAULT_LOCALE=en
 DEFAULT_CURRENCY=EUR

ci/prod/compose/notification.yml

@@ -31,6 +31,9 @@ services:
       NATS_URL: ${NATS_URL}
       MAIL_USER: ${MAIL_USER}
       MAIL_SECRET: ${MAIL_SECRET}
+      TELEGRAM_BOT_TOKEN: ${TELEGRAM_BOT_TOKEN}
+      TELEGRAM_CHAT_ID: ${TELEGRAM_CHAT_ID}
+      TELEGRAM_THREAD_ID: ${TELEGRAM_THREAD_ID}
       MONGO_HOST: ${MONGO_HOST}
       MONGO_PORT: ${MONGO_PORT}
       MONGO_DATABASE: ${MONGO_DATABASE}

ci/prod/scripts/deploy/notification.sh

@@ -24,6 +24,8 @@ REQUIRED_SECRETS=(
   NATS_USER
   NATS_PASSWORD
   NATS_URL
+  TELEGRAM_BOT_TOKEN
+  TELEGRAM_CHAT_ID
 )
 
 for var in "${REQUIRED_SECRETS[@]}"; do
@@ -50,6 +52,9 @@ API_ENDPOINT_SECRET_B64="$(b64enc "${API_ENDPOINT_SECRET}")"
 NATS_USER_B64="$(b64enc "${NATS_USER}")"
 NATS_PASSWORD_B64="$(b64enc "${NATS_PASSWORD}")"
 NATS_URL_B64="$(b64enc "${NATS_URL}")"
+TELEGRAM_BOT_TOKEN_B64="$(b64enc "${TELEGRAM_BOT_TOKEN}")"
+TELEGRAM_CHAT_ID_B64="$(b64enc "${TELEGRAM_CHAT_ID}")"
+TELEGRAM_THREAD_ID_B64="$(b64enc "${TELEGRAM_THREAD_ID:-}")"
 
 SSH_OPTS=(
   -i /root/.ssh/id_rsa
@@ -86,6 +91,9 @@ ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" \
   NATS_USER_B64="$NATS_USER_B64" \
   NATS_PASSWORD_B64="$NATS_PASSWORD_B64" \
   NATS_URL_B64="$NATS_URL_B64" \
+  TELEGRAM_BOT_TOKEN_B64="$TELEGRAM_BOT_TOKEN_B64" \
+  TELEGRAM_CHAT_ID_B64="$TELEGRAM_CHAT_ID_B64" \
+  TELEGRAM_THREAD_ID_B64="$TELEGRAM_THREAD_ID_B64" \
   bash -s <<'EOSSH'
 set -euo pipefail
 cd "${REMOTE_DIR}/compose"
@@ -135,10 +143,14 @@ API_ENDPOINT_SECRET="$(decode_b64 "$API_ENDPOINT_SECRET_B64")"
 NATS_USER="$(decode_b64 "$NATS_USER_B64")"
 NATS_PASSWORD="$(decode_b64 "$NATS_PASSWORD_B64")"
 NATS_URL="$(decode_b64 "$NATS_URL_B64")"
+TELEGRAM_BOT_TOKEN="$(decode_b64 "$TELEGRAM_BOT_TOKEN_B64")"
+TELEGRAM_CHAT_ID="$(decode_b64 "$TELEGRAM_CHAT_ID_B64")"
+TELEGRAM_THREAD_ID="$(decode_b64 "$TELEGRAM_THREAD_ID_B64")"
 
 export MONGO_USER MONGO_PASSWORD
 export MAIL_USER MAIL_SECRET API_ENDPOINT_SECRET
 export NATS_USER NATS_PASSWORD NATS_URL
+export TELEGRAM_BOT_TOKEN TELEGRAM_CHAT_ID TELEGRAM_THREAD_ID
 COMPOSE_PROJECT_NAME="$COMPOSE_PROJECT"
 export COMPOSE_PROJECT_NAME
 read -r -a SERVICES <<<"${SERVICES_LINE}"

ci/scripts/common/bump_version.sh

@@ -4,7 +4,14 @@ set -eu
 START_DIR="$(pwd)"
 echo "[bump-version] invoked from ${START_DIR}"
 
-REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+REPO_ROOT=""
+if command -v git >/dev/null 2>&1; then
+  REPO_ROOT="$(git rev-parse --show-toplevel 2>/dev/null || true)"
+fi
+if [ -z "${REPO_ROOT}" ]; then
+  REPO_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)"
+fi
 echo "[bump-version] repo root resolved to ${REPO_ROOT}"
 cd "${REPO_ROOT}"
 
@@ -60,4 +67,20 @@ if [ -z "${BRANCH}" ] || [ "${BRANCH}" = "HEAD" ]; then
   BRANCH="$(git rev-parse --abbrev-ref HEAD)"
 fi
 
+NETRC_MACHINE="${CI_NETRC_MACHINE:-${WOODPECKER_NETRC_MACHINE:-}}"
+NETRC_USERNAME="${CI_NETRC_USERNAME:-${WOODPECKER_NETRC_USERNAME:-${CI_NETRC_LOGIN:-${WOODPECKER_NETRC_LOGIN:-}}}}"
+NETRC_PASSWORD="${CI_NETRC_PASSWORD:-${WOODPECKER_NETRC_PASSWORD:-}}"
+if [ -n "${NETRC_MACHINE}" ] && [ -n "${NETRC_USERNAME}" ] && [ -n "${NETRC_PASSWORD}" ]; then
+  NETRC_FILE="${HOME:-/root}/.netrc"
+  if [ ! -f "${NETRC_FILE}" ]; then
+    {
+      printf 'machine %s\n' "${NETRC_MACHINE}"
+      printf 'login %s\n' "${NETRC_USERNAME}"
+      printf 'password %s\n' "${NETRC_PASSWORD}"
+    } > "${NETRC_FILE}"
+    chmod 600 "${NETRC_FILE}"
+    echo "[bump-version] wrote credentials for ${NETRC_MACHINE}"
+  fi
+fi
+
 git push origin "HEAD:${BRANCH}"

ci/scripts/notification/deploy.sh

@@ -49,6 +49,7 @@ load_env_file ./.env.version
 NOTIFICATION_MONGO_SECRET_PATH="${NOTIFICATION_MONGO_SECRET_PATH:?missing NOTIFICATION_MONGO_SECRET_PATH}"
 NOTIFICATION_MAIL_SECRET_PATH="${NOTIFICATION_MAIL_SECRET_PATH:?missing NOTIFICATION_MAIL_SECRET_PATH}"
 NOTIFICATION_API_SECRET_PATH="${NOTIFICATION_API_SECRET_PATH:?missing NOTIFICATION_API_SECRET_PATH}"
+NOTIFICATION_TELEGRAM_SECRET_PATH="${NOTIFICATION_TELEGRAM_SECRET_PATH:?missing NOTIFICATION_TELEGRAM_SECRET_PATH}"
 : "${NATS_HOST:?missing NATS_HOST}"
 : "${NATS_PORT:?missing NATS_PORT}"
 
@@ -60,6 +61,14 @@ export MAIL_SECRET="$(./ci/vlt kv_get kv "${NOTIFICATION_MAIL_SECRET_PATH}" pass
 
 export API_ENDPOINT_SECRET="$(./ci/vlt kv_get kv "${NOTIFICATION_API_SECRET_PATH}" secret)"
 
+export TELEGRAM_BOT_TOKEN="$(./ci/vlt kv_get kv "${NOTIFICATION_TELEGRAM_SECRET_PATH}" bot_token)"
+export TELEGRAM_CHAT_ID="$(./ci/vlt kv_get kv "${NOTIFICATION_TELEGRAM_SECRET_PATH}" chat_id)"
+TELEGRAM_THREAD_ID=""
+if TELEGRAM_THREAD_ID_VALUE="$(./ci/vlt kv_get kv "${NOTIFICATION_TELEGRAM_SECRET_PATH}" thread_id 2>/dev/null)"; then
+  TELEGRAM_THREAD_ID="$TELEGRAM_THREAD_ID_VALUE"
+fi
+export TELEGRAM_THREAD_ID
+
 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}"