kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-09-15 12:18:57 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Make suggested changes

Browse Source
This commit is contained in:
Phani Teja Marupaka
2020-01-02 13:06:14 -08:00
parent 7753a04fdc
commit 011804e14d
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/kv/kv.go
View File

@@ -86,13 +86,13 @@ func (kvl *loader) keyValuesFromFileSources(sources []string) ([]types.Pair, err
if err != nil { if err != nil {
return nil, err return nil, err
} }
kvs = append(kvs, types.Pair{Key: k, Value: kvl.trimTrailingSpacesInLines(string(content))}) kvs = append(kvs, types.Pair{Key: k, Value: trimTrailingSpacesInLines(string(content))})
} }
return kvs, nil return kvs, nil
} }
// Takes string with multiple lines and trims the trailing white spaces from each line. // trimTrailingSpacesInLines takes string with multiple lines and trims the trailing white spaces and tabs from each line.
func (kvl *loader) trimTrailingSpacesInLines(str string) string { func trimTrailingSpacesInLines(str string) string {
re := regexp.MustCompile(`\s*\n`) re := regexp.MustCompile(`\s*\n`)
return re.ReplaceAllString(str, "\n") return re.ReplaceAllString(str, "\n")
} }

3
api/kv/kv_test.go
View File

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