Use os.Getenv instead of viper.GetStringSlice to parse string array

Author: everesio

cmd/kafka-proxy/server.go

@@ -51,10 +51,10 @@ var Server = &cobra.Command{
 		if err := c.InitSASLCredentials(); err != nil {
 			return err
 		}
-		if err := c.InitBootstrapServers(getOrStringSlice(bootstrapServersMapping, "bootstrap-server-mapping")); err != nil {
+		if err := c.InitBootstrapServers(getOrEnvStringSlice(bootstrapServersMapping, "BOOTSTRAP_SERVER_MAPPING")); err != nil {
 			return err
 		}
-		if err := c.InitExternalServers(getOrStringSlice(externalServersMapping, "external-server-mapping")); err != nil {
+		if err := c.InitExternalServers(getOrEnvStringSlice(externalServersMapping, "EXTERNAL_SERVER_MAPPING")); err != nil {
 			return err
 		}
 		if err := c.Validate(); err != nil {
@@ -65,11 +65,11 @@ var Server = &cobra.Command{
 	Run: Run,
 }
 
-func getOrStringSlice(value []string, key string) []string {
+func getOrEnvStringSlice(value []string, envKey string) []string {
 	if len(bootstrapServersMapping) != 0 {
 		return value
 	}
-	return viper.GetStringSlice(key)
+	return strings.Fields(os.Getenv(envKey))
 }
 
 func init() {

cmd/kafka-proxy/server_test.go

@@ -12,6 +12,7 @@ func setupBootstrapServersMappingTest() {
 	c = new(config.Config)
 	initFlags()
 	os.Setenv("BOOTSTRAP_SERVER_MAPPING", "")
+	os.Setenv("EXTERNAL_SERVER_MAPPING", "")
 }
 
 func TestBootstrapServersMappingFromFlags(t *testing.T) {
@@ -74,3 +75,53 @@ func TestEmptyBootstrapServersMapping(t *testing.T) {
 	a := assert.New(t)
 	a.Error(err, "list of bootstrap-server-mapping must not be empty")
 }
+
+func TestBootstrapServersMappingFromEnvWithWhiteSpaces(t *testing.T) {
+	setupBootstrapServersMappingTest()
+
+	os.Setenv("BOOTSTRAP_SERVER_MAPPING", "   192.168.99.100:32404,0.0.0.0:32404   kafka-5.example.com:9092,0.0.0.0:32405,kafka-5.grepplabs.com:9092    ")
+
+	var args []string
+	Server.ParseFlags(args)
+	err := Server.PreRunE(nil, args)
+	a := assert.New(t)
+	a.Nil(err)
+	a.Len(c.Proxy.BootstrapServers, 2)
+
+	a.Equal(c.Proxy.BootstrapServers[0].BrokerAddress, "192.168.99.100:32404")
+	a.Equal(c.Proxy.BootstrapServers[0].ListenerAddress, "0.0.0.0:32404")
+	a.Equal(c.Proxy.BootstrapServers[0].AdvertisedAddress, "0.0.0.0:32404")
+
+	a.Equal(c.Proxy.BootstrapServers[1].BrokerAddress, "kafka-5.example.com:9092")
+	a.Equal(c.Proxy.BootstrapServers[1].ListenerAddress, "0.0.0.0:32405")
+	a.Equal(c.Proxy.BootstrapServers[1].AdvertisedAddress, "kafka-5.grepplabs.com:9092")
+
+}
+
+func TestExternalServersMappingFromEnv(t *testing.T) {
+	setupBootstrapServersMappingTest()
+
+	os.Setenv("BOOTSTRAP_SERVER_MAPPING", "	192.168.99.100:32401,0.0.0.0:32401")
+	os.Setenv("EXTERNAL_SERVER_MAPPING", "	192.168.99.100:32404,0.0.0.0:32404	kafka-5.example.com:9092,0.0.0.0:32405,kafka-5.grepplabs.com:9092")
+
+	var args []string
+	Server.ParseFlags(args)
+	err := Server.PreRunE(nil, args)
+	a := assert.New(t)
+	a.Nil(err)
+	a.Len(c.Proxy.BootstrapServers, 1)
+	a.Len(c.Proxy.ExternalServers, 2)
+
+	a.Equal(c.Proxy.BootstrapServers[0].BrokerAddress, "192.168.99.100:32401")
+	a.Equal(c.Proxy.BootstrapServers[0].ListenerAddress, "0.0.0.0:32401")
+	a.Equal(c.Proxy.BootstrapServers[0].AdvertisedAddress, "0.0.0.0:32401")
+
+	a.Equal(c.Proxy.ExternalServers[0].BrokerAddress, "192.168.99.100:32404")
+	a.Equal(c.Proxy.ExternalServers[0].ListenerAddress, "0.0.0.0:32404")
+	a.Equal(c.Proxy.ExternalServers[0].AdvertisedAddress, "0.0.0.0:32404")
+
+	a.Equal(c.Proxy.ExternalServers[1].BrokerAddress, "kafka-5.example.com:9092")
+	a.Equal(c.Proxy.ExternalServers[1].ListenerAddress, "0.0.0.0:32405")
+	a.Equal(c.Proxy.ExternalServers[1].AdvertisedAddress, "kafka-5.grepplabs.com:9092")
+
+}