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

feat: allow formatting :report command output as json

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2021-02-01 22:23:05 -05:00
parent cc2f054e6a
commit 033b0952dd
34 changed files with 104 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/proxy/report.go
View File

@@ -7,7 +7,7 @@ import (
)
// ReportSingleApp is an internal function that displays the proxy report for one or more apps
func ReportSingleApp(appName string, infoFlag string) error {
func ReportSingleApp(appName string, format string, infoFlag string) error {
if err := common.VerifyAppName(appName); err != nil {
return err
}
@@ -26,7 +26,7 @@ func ReportSingleApp(appName string, infoFlag string) error {
trimPrefix := false
uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("proxy", appName, infoFlag, infoFlags, flagKeys, trimPrefix, uppercaseFirstCharacter)
return common.ReportSingleApp("proxy", appName, infoFlag, infoFlags, flagKeys, format, trimPrefix, uppercaseFirstCharacter)
}
func reportEnabled(appName string) string {

3
plugins/proxy/src/subcommands/subcommands.go
View File

@@ -64,11 +64,12 @@ func main() {
err = proxy.CommandPortsSet(appName, portMaps)
case "report":
args := flag.NewFlagSet("proxy:report", flag.ExitOnError)
format := args.String("format", "stdout", "format: [ stdout | json ]")
osArgs, infoFlag, flagErr := common.ParseReportArgs("proxy", os.Args[2:])
if flagErr == nil {
args.Parse(osArgs)
appName := args.Arg(0)
err = proxy.CommandReport(appName, infoFlag)
err = proxy.CommandReport(appName, *format, infoFlag)
}
case "set":
args := flag.NewFlagSet("proxy:set", flag.ExitOnError)

2
plugins/proxy/src/triggers/triggers.go
View File

@@ -32,7 +32,7 @@ func main() {
proxy.TriggerPostCertsUpdate(appName)
case "report":
appName := flag.Arg(0)
err = proxy.ReportSingleApp(appName, "")
err = proxy.ReportSingleApp(appName, "", "")
default:
common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger))
}

6
plugins/proxy/subcommands.go
View File

@@ -150,21 +150,21 @@ func CommandPortsSet(appName string, portMaps []string) error {
}
// CommandReport displays a proxy report for one or more apps
func CommandReport(appName string, infoFlag string) error {
func CommandReport(appName string, format string, infoFlag string) error {
if len(appName) == 0 {
apps, err := common.DokkuApps()
if err != nil {
return err
}
for _, appName := range apps {
if err := ReportSingleApp(appName, infoFlag); err != nil {
if err := ReportSingleApp(appName, format, infoFlag); err != nil {
return err
}
}
return nil
}
return ReportSingleApp(appName, infoFlag)
return ReportSingleApp(appName, format, infoFlag)
}
// CommandSet sets a proxy for an app