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

fix: unscope err for report subcommands

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2021-01-07 01:12:50 -05:00
parent 081a44755e
commit 666bb9dfee
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/apps/src/subcommands/subcommands.go
View File

@@ -65,8 +65,8 @@ func main() {
err = apps.CommandRename(oldAppName, newAppName, *skipDeploy) err = apps.CommandRename(oldAppName, newAppName, *skipDeploy)
case "report": case "report":
args := flag.NewFlagSet("apps:report", flag.ExitOnError) args := flag.NewFlagSet("apps:report", flag.ExitOnError)
osArgs, infoFlag, err := common.ParseReportArgs("apps", os.Args[2:]) osArgs, infoFlag, flagErr := common.ParseReportArgs("apps", os.Args[2:])
if err == nil { if flagErr == nil {
args.Parse(osArgs) args.Parse(osArgs)
appName := args.Arg(0) appName := args.Arg(0)
err = apps.CommandReport(appName, infoFlag) err = apps.CommandReport(appName, infoFlag)

4
plugins/buildpacks/src/subcommands/subcommands.go
View File

@@ -44,8 +44,8 @@ func main() {
err = buildpacks.CommandRemove(appName, buildpack, *index) err = buildpacks.CommandRemove(appName, buildpack, *index)
case "report": case "report":
args := flag.NewFlagSet("buildpacks:report", flag.ExitOnError) args := flag.NewFlagSet("buildpacks:report", flag.ExitOnError)
osArgs, infoFlag, err := common.ParseReportArgs("buildpacks", os.Args[2:]) osArgs, infoFlag, flagErr := common.ParseReportArgs("buildpacks", os.Args[2:])
if err == nil { if flagErr == nil {
args.Parse(osArgs) args.Parse(osArgs)
appName := args.Arg(0) appName := args.Arg(0)
err = buildpacks.CommandReport(appName, infoFlag) err = buildpacks.CommandReport(appName, infoFlag)

4
plugins/logs/src/subcommands/subcommands.go
View File

@@ -26,8 +26,8 @@ func main() {
err = logs.CommandFailed(appName, *allApps) err = logs.CommandFailed(appName, *allApps)
case "report": case "report":
args := flag.NewFlagSet("logs:report", flag.ExitOnError) args := flag.NewFlagSet("logs:report", flag.ExitOnError)
osArgs, infoFlag, err := common.ParseReportArgs("logs", os.Args[2:]) osArgs, infoFlag, flagErr := common.ParseReportArgs("logs", os.Args[2:])
if err == nil { if flagErr == nil {
args.Parse(osArgs) args.Parse(osArgs)
appName := args.Arg(0) appName := args.Arg(0)
err = logs.CommandReport(appName, infoFlag) err = logs.CommandReport(appName, infoFlag)

4
plugins/network/src/subcommands/subcommands.go
View File

@@ -53,8 +53,8 @@ func main() {
err = network.CommandRebuildall() err = network.CommandRebuildall()
case "report": case "report":
args := flag.NewFlagSet("network:report", flag.ExitOnError) args := flag.NewFlagSet("network:report", flag.ExitOnError)
osArgs, infoFlag, err := common.ParseReportArgs("network", os.Args[2:]) osArgs, infoFlag, flagErr := common.ParseReportArgs("network", os.Args[2:])
if err == nil { if flagErr == nil {
args.Parse(osArgs) args.Parse(osArgs)
appName := args.Arg(0) appName := args.Arg(0)
err = network.CommandReport(appName, infoFlag) err = network.CommandReport(appName, infoFlag)

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

@@ -64,8 +64,8 @@ func main() {
err = proxy.CommandPortsSet(appName, portMaps) err = proxy.CommandPortsSet(appName, portMaps)
case "report": case "report":
args := flag.NewFlagSet("proxy:report", flag.ExitOnError) args := flag.NewFlagSet("proxy:report", flag.ExitOnError)
osArgs, infoFlag, err := common.ParseReportArgs("proxy", os.Args[2:]) osArgs, infoFlag, flagErr := common.ParseReportArgs("proxy", os.Args[2:])
if err == nil { if flagErr == nil {
args.Parse(osArgs) args.Parse(osArgs)
appName := args.Arg(0) appName := args.Arg(0)
err = proxy.CommandReport(appName, infoFlag) err = proxy.CommandReport(appName, infoFlag)

4
plugins/ps/src/subcommands/subcommands.go
View File

@@ -32,8 +32,8 @@ func main() {
err = ps.CommandRebuild(appName, *allApps, *parallelCount) err = ps.CommandRebuild(appName, *allApps, *parallelCount)
case "report": case "report":
args := flag.NewFlagSet("ps:report", flag.ExitOnError) args := flag.NewFlagSet("ps:report", flag.ExitOnError)
osArgs, infoFlag, err := common.ParseReportArgs("ps", os.Args[2:]) osArgs, infoFlag, flagErr := common.ParseReportArgs("ps", os.Args[2:])
if err == nil { if flagErr == nil {
args.Parse(osArgs) args.Parse(osArgs)
appName := args.Arg(0) appName := args.Arg(0)
err = ps.CommandReport(appName, infoFlag) err = ps.CommandReport(appName, infoFlag)

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

@@ -50,8 +50,8 @@ func main() {
err = resource.CommandLimitClear(appName, *processType) err = resource.CommandLimitClear(appName, *processType)
case "report": case "report":
args := flag.NewFlagSet("resource:report", flag.ExitOnError) args := flag.NewFlagSet("resource:report", flag.ExitOnError)
osArgs, infoFlag, err := common.ParseReportArgs("resource", os.Args[2:]) osArgs, infoFlag, flagErr := common.ParseReportArgs("resource", os.Args[2:])
if err == nil { if flagErr == nil {
args.Parse(osArgs) args.Parse(osArgs)
appName := args.Arg(0) appName := args.Arg(0)
err = resource.CommandReport(appName, infoFlag) err = resource.CommandReport(appName, infoFlag)