github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: split openresty report keys into global and computed pairs

Browse Source 
The `openresty:report --format json` payload emitted bare property names for the four global-only properties (`image`, `letsencrypt-email`, `letsencrypt-server`, `allowed-letsencrypt-domains-func-base64`), while `hsts` already used the `global-`/`computed-` convention adopted by the other proxy plugins. External tooling consuming the report had to maintain a per-property naming map within a single plugin. The global flag map now emits `--openresty-global-<X>` (raw stored value, empty when unset) and `--openresty-computed-<X>` (effective value with the built-in default applied) for those four properties plus `hsts`, and the per-app map gains the same pair for the global-only properties. The compose template and the two non-report callers consume the `computed-` accessors so the runtime behavior is unchanged.
This commit is contained in:
Jose Diaz-Gonzalez
2026-05-25 12:45:53 -04:00
parent 961bbca6d8
commit f9de91fc4b
7 changed files with 206 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
tests/unit/openresty.bats
View File

@@ -18,12 +18,137 @@ teardown() {
dokku nginx:start
}
@test "(openresty:report) --global --openresty-letsencrypt-server" {
run /bin/bash -c "dokku openresty:report --global --openresty-letsencrypt-server"
@test "(openresty:report) --global --openresty-computed-letsencrypt-server" {
run /bin/bash -c "dokku openresty:report --global --openresty-computed-letsencrypt-server"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "https://acme-staging-v02.api.letsencrypt.org/directory"
run /bin/bash -c "dokku openresty:report --global --openresty-global-letsencrypt-server"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "https://acme-staging-v02.api.letsencrypt.org/directory"
}
@test "(openresty:report) --global raw and computed keys in --format json" {
run /bin/bash -c "dokku openresty:report --global --format json | jq -r '.\"global-letsencrypt-server\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "https://acme-staging-v02.api.letsencrypt.org/directory"
run /bin/bash -c "dokku openresty:report --global --format json | jq -r '.\"computed-letsencrypt-server\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "https://acme-staging-v02.api.letsencrypt.org/directory"
run /bin/bash -c "dokku openresty:report --global --format json | jq -r '.\"global-letsencrypt-email\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output ""
run /bin/bash -c "dokku openresty:report --global --format json | jq -r '.\"computed-letsencrypt-email\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output ""
run /bin/bash -c "dokku openresty:report --global --format json | jq -r '.\"global-image\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output ""
run /bin/bash -c "dokku openresty:report --global --format json | jq -r '.\"computed-image\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_exists
run /bin/bash -c "dokku openresty:report --global --format json | jq -r '.\"global-allowed-letsencrypt-domains-func-base64\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output ""
run /bin/bash -c "dokku openresty:report --global --format json | jq -r '.\"computed-allowed-letsencrypt-domains-func-base64\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_exists
run /bin/bash -c "dokku openresty:report --global --format json | jq -r '.\"global-hsts\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output ""
run /bin/bash -c "dokku openresty:report --global --format json | jq -r '.\"computed-hsts\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "true"
for key in image letsencrypt-email letsencrypt-server allowed-letsencrypt-domains-func-base64; do
run /bin/bash -c "dokku openresty:report --global --format json | jq -e \"has(\\\"$key\\\")\""
echo "key: $key"
echo "output: $output"
echo "status: $status"
assert_failure
assert_output "false"
done
}
@test "(openresty:report) --global global vs computed image" {
run /bin/bash -c "dokku openresty:report --global --openresty-global-image"
echo "output: $output"
echo "status: $status"
assert_success
assert_output ""
run /bin/bash -c "dokku openresty:report --global --openresty-computed-image"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_exists
run /bin/bash -c "dokku openresty:set --global image dokku/openresty-docker-proxy:0.5.6"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku openresty:report --global --openresty-global-image"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "dokku/openresty-docker-proxy:0.5.6"
run /bin/bash -c "dokku openresty:report --global --openresty-computed-image"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "dokku/openresty-docker-proxy:0.5.6"
run /bin/bash -c "dokku openresty:set --global image"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku openresty:report --global --openresty-global-image"
echo "output: $output"
echo "status: $status"
assert_success
assert_output ""
run /bin/bash -c "dokku openresty:report --global --openresty-computed-image"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_exists
}
@test "(openresty) global-only keys" {