From d3c43933ef6fa7868e8bcbd170eebf4f3ab690ff Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Thu, 10 May 2018 23:43:20 +0100 Subject: [PATCH 1/4] Trim spaces from beginning and end of templates This prevents some slightly strange looking packages being generated with init. --- cmd/kubebuilder/util/util.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/cmd/kubebuilder/util/util.go b/cmd/kubebuilder/util/util.go index 6c95c3fcc4b..bc2cd111289 100644 --- a/cmd/kubebuilder/util/util.go +++ b/cmd/kubebuilder/util/util.go @@ -17,6 +17,7 @@ limitations under the License. package util import ( + "bytes" "fmt" "io/ioutil" "log" @@ -50,10 +51,6 @@ func WriteIfNotFound(path, templateName, templateValue string, data interface{}) } func Write(path, templateName, templateValue string, data interface{}) bool { - if _, err := os.Stat(path); os.IsNotExist(err) { - create(path) - } - t := template.Must(template.New(templateName).Funcs( template.FuncMap{ "title": strings.Title, @@ -62,16 +59,14 @@ func Write(path, templateName, templateValue string, data interface{}) bool { }, ).Parse(templateValue)) - f, err := os.OpenFile(path, os.O_WRONLY, 0) + var tmp bytes.Buffer + err := t.Execute(&tmp, data) if err != nil { - log.Fatalf("Failed to create %s: %v", path, err) + log.Fatalf("Failed to render template %s: %v", templateName, err) } - defer f.Close() - err = t.Execute(f, data) - if err != nil { - log.Fatalf("Failed to create %s: %v", path, err) - } + trimmed := strings.TrimSpace(tmp.String()) + WriteString(path, trimmed) return true } From 0077a4b07e25c3a6d3047f84f1f820f7a15fa0c8 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Thu, 10 May 2018 23:56:07 +0100 Subject: [PATCH 2/4] Remove newline in expected docs --- test/docs/expected/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/docs/expected/config.yaml b/test/docs/expected/config.yaml index 612636b20a7..c90f95be945 100644 --- a/test/docs/expected/config.yaml +++ b/test/docs/expected/config.yaml @@ -19,4 +19,4 @@ resource_categories: group: "insect" - name: "Wasp" version: "v1beta1" - group: "insect" + group: "insect" \ No newline at end of file From bef8beac0f105568d255c446e15ea1c2575a54aa Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Fri, 11 May 2018 10:31:50 +0100 Subject: [PATCH 3/4] Add trailing newline --- cmd/kubebuilder/util/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubebuilder/util/util.go b/cmd/kubebuilder/util/util.go index bc2cd111289..ce594a517bc 100644 --- a/cmd/kubebuilder/util/util.go +++ b/cmd/kubebuilder/util/util.go @@ -65,7 +65,7 @@ func Write(path, templateName, templateValue string, data interface{}) bool { log.Fatalf("Failed to render template %s: %v", templateName, err) } - trimmed := strings.TrimSpace(tmp.String()) + trimmed := strings.TrimSpace(tmp.String()) + "\n" WriteString(path, trimmed) return true From f53a66b46e8ac392e8ccc7dd899e9679f70b60e2 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Fri, 11 May 2018 10:32:10 +0100 Subject: [PATCH 4/4] Revert "Remove newline in expected docs" This reverts commit 0077a4b07e25c3a6d3047f84f1f820f7a15fa0c8. --- test/docs/expected/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/docs/expected/config.yaml b/test/docs/expected/config.yaml index c90f95be945..612636b20a7 100644 --- a/test/docs/expected/config.yaml +++ b/test/docs/expected/config.yaml @@ -19,4 +19,4 @@ resource_categories: group: "insect" - name: "Wasp" version: "v1beta1" - group: "insect" \ No newline at end of file + group: "insect"