Merge pull request #3871 from dokku/proxy-go

Rewrite proxy plugin in golang

plugins/network/network.go

@@ -214,9 +214,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{
@@ -228,5 +228,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)
 }

plugins/network/src/triggers/triggers.go

@@ -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))
 	}

plugins/network/subcommands.go

@@ -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