Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/bash/app/lib_app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ base_app_config_load() {
fi
for key in "${__base_bash_libs_app_keys[@]+${__base_bash_libs_app_keys[@]}}"; do
env_name="${__base_bash_libs_app_config["$model|$key|env"]-}"
if [[ -n "$env_name" && -n "${!env_name+x}" ]]; then
if [[ -n "$env_name" && -n "${!env_name-}" ]]; then
__base_bash_libs_app_set_value__ "$model" "$key" "${!env_name}" environment || {
status=$?
__base_bash_libs_app_clear_staged_config__
Expand Down
17 changes: 16 additions & 1 deletion lib/bash/app/tests/lib_app.bats
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ setup() {
source "$BASE_BASH_DIR/std/lib_std.sh"
source "$BASE_BASH_DIR/cli/lib_cli.sh"
source "$BASE_BASH_DIR/app/lib_app.sh"
unset APP_TEST_MODE APP_TEST_SECRET
unset APP_TEST_MODE APP_TEST_SECRET APP_TEST_TIMEOUT
}

validate_test_label() {
Expand Down Expand Up @@ -65,6 +65,21 @@ assert_demo_snapshot() {
[ "$value" = cli-secret ]
}

@test "empty environment bindings do not override file configuration" {
local project_file="$TEST_TMPDIR/project.conf" value source

base_app_init empty_env name=empty-env
base_app_config_define empty_env timeout integer default=10 env=APP_TEST_TIMEOUT
printf 'timeout=30\n' > "$project_file"
export APP_TEST_TIMEOUT=

base_app_config_load empty_env --project "$project_file"
base_app_config_get empty_env timeout value
base_app_config_provenance empty_env timeout source
[ "$value" -eq 30 ]
[ "$source" = project ]
}

@test "enum validation preserves a caller variable with the internal scratch name" {
local -a __base_bash_libs_app_enum_values=(caller-owned)

Expand Down
Loading