mirror of
https://github.com/dokku/dokku.git
synced 2026-05-18 13:15:19 +02:00
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.
70 lines
1.7 KiB
Go
70 lines
1.7 KiB
Go
package apps
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/dokku/dokku/plugins/common"
|
|
)
|
|
|
|
// ReportSingleApp is an internal function that displays the app 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{}
|
|
} else {
|
|
flags = map[string]common.ReportFunc{
|
|
"--app-created-at": reportCreatedAt,
|
|
"--app-deploy-source": reportDeploySource,
|
|
"--app-deploy-source-metadata": reportDeploySourceMetadata,
|
|
"--app-dir": reportDir,
|
|
"--app-locked": reportLocked,
|
|
}
|
|
}
|
|
|
|
flagKeys := []string{}
|
|
for flagKey := range flags {
|
|
flagKeys = append(flagKeys, flagKey)
|
|
}
|
|
|
|
trimPrefix := false
|
|
uppercaseFirstCharacter := true
|
|
infoFlags := common.CollectReport(appName, infoFlag, flags)
|
|
return common.ReportSingleApp("app", appName, infoFlag, infoFlags, flagKeys, format, trimPrefix, uppercaseFirstCharacter)
|
|
}
|
|
|
|
func reportCreatedAt(appName string) string {
|
|
createdAt, err := common.PropertyListGet("apps", appName, "created-at")
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
return fmt.Sprint(strings.Join(createdAt, ","))
|
|
}
|
|
|
|
func reportDeploySource(appName string) string {
|
|
return common.PropertyGet("apps", appName, "deploy-source")
|
|
}
|
|
|
|
func reportDeploySourceMetadata(appName string) string {
|
|
return common.PropertyGet("apps", appName, "deploy-source-metadata")
|
|
}
|
|
|
|
func reportDir(appName string) string {
|
|
return common.AppRoot(appName)
|
|
}
|
|
|
|
func reportLocked(appName string) string {
|
|
locked := "false"
|
|
if appIsLocked(appName) {
|
|
locked = "true"
|
|
}
|
|
|
|
return locked
|
|
}
|