Skip to content

Commit 26f23dd

Browse files
ezoushenezoushen
committed
fix: expand environment variables in all subcommands (logs, status, restart, delete)
- Fixed logs.sh, status.sh, restart.sh to use expand_env_vars() for server config - Fixed delete.sh to wrap get_config_with_default() calls with expand_env_vars() - Fixed static site variants: logs-static.sh, status-static.sh, delete-static.sh - Ensures all commands properly expand ${APPLICATION_SERVER_HOST}, ${SYSTEM_SERVER_HOST}, etc. - Resolves "hostname contains invalid characters" errors in subcommands
1 parent 12e6fc9 commit 26f23dd

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

‎cmd/delete-static.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ echo ""
191191
# Load configuration
192192
PRODUCT_NAME=$(get_config_with_default ".product.name" "" "$CONFIG_FILE")
193193
DEPLOY_PATH=$(get_deploy_path "$ENVIRONMENT" "$CONFIG_FILE")
194-
SYSTEM_SERVER_HOST=$(get_config_with_default ".servers.system.host" "" "$CONFIG_FILE")
195-
SYSTEM_SERVER_USER=$(get_config_with_default ".servers.system.user" "" "$CONFIG_FILE")
194+
SYSTEM_SERVER_HOST=$(expand_env_vars "$(get_config_with_default ".servers.system.host" "" "$CONFIG_FILE")")
195+
SYSTEM_SERVER_USER=$(expand_env_vars "$(get_config_with_default ".servers.system.user" "" "$CONFIG_FILE")")
196196
SYSTEM_SERVER_SSH_KEY=$(get_config_with_default ".servers.system.ssh_key" "" "$CONFIG_FILE")
197197
NGINX_AXON_DIR=$(get_nginx_axon_dir "$CONFIG_FILE")
198198

‎cmd/delete.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,11 @@ echo ""
221221

222222
# Load configuration
223223
PRODUCT_NAME=$(get_config_with_default ".product.name" "" "$CONFIG_FILE")
224-
APP_SERVER=$(get_config_with_default ".servers.application.host" "" "$CONFIG_FILE")
225-
APP_USER=$(get_config_with_default ".servers.application.user" "" "$CONFIG_FILE")
224+
APP_SERVER=$(expand_env_vars "$(get_config_with_default ".servers.application.host" "" "$CONFIG_FILE")")
225+
APP_USER=$(expand_env_vars "$(get_config_with_default ".servers.application.user" "" "$CONFIG_FILE")")
226226
APP_SSH_KEY=$(get_config_with_default ".servers.application.ssh_key" "" "$CONFIG_FILE")
227-
SYSTEM_SERVER=$(get_config_with_default ".servers.system.host" "" "$CONFIG_FILE")
228-
SYSTEM_USER=$(get_config_with_default ".servers.system.user" "" "$CONFIG_FILE")
227+
SYSTEM_SERVER=$(expand_env_vars "$(get_config_with_default ".servers.system.host" "" "$CONFIG_FILE")")
228+
SYSTEM_USER=$(expand_env_vars "$(get_config_with_default ".servers.system.user" "" "$CONFIG_FILE")")
229229
SYSTEM_SSH_KEY=$(get_config_with_default ".servers.system.ssh_key" "" "$CONFIG_FILE")
230230
NGINX_AXON_DIR=$(get_nginx_axon_dir "$CONFIG_FILE")
231231
SHUTDOWN_TIMEOUT=$(get_config_with_default ".docker.shutdown_timeout" "30" "$CONFIG_FILE")

‎cmd/logs-static.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ if [ -z "$PRODUCT_NAME" ]; then
156156
fi
157157

158158
# Get System Server SSH details
159-
SYSTEM_SERVER_HOST=$(parse_yaml_key ".servers.system.host" "")
160-
SYSTEM_SERVER_USER=$(parse_yaml_key ".servers.system.user" "")
159+
SYSTEM_SERVER_HOST=$(expand_env_vars "$(parse_yaml_key ".servers.system.host" "")")
160+
SYSTEM_SERVER_USER=$(expand_env_vars "$(parse_yaml_key ".servers.system.user" "")")
161161
SYSTEM_SERVER_SSH_KEY=$(parse_yaml_key ".servers.system.ssh_key" "")
162162
SYSTEM_SERVER_SSH_KEY="${SYSTEM_SERVER_SSH_KEY/#\~/$HOME}"
163163

‎cmd/logs.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ if [ -z "$PRODUCT_NAME" ]; then
172172
fi
173173

174174
# Get Application Server SSH details
175-
APPLICATION_SERVER_HOST=$(parse_yaml_key ".servers.application.host" "")
176-
APPLICATION_SERVER_USER=$(parse_yaml_key ".servers.application.user" "")
175+
APPLICATION_SERVER_HOST=$(expand_env_vars "$(parse_yaml_key ".servers.application.host" "")")
176+
APPLICATION_SERVER_USER=$(expand_env_vars "$(parse_yaml_key ".servers.application.user" "")")
177177
APPLICATION_SERVER_SSH_KEY=$(parse_yaml_key ".servers.application.ssh_key" "")
178178
APPLICATION_SERVER_SSH_KEY="${APPLICATION_SERVER_SSH_KEY/#\~/$HOME}"
179179

‎cmd/restart.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ if [ -z "$PRODUCT_NAME" ]; then
206206
fi
207207

208208
# Get Application Server SSH details
209-
APPLICATION_SERVER_HOST=$(parse_yaml_key ".servers.application.host" "")
210-
APPLICATION_SERVER_USER=$(parse_yaml_key ".servers.application.user" "")
209+
APPLICATION_SERVER_HOST=$(expand_env_vars "$(parse_yaml_key ".servers.application.host" "")")
210+
APPLICATION_SERVER_USER=$(expand_env_vars "$(parse_yaml_key ".servers.application.user" "")")
211211
APPLICATION_SERVER_SSH_KEY=$(parse_yaml_key ".servers.application.ssh_key" "")
212212
APPLICATION_SERVER_SSH_KEY="${APPLICATION_SERVER_SSH_KEY/#\~/$HOME}"
213213

‎cmd/status-static.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ ssh_init_multiplexing
9191
PRODUCT_NAME=$(parse_yaml_key "product.name" "")
9292

9393
# Get System Server SSH details
94-
SYSTEM_SERVER_HOST=$(parse_yaml_key ".servers.system.host" "")
95-
SYSTEM_SERVER_USER=$(parse_yaml_key ".servers.system.user" "")
94+
SYSTEM_SERVER_HOST=$(expand_env_vars "$(parse_yaml_key ".servers.system.host" "")")
95+
SYSTEM_SERVER_USER=$(expand_env_vars "$(parse_yaml_key ".servers.system.user" "")")
9696
SYSTEM_SERVER_SSH_KEY=$(parse_yaml_key ".servers.system.ssh_key" "")
9797
SYSTEM_SERVER_SSH_KEY="${SYSTEM_SERVER_SSH_KEY/#\~/$HOME}"
9898

‎cmd/status.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ PRODUCT_NAME=$(parse_yaml_key "product.name" "")
172172

173173
# Get Application Server SSH details
174174
# We load these early since they're needed for all environments
175-
APPLICATION_SERVER_HOST=$(parse_yaml_key ".servers.application.host" "")
176-
APPLICATION_SERVER_USER=$(parse_yaml_key ".servers.application.user" "")
175+
APPLICATION_SERVER_HOST=$(expand_env_vars "$(parse_yaml_key ".servers.application.host" "")")
176+
APPLICATION_SERVER_USER=$(expand_env_vars "$(parse_yaml_key ".servers.application.user" "")")
177177
APPLICATION_SERVER_SSH_KEY=$(parse_yaml_key ".servers.application.ssh_key" "")
178178
APPLICATION_SERVER_SSH_KEY="${APPLICATION_SERVER_SSH_KEY/#\~/$HOME}"
179179

0 commit comments

Comments
 (0)