8282981361
Every `:report` subcommand now recognizes `--global` as a scope selector that limits the report to globally-configured properties, including in JSON form via `--global --format json`. Previously this combination was rejected because `--global` was treated as an info flag, conflicting with `--format`. The shared `common.ParseReportArgs` helper now returns a `ReportArgs` struct exposing the parsed scope; each Go and bash report selects a global-only flag map when scope is global, and skips per-app verification.
55 lines
1.5 KiB
Go
55 lines
1.5 KiB
Go
package appjson
|
|
|
|
import (
|
|
"github.com/dokku/dokku/plugins/common"
|
|
)
|
|
|
|
// ReportSingleApp is an internal function that displays the builder report for one or more apps
|
|
func ReportSingleApp(appName string, format string, infoFlag string) error {
|
|
if appName != "--global" {
|
|
if err := common.VerifyAppName(appName); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
var flags map[string]common.ReportFunc
|
|
if appName == "--global" {
|
|
flags = map[string]common.ReportFunc{
|
|
"--app-json-global-selected": reportGlobalAppjsonpath,
|
|
}
|
|
} else {
|
|
flags = map[string]common.ReportFunc{
|
|
"--app-json-computed-selected": reportComputedAppjsonpath,
|
|
"--app-json-global-selected": reportGlobalAppjsonpath,
|
|
"--app-json-selected": reportAppjsonpath,
|
|
}
|
|
}
|
|
|
|
flagKeys := []string{}
|
|
for flagKey := range flags {
|
|
flagKeys = append(flagKeys, flagKey)
|
|
}
|
|
|
|
trimPrefix := false
|
|
uppercaseFirstCharacter := true
|
|
infoFlags := common.CollectReport(appName, infoFlag, flags)
|
|
return common.ReportSingleApp("app-json", appName, infoFlag, infoFlags, flagKeys, format, trimPrefix, uppercaseFirstCharacter)
|
|
}
|
|
|
|
func reportComputedAppjsonpath(appName string) string {
|
|
value := reportAppjsonpath(appName)
|
|
if value == "" {
|
|
value = reportGlobalAppjsonpath(appName)
|
|
}
|
|
|
|
return value
|
|
}
|
|
|
|
func reportGlobalAppjsonpath(appName string) string {
|
|
return common.PropertyGetDefault("app-json", "--global", "appjson-path", "app.json")
|
|
}
|
|
|
|
func reportAppjsonpath(appName string) string {
|
|
return common.PropertyGet("app-json", appName, "appjson-path")
|
|
}
|