From 1cf197d69e824e2747d674b3e4e2e0c6708fbcfa Mon Sep 17 00:00:00 2001 From: Anubhav Mishra Date: Mon, 27 Mar 2017 22:48:01 -0700 Subject: [PATCH] fix(helm): fix comments and removed unwanted split --- pkg/releaseutil/manifest.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/releaseutil/manifest.go b/pkg/releaseutil/manifest.go index f4545e5b5..e86e3892a 100644 --- a/pkg/releaseutil/manifest.go +++ b/pkg/releaseutil/manifest.go @@ -32,19 +32,19 @@ type SimpleHead struct { } `json:"metadata,omitempty"` } +var sep = regexp.MustCompile("(?:^|\\s*\n)---\\s*") + // SplitManifests takes a string of manifest and returns a map contains individual manifests func SplitManifests(bigfile string) map[string]string { // This is not the best way of doing things, but it's how k8s itself does it. // Basically, we're quickly splitting a stream of YAML documents into an // array of YAML docs. In the current implementation, the file name is just // a place holder, and doesn't have any further meaning. - sep := regexp.MustCompile("(?:^|\\s*\n)---\\s*") tpl := "manifest-%d" res := map[string]string{} - // Making sure YAML formatting doesn't matter when generating manifest from string. - bigFileTmp := strings.TrimSpace(bigfile) - tmp := sep.Split(bigFileTmp, -1) - for i, d := range tmp { + // Making sure that any extra whitespace in YAML stream doesn't interfere in splitting documents correctly. + docs := sep.Split(bigfile, -1) + for i, d := range docs { res[fmt.Sprintf(tpl, i)] = d } return res