refactor: surface errors when running reports

This commit is contained in:
Jose Diaz-Gonzalez
2020-02-22 06:29:14 -05:00
parent 59316f4a21
commit 26e8524ae5
10 changed files with 42 additions and 33 deletions

View File

@@ -212,9 +212,9 @@ func ClearNetworkConfig(appName string) bool {
}
// ReportSingleApp is an internal function that displays the app report for one or more apps
func ReportSingleApp(appName, infoFlag string) {
func ReportSingleApp(appName, infoFlag string) error {
if err := common.VerifyAppName(appName); err != nil {
common.LogFail(err.Error())
return err
}
infoFlags := map[string]string{
@@ -226,5 +226,5 @@ func ReportSingleApp(appName, infoFlag string) {
trimPrefix := false
uppercaseFirstCharacter := true
common.ReportSingleApp("network", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter)
return common.ReportSingleApp("network", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter)
}

View File

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

View File

@@ -129,7 +129,7 @@ func CommandRebuildall() {
}
// CommandReport displays a network report for one or more apps
func CommandReport(appName string, infoFlag string) {
func CommandReport(appName string, infoFlag string) error {
if strings.HasPrefix(appName, "--") {
infoFlag = appName
appName = ""
@@ -138,15 +138,17 @@ func CommandReport(appName string, infoFlag string) {
if len(appName) == 0 {
apps, err := common.DokkuApps()
if err != nil {
return
return err
}
for _, appName := range apps {
ReportSingleApp(appName, infoFlag)
if err := ReportSingleApp(appName, infoFlag); err != nil {
return err
}
}
return
return nil
}
ReportSingleApp(appName, infoFlag)
return ReportSingleApp(appName, infoFlag)
}
// CommandSet set or clear a network property for an app