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

Merge pull request #8527 from dokku/8500-allow-format-json-with-global-on-report-subcommands

Browse Source 
Accept --global on :report subcommands
This commit is contained in:
Jose Diaz-Gonzalez
2026-04-29 12:14:54 -04:00
committed by GitHub
parent 1a45fef839 0f78f81d71
commit abb7faa503
61 changed files with 1375 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/resource/resource.go
View File

@@ -19,8 +19,10 @@ type Resource struct {
// ReportSingleApp is an internal function that displays the resource report for one or more apps
func ReportSingleApp(appName, format, infoFlag string) error {
if err := common.VerifyAppName(appName); err != nil {
return err
if appName != "--global" {
if err := common.VerifyAppName(appName); err != nil {
return err
}
}
resources, err := common.PropertyGetAll("resource", appName)

9
plugins/resource/src/subcommands/subcommands.go
View File

@@ -51,11 +51,14 @@ func main() {
case "report":
args := flag.NewFlagSet("resource:report", flag.ExitOnError)
format := args.String("format", "stdout", "format: [ stdout | json ]")
osArgs, infoFlag, flagErr := common.ParseReportArgs("resource", os.Args[2:])
reportArgs, flagErr := common.ParseReportArgs("resource", os.Args[2:])
if flagErr == nil {
args.Parse(osArgs)
args.Parse(reportArgs.OSArgs)
appName := args.Arg(0)
err = resource.CommandReport(appName, *format, infoFlag)
if reportArgs.IsGlobal {
appName = "--global"
}
err = resource.CommandReport(appName, *format, reportArgs.InfoFlag)
}
case "reserve":
args := flag.NewFlagSet("resource:reserve", flag.ExitOnError)