From 666bb9dfee2cd3cab0e68aa101933e42cb143baf Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jan 2021 01:12:50 -0500 Subject: [PATCH] fix: unscope err for report subcommands --- plugins/apps/src/subcommands/subcommands.go | 4 ++-- plugins/buildpacks/src/subcommands/subcommands.go | 4 ++-- plugins/logs/src/subcommands/subcommands.go | 4 ++-- plugins/network/src/subcommands/subcommands.go | 4 ++-- plugins/proxy/src/subcommands/subcommands.go | 4 ++-- plugins/ps/src/subcommands/subcommands.go | 4 ++-- plugins/resource/src/subcommands/subcommands.go | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/apps/src/subcommands/subcommands.go b/plugins/apps/src/subcommands/subcommands.go index 0f146428e..66943d125 100644 --- a/plugins/apps/src/subcommands/subcommands.go +++ b/plugins/apps/src/subcommands/subcommands.go @@ -65,8 +65,8 @@ func main() { err = apps.CommandRename(oldAppName, newAppName, *skipDeploy) case "report": args := flag.NewFlagSet("apps:report", flag.ExitOnError) - osArgs, infoFlag, err := common.ParseReportArgs("apps", os.Args[2:]) - if err == nil { + osArgs, infoFlag, flagErr := common.ParseReportArgs("apps", os.Args[2:]) + if flagErr == nil { args.Parse(osArgs) appName := args.Arg(0) err = apps.CommandReport(appName, infoFlag) diff --git a/plugins/buildpacks/src/subcommands/subcommands.go b/plugins/buildpacks/src/subcommands/subcommands.go index 375b8794e..7bf7a2303 100644 --- a/plugins/buildpacks/src/subcommands/subcommands.go +++ b/plugins/buildpacks/src/subcommands/subcommands.go @@ -44,8 +44,8 @@ func main() { err = buildpacks.CommandRemove(appName, buildpack, *index) case "report": args := flag.NewFlagSet("buildpacks:report", flag.ExitOnError) - osArgs, infoFlag, err := common.ParseReportArgs("buildpacks", os.Args[2:]) - if err == nil { + osArgs, infoFlag, flagErr := common.ParseReportArgs("buildpacks", os.Args[2:]) + if flagErr == nil { args.Parse(osArgs) appName := args.Arg(0) err = buildpacks.CommandReport(appName, infoFlag) diff --git a/plugins/logs/src/subcommands/subcommands.go b/plugins/logs/src/subcommands/subcommands.go index b10ce4912..d94322bc0 100644 --- a/plugins/logs/src/subcommands/subcommands.go +++ b/plugins/logs/src/subcommands/subcommands.go @@ -26,8 +26,8 @@ func main() { err = logs.CommandFailed(appName, *allApps) case "report": args := flag.NewFlagSet("logs:report", flag.ExitOnError) - osArgs, infoFlag, err := common.ParseReportArgs("logs", os.Args[2:]) - if err == nil { + osArgs, infoFlag, flagErr := common.ParseReportArgs("logs", os.Args[2:]) + if flagErr == nil { args.Parse(osArgs) appName := args.Arg(0) err = logs.CommandReport(appName, infoFlag) diff --git a/plugins/network/src/subcommands/subcommands.go b/plugins/network/src/subcommands/subcommands.go index b5f1a5cc7..1842692e2 100644 --- a/plugins/network/src/subcommands/subcommands.go +++ b/plugins/network/src/subcommands/subcommands.go @@ -53,8 +53,8 @@ func main() { err = network.CommandRebuildall() case "report": args := flag.NewFlagSet("network:report", flag.ExitOnError) - osArgs, infoFlag, err := common.ParseReportArgs("network", os.Args[2:]) - if err == nil { + osArgs, infoFlag, flagErr := common.ParseReportArgs("network", os.Args[2:]) + if flagErr == nil { args.Parse(osArgs) appName := args.Arg(0) err = network.CommandReport(appName, infoFlag) diff --git a/plugins/proxy/src/subcommands/subcommands.go b/plugins/proxy/src/subcommands/subcommands.go index 7765b0375..5df47134c 100644 --- a/plugins/proxy/src/subcommands/subcommands.go +++ b/plugins/proxy/src/subcommands/subcommands.go @@ -64,8 +64,8 @@ func main() { err = proxy.CommandPortsSet(appName, portMaps) case "report": args := flag.NewFlagSet("proxy:report", flag.ExitOnError) - osArgs, infoFlag, err := common.ParseReportArgs("proxy", os.Args[2:]) - if err == nil { + osArgs, infoFlag, flagErr := common.ParseReportArgs("proxy", os.Args[2:]) + if flagErr == nil { args.Parse(osArgs) appName := args.Arg(0) err = proxy.CommandReport(appName, infoFlag) diff --git a/plugins/ps/src/subcommands/subcommands.go b/plugins/ps/src/subcommands/subcommands.go index d19c51173..41aae7d35 100644 --- a/plugins/ps/src/subcommands/subcommands.go +++ b/plugins/ps/src/subcommands/subcommands.go @@ -32,8 +32,8 @@ func main() { err = ps.CommandRebuild(appName, *allApps, *parallelCount) case "report": args := flag.NewFlagSet("ps:report", flag.ExitOnError) - osArgs, infoFlag, err := common.ParseReportArgs("ps", os.Args[2:]) - if err == nil { + osArgs, infoFlag, flagErr := common.ParseReportArgs("ps", os.Args[2:]) + if flagErr == nil { args.Parse(osArgs) appName := args.Arg(0) err = ps.CommandReport(appName, infoFlag) diff --git a/plugins/resource/src/subcommands/subcommands.go b/plugins/resource/src/subcommands/subcommands.go index c0808d06b..8d079e329 100644 --- a/plugins/resource/src/subcommands/subcommands.go +++ b/plugins/resource/src/subcommands/subcommands.go @@ -50,8 +50,8 @@ func main() { err = resource.CommandLimitClear(appName, *processType) case "report": args := flag.NewFlagSet("resource:report", flag.ExitOnError) - osArgs, infoFlag, err := common.ParseReportArgs("resource", os.Args[2:]) - if err == nil { + osArgs, infoFlag, flagErr := common.ParseReportArgs("resource", os.Args[2:]) + if flagErr == nil { args.Parse(osArgs) appName := args.Arg(0) err = resource.CommandReport(appName, infoFlag)