mirror of
https://github.com/dokku/dokku.git
synced 2026-07-10 20:40:43 +02:00
fix: split report global keys into raw and computed across plugins
The `<plugin>-global-<property>` keys in `:report` output returned the resolved value with the built-in default substituted in, so external tooling could not distinguish a property that had been set globally to the default from one that had never been set. The bare keys for caddy, haproxy, and traefik global-only properties had the same shape. The `global-<property>` keys now hold the raw stored value and are empty when nothing has been set, and a new `computed-<property>` key holds the effective value used at runtime, falling back through the per-app value (where one exists), the global value, and the built-in default. The bare global-only keys for the three proxy plugins are removed in favor of the raw/computed pair. Closes #8631.
This commit is contained in:
@@ -44,6 +44,7 @@ cmd-builder-lambda-report-single() {
|
||||
local flag_map=()
|
||||
if [[ "$APP" == "--global" ]]; then
|
||||
flag_map=(
|
||||
"--builder-lambda-computed-lambdayml-path: $(fn-builder-lambda-computed-lambdayml-path "$APP")"
|
||||
"--builder-lambda-global-lambdayml-path: $(fn-builder-lambda-global-lambdayml-path "$APP")"
|
||||
)
|
||||
else
|
||||
@@ -97,6 +98,9 @@ fn-builder-lambda-computed-lambdayml-path() {
|
||||
if [[ "$file" == "" ]]; then
|
||||
file="$(fn-builder-lambda-global-lambdayml-path "$APP")"
|
||||
fi
|
||||
if [[ "$file" == "" ]]; then
|
||||
file="lambda.yml"
|
||||
fi
|
||||
|
||||
echo "$file"
|
||||
}
|
||||
@@ -104,7 +108,7 @@ fn-builder-lambda-computed-lambdayml-path() {
|
||||
fn-builder-lambda-global-lambdayml-path() {
|
||||
declare APP="$1"
|
||||
|
||||
fn-plugin-property-get-default "builder-lambda" "--global" "lambdayml-path" "lambda.yml"
|
||||
fn-plugin-property-get-default "builder-lambda" "--global" "lambdayml-path" ""
|
||||
}
|
||||
|
||||
fn-builder-lambda-lambdayml-path() {
|
||||
|
||||
Reference in New Issue
Block a user