From a4f3a8d3abd1aa5b30c480f1a25ac28c8ae19b03 Mon Sep 17 00:00:00 2001 From: hailin Date: Sun, 1 Feb 2026 06:03:38 -0800 Subject: [PATCH] =?UTF-8?q?fix(deploy):=20=E4=BF=AE=E5=A4=8Denvsubst?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=A7=A3=E6=9E=90${VAR:-default}=E8=AF=AD?= =?UTF-8?q?=E6=B3=95=E5=AF=BC=E8=87=B4CDC=20connector=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题: commit 5b1f4c82 在 full-reset Step 9 中用 envsubst 替换 connector JSON 中的 数据库凭据,但 envsubst(GNU gettext)不支持 bash 的 ${VAR:-default} 语法, 导致 "${POSTGRES_USER:-rwa_user}" 被原样发送给 Debezium,认证失败。 修复: 1. deploy-mining.sh load_env(): 默认值赋值改为 export,确保 envsubst 能访问 2. connector JSON 文件: ${VAR:-default} 改为 ${VAR},默认值由脚本 export 提供 Co-Authored-By: Claude Opus 4.5 --- backend/services/deploy-mining.sh | 15 ++++++++------- .../scripts/debezium/identity-connector.json | 4 ++-- .../scripts/debezium/planting-connector.json | 4 ++-- .../scripts/debezium/referral-connector.json | 4 ++-- .../scripts/debezium/wallet-connector.json | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/backend/services/deploy-mining.sh b/backend/services/deploy-mining.sh index f91964e4..33a42bd3 100755 --- a/backend/services/deploy-mining.sh +++ b/backend/services/deploy-mining.sh @@ -254,13 +254,14 @@ load_env() { fi # Set defaults (match docker-compose.yml settings) - POSTGRES_HOST="${POSTGRES_HOST:-localhost}" - POSTGRES_PORT="${POSTGRES_PORT:-5432}" - POSTGRES_USER="${POSTGRES_USER:-rwa_user}" - POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-rwa_secure_password}" - KAFKA_BROKERS="${KAFKA_BROKERS:-localhost:9092}" - REDIS_HOST="${REDIS_HOST:-localhost}" - REDIS_PORT="${REDIS_PORT:-6379}" + # Must use export so envsubst can access these variables + export POSTGRES_HOST="${POSTGRES_HOST:-localhost}" + export POSTGRES_PORT="${POSTGRES_PORT:-5432}" + export POSTGRES_USER="${POSTGRES_USER:-rwa_user}" + export POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-rwa_secure_password}" + export KAFKA_BROKERS="${KAFKA_BROKERS:-localhost:9092}" + export REDIS_HOST="${REDIS_HOST:-localhost}" + export REDIS_PORT="${REDIS_PORT:-6379}" # Docker container names (match docker-compose.yml container_name) POSTGRES_CONTAINER="${POSTGRES_CONTAINER:-rwa-postgres}" diff --git a/backend/services/scripts/debezium/identity-connector.json b/backend/services/scripts/debezium/identity-connector.json index 792b6455..4823bd60 100644 --- a/backend/services/scripts/debezium/identity-connector.json +++ b/backend/services/scripts/debezium/identity-connector.json @@ -6,8 +6,8 @@ "database.hostname": "rwa-postgres", "database.port": "5432", - "database.user": "${POSTGRES_USER:-rwa_user}", - "database.password": "${POSTGRES_PASSWORD:-rwa_secure_password}", + "database.user": "${POSTGRES_USER}", + "database.password": "${POSTGRES_PASSWORD}", "database.dbname": "rwa_identity", "topic.prefix": "cdc.identity", diff --git a/backend/services/scripts/debezium/planting-connector.json b/backend/services/scripts/debezium/planting-connector.json index e2b92827..abd27cc8 100644 --- a/backend/services/scripts/debezium/planting-connector.json +++ b/backend/services/scripts/debezium/planting-connector.json @@ -6,8 +6,8 @@ "database.hostname": "rwa-postgres", "database.port": "5432", - "database.user": "${POSTGRES_USER:-rwa_user}", - "database.password": "${POSTGRES_PASSWORD:-rwa_secure_password}", + "database.user": "${POSTGRES_USER}", + "database.password": "${POSTGRES_PASSWORD}", "database.dbname": "rwa_planting", "topic.prefix": "cdc.planting", diff --git a/backend/services/scripts/debezium/referral-connector.json b/backend/services/scripts/debezium/referral-connector.json index c3b08270..48300952 100644 --- a/backend/services/scripts/debezium/referral-connector.json +++ b/backend/services/scripts/debezium/referral-connector.json @@ -6,8 +6,8 @@ "database.hostname": "rwa-postgres", "database.port": "5432", - "database.user": "${POSTGRES_USER:-rwa_user}", - "database.password": "${POSTGRES_PASSWORD:-rwa_secure_password}", + "database.user": "${POSTGRES_USER}", + "database.password": "${POSTGRES_PASSWORD}", "database.dbname": "rwa_referral", "topic.prefix": "cdc.referral", diff --git a/backend/services/scripts/debezium/wallet-connector.json b/backend/services/scripts/debezium/wallet-connector.json index 785074dc..5abcc714 100644 --- a/backend/services/scripts/debezium/wallet-connector.json +++ b/backend/services/scripts/debezium/wallet-connector.json @@ -6,8 +6,8 @@ "database.hostname": "postgres", "database.port": "5432", - "database.user": "${POSTGRES_USER:-rwa_user}", - "database.password": "${POSTGRES_PASSWORD:-rwa_secure_password}", + "database.user": "${POSTGRES_USER}", + "database.password": "${POSTGRES_PASSWORD}", "database.dbname": "rwa_wallet", "topic.prefix": "cdc.wallet",