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

fix: expose remaining settable properties via :report

Browse Source 
Adds the missing raw/global/computed report keys for ten settable properties across the ps, builder, scheduler, proxy, openresty, nginx, and scheduler-k3s plugins so external tooling can verify drift through `:report --format json`. The scheduler-k3s `token` is masked as `*******` in default stdout output and only unmasked when the report is requested via `--format json` or when the flag is queried explicitly by name; the same explicit-query unmasking rule is extended to the existing traefik `dns-provider-<env_var>` keys.
This commit is contained in:
Jose Diaz-Gonzalez
2026-05-27 04:26:12 -04:00
parent fd9e06d56b
commit 2b5d2e10ea
28 changed files with 734 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/builder/report.go
View File

@@ -15,18 +15,23 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
var flags map[string]common.ReportFunc
if appName == "--global" {
flags = map[string]common.ReportFunc{
"--builder-global-selected": reportGlobalSelected,
"--builder-global-build-dir": reportGlobalBuildDir,
"--builder-global-selected": reportGlobalSelected,
"--builder-global-build-dir": reportGlobalBuildDir,
"--builder-global-skip-cleanup": reportGlobalSkipCleanup,
"--builder-computed-skip-cleanup": reportComputedSkipCleanup,
}
} else {
flags = map[string]common.ReportFunc{
"--builder-computed-selected": reportComputedSelected,
"--builder-global-selected": reportGlobalSelected,
"--builder-selected": reportSelected,
"--builder-detected": reportDetected,
"--builder-computed-build-dir": reportComputedBuildDir,
"--builder-global-build-dir": reportGlobalBuildDir,
"--builder-build-dir": reportBuildDir,
"--builder-computed-selected": reportComputedSelected,
"--builder-global-selected": reportGlobalSelected,
"--builder-selected": reportSelected,
"--builder-detected": reportDetected,
"--builder-computed-build-dir": reportComputedBuildDir,
"--builder-global-build-dir": reportGlobalBuildDir,
"--builder-build-dir": reportBuildDir,
"--builder-computed-skip-cleanup": reportComputedSkipCleanup,
"--builder-global-skip-cleanup": reportGlobalSkipCleanup,
"--builder-skip-cleanup": reportSkipCleanup,
}
}
@@ -77,3 +82,23 @@ func reportGlobalBuildDir(appName string) string {
func reportBuildDir(appName string) string {
return common.PropertyGet("builder", appName, "build-dir")
}
func reportComputedSkipCleanup(appName string) string {
value := reportSkipCleanup(appName)
if value == "" {
value = reportGlobalSkipCleanup(appName)
}
if value == "" {
value = "false"
}
return value
}
func reportGlobalSkipCleanup(appName string) string {
return common.PropertyGet("builder", "--global", "skip-cleanup")
}
func reportSkipCleanup(appName string) string {
return common.PropertyGet("builder", appName, "skip-cleanup")
}