Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Trim spaces from beginning and end of templates #141

Closed
wants to merge 4 commits into from
Closed

Trim spaces from beginning and end of templates #141

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3c4393
Trim spaces from beginning and end of templates
kragniz May 10, 2018
0077a4b
Remove newline in expected docs
kragniz May 10, 2018
bef8bea
Add trailing newline
kragniz May 11, 2018
f53a66b
Revert "Remove newline in expected docs"
kragniz May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 6 additions & 11 deletions cmd/kubebuilder/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package util

import (
"bytes"
"fmt"
"io/ioutil"
"log"
Expand Down Expand Up @@ -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,
Expand All @@ -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()) + "\n"
WriteString(path, trimmed)

return true
}
Expand Down