Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2026-05-18 05:05:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8601 from dokku/8598-app-json-set-appjson-path-succeeds-but-app-json-appjson-path-is-not-a-valid-report-flag

Browse Source 
Rename app-json:report flags to match property
This commit is contained in:
Jose Diaz-Gonzalez
2026-05-10 23:58:05 -04:00
committed by GitHub
parent 74dc94bad2 4eee229bbc
commit cdce68f8a2
2 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/app-json/report.go
View File

@@ -15,13 +15,13 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
var flags map[string]common.ReportFunc
if appName == "--global" {
flags = map[string]common.ReportFunc{
"--app-json-global-selected": reportGlobalAppjsonpath,
"--app-json-global-appjson-path": reportGlobalAppjsonpath,
}
} else {
flags = map[string]common.ReportFunc{
"--app-json-computed-selected": reportComputedAppjsonpath,
"--app-json-global-selected": reportGlobalAppjsonpath,
"--app-json-selected": reportAppjsonpath,
"--app-json-computed-appjson-path": reportComputedAppjsonpath,
"--app-json-global-appjson-path": reportGlobalAppjsonpath,
"--app-json-appjson-path": reportAppjsonpath,
}
}

57
tests/unit/app-json.bats
View File

@@ -256,6 +256,63 @@ teardown() {
assert_output_contains "touch /app/predeploy3.test"
}
@test "(app-json:report) appjson-path round-trip" {
run /bin/bash -c "dokku app-json:set $TEST_APP appjson-path app2.json"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku app-json:report $TEST_APP --app-json-appjson-path"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "app2.json"
run /bin/bash -c "dokku app-json:report $TEST_APP --app-json-computed-appjson-path"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "app2.json"
run /bin/bash -c "dokku app-json:report $TEST_APP --app-json-global-appjson-path"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "app.json"
run /bin/bash -c "dokku app-json:report $TEST_APP --format json"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains '"app-json-appjson-path":"app2.json"'
assert_output_contains '"app-json-computed-appjson-path":"app2.json"'
assert_output_contains '"app-json-global-appjson-path":"app.json"'
assert_output_contains "app-json-selected" 0
run /bin/bash -c "dokku app-json:report $TEST_APP --app-json-selected"
echo "output: $output"
echo "status: $status"
assert_failure
assert_output_contains "Invalid flag passed"
run /bin/bash -c "dokku app-json:set $TEST_APP appjson-path"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku app-json:report $TEST_APP --app-json-appjson-path"
echo "output: $output"
echo "status: $status"
assert_success
assert_output ""
run /bin/bash -c "dokku app-json:report $TEST_APP --app-json-computed-appjson-path"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "app.json"
}
copy_app_json_to_sub_app() {
local APP="$1"
local APP_REPO_DIR="$2"