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

fix: align Go-plugin :report JSON keys with bash-strip convention

Browse Source 
Every Go-implemented plugin's `:report --format json` now emits keys without the redundant `<plugin>-` head segment, matching the shape bash plugins have always emitted. The CLI flag names and `:set` semantics are unchanged. For backwards compatibility during the 0.38.x patch series, the legacy `<plugin>-<property>` keys are emitted side-by-side with the new keys, and a future major release will drop the legacy keys. `common.ReportSingleApp` is refactored to accept a `ReportSingleAppInput` struct with a `Validate()` method so the input is checked before any work runs, which also catches the latent `"docker options"` reportType bug at the API boundary.
This commit is contained in:
Jose Diaz-Gonzalez
2026-05-27 07:17:00 -04:00
parent 5925efedc7
commit 3bf6c72451
48 changed files with 928 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/unit/network.bats
View File

@@ -48,12 +48,24 @@ teardown() {
assert_success
assert_output "dokku.test"
run /bin/bash -c "dokku network:report --global --format json | jq -r '.\"global-tld\"'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "dokku.test"
run /bin/bash -c "dokku network:report --global --format json | jq -r 'has(\"network-tld\")'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "false"
run /bin/bash -c "dokku network:report --global --format json | jq -r 'has(\"tld\")'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "false"
run /bin/bash -c "dokku network:report --global"
echo "output: $output"
echo "status: $status"
@@ -66,6 +78,24 @@ teardown() {
assert_success
}
@test "(network:report) emits new stripped JSON keys alongside legacy" {
run /bin/bash -c "dokku network:report --global --format json | jq -r 'has(\"global-tld\") and has(\"network-global-tld\")'"
assert_success
assert_output "true"
run /bin/bash -c "dokku network:report --global --format json | jq -r 'has(\"computed-tld\") and has(\"network-computed-tld\")'"
assert_success
assert_output "true"
run /bin/bash -c "dokku network:report $TEST_APP --format json | jq -r 'has(\"tld\") and has(\"network-tld\")'"
assert_success
assert_output "true"
run /bin/bash -c "dokku network:report $TEST_APP --format json | jq -r 'has(\"web-listeners\") and has(\"network-web-listeners\")'"
assert_success
assert_output "true"
}
@test "(network:report) tld raw vs computed" {
run /bin/bash -c "dokku network:set --global tld"
echo "output: $output"