mirror of
https://github.com/dokku/dokku.git
synced 2026-08-29 10:08:53 +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-herokuish-report-single() {
|
||||
local flag_map=()
|
||||
if [[ "$APP" == "--global" ]]; then
|
||||
flag_map=(
|
||||
"--builder-herokuish-computed-allowed: $(fn-builder-herokuish-computed-allowed "$APP")"
|
||||
"--builder-herokuish-global-allowed: $(fn-builder-herokuish-global-allowed)"
|
||||
)
|
||||
else
|
||||
@@ -97,16 +98,16 @@ fn-builder-herokuish-computed-allowed() {
|
||||
if [[ -z "$allowed" ]]; then
|
||||
allowed="$(fn-builder-herokuish-global-allowed)"
|
||||
fi
|
||||
if [[ -z "$allowed" ]]; then
|
||||
allowed="true"
|
||||
[[ "$(dpkg --print-architecture 2>/dev/null || true)" != "amd64" ]] && allowed="false"
|
||||
fi
|
||||
|
||||
echo "$allowed"
|
||||
}
|
||||
|
||||
fn-builder-herokuish-global-allowed() {
|
||||
local default_value="true"
|
||||
|
||||
[[ "$(dpkg --print-architecture 2>/dev/null || true)" != "amd64" ]] && default_value="false"
|
||||
|
||||
fn-plugin-property-get-default "builder-herokuish" "--global" "allowed" "$default_value"
|
||||
fn-plugin-property-get-default "builder-herokuish" "--global" "allowed" ""
|
||||
}
|
||||
|
||||
fn-builder-herokuish-allowed() {
|
||||
|
||||
Reference in New Issue
Block a user