Trim trailing spaces and tabs from config map files

api/kv/kv.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"regexp"
 	"strings"
 	"unicode"
 	"unicode/utf8"
@@ -85,11 +86,17 @@ func (kvl *loader) keyValuesFromFileSources(sources []string) ([]types.Pair, err
 		if err != nil {
 			return nil, err
 		}
-		kvs = append(kvs, types.Pair{Key: k, Value: string(content)})
+		kvs = append(kvs, types.Pair{Key: k, Value: kvl.trimTrailingSpacesInLines(string(content))})
 	}
 	return kvs, nil
 }
 
+// Takes string with multiple lines and trims the trailing white spaces from each line.
+func (kvl *loader) trimTrailingSpacesInLines(str string) string {
+	re := regexp.MustCompile(`\s*\n`)
+	return re.ReplaceAllString(str, "\n")
+}
+
 func (kvl *loader) keyValuesFromEnvFiles(paths []string) ([]types.Pair, error) {
 	var kvs []types.Pair
 	for _, p := range paths {

api/kv/kv_test.go

@@ -95,3 +95,13 @@ func TestKeyValuesFromFileSources(t *testing.T) {
 		}
 	}
 }
+
+func TestTrimTrailingSpacesInLines(t *testing.T) {
+	kvl := makeKvLoader(filesys.MakeFsInMemory())
+	input := "\"fooKey\": \"fooValue\"   \t\n\t\"barKey\": \"barValue\""
+	expected := "\"fooKey\": \"fooValue\"\n\t\"barKey\": \"barValue\""
+	res := kvl.trimTrailingSpacesInLines(input)
+	if !reflect.DeepEqual(res, expected) {
+		t.Errorf("Trim trailing spaces in lines should succeed, got: %s exptected: %s", res, expected)
+	}
+}