From 7779b866d1be824516d6811905d9f1fcc41161c8 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Tue, 10 Aug 2021 16:54:23 -0500
Subject: [PATCH] Allow --mapping argument to be repeated or comma-separated

---
 cmd/mc-router/main.go | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/cmd/mc-router/main.go b/cmd/mc-router/main.go
index 888c38b..b6145e7 100644
--- a/cmd/mc-router/main.go
+++ b/cmd/mc-router/main.go
@@ -29,17 +29,17 @@ type MetricsBackendConfig struct {
 }
 
 type Config struct {
-	Port                 int    `default:"25565" usage:"The [port] bound to listen for Minecraft client connections"`
-	Mapping              string `usage:"Comma-separated mappings of externalHostname=host:port"`
-	ApiBinding           string `usage:"The [host:port] bound for servicing API requests"`
-	Version              bool   `usage:"Output version and exit"`
-	CpuProfile           string `usage:"Enables CPU profiling and writes to given path"`
-	Debug                bool   `usage:"Enable debug logs"`
-	ConnectionRateLimit  int    `default:"1" usage:"Max number of connections to allow per second"`
-	KubeDiscovery        bool   `usage:"Enables discovery of annotated kubernetes services"`
-	InKubeCluster        bool   `usage:"Use in-cluster kubernetes config"`
-	KubeConfig           string `usage:"The path to a kubernetes configuration file"`
-	MetricsBackend       string `default:"discard" usage:"Backend to use for metrics exposure/publishing: discard,expvar,influxdb"`
+	Port                 int      `default:"25565" usage:"The [port] bound to listen for Minecraft client connections"`
+	Mapping              []string `usage:"Comma-separated or repeated mappings of externalHostname=host:port"`
+	ApiBinding           string   `usage:"The [host:port] bound for servicing API requests"`
+	Version              bool     `usage:"Output version and exit"`
+	CpuProfile           string   `usage:"Enables CPU profiling and writes to given path"`
+	Debug                bool     `usage:"Enable debug logs"`
+	ConnectionRateLimit  int      `default:"1" usage:"Max number of connections to allow per second"`
+	KubeDiscovery        bool     `usage:"Enables discovery of annotated kubernetes services"`
+	InKubeCluster        bool     `usage:"Use in-cluster kubernetes config"`
+	KubeConfig           string   `usage:"The path to a kubernetes configuration file"`
+	MetricsBackend       string   `default:"discard" usage:"Backend to use for metrics exposure/publishing: discard,expvar,influxdb"`
 	MetricsBackendConfig MetricsBackendConfig
 }
 
@@ -137,17 +137,14 @@ func main() {
 	logrus.Info("Stopping")
 }
 
-func parseMappings(val string) map[string]string {
+func parseMappings(vals []string) map[string]string {
 	result := make(map[string]string)
-	if val != "" {
-		parts := strings.Split(val, ",")
-		for _, part := range parts {
-			keyValue := strings.Split(part, "=")
-			if len(keyValue) == 2 {
-				result[keyValue[0]] = keyValue[1]
-			} else {
-				logrus.WithField("part", part).Fatal("Invalid part of mapping")
-			}
+	for _, part := range vals {
+		keyValue := strings.Split(part, "=")
+		if len(keyValue) == 2 {
+			result[keyValue[0]] = keyValue[1]
+		} else {
+			logrus.WithField("part", part).Fatal("Invalid part of mapping")
 		}
 	}