Skip to content

Commit 2a19857

Browse files
committed
template utils/ general fixs from previuos sprout related code
1 parent 86d5337 commit 2a19857

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

generate/http/generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ import (
88
)
99

1010
func GenerateHttpGW(templator *templator.Templator, config *config.Commit0Config) {
11-
util.TemplateFileIfDoesNotExist("http", "main.go", templator.Go.GoHttpGW, config)
11+
util.TemplateFileAndOverwrite("http", "main.go", templator.Go.GoHttpGW, config)
1212
}

templates/golang/server.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package {{ .ServiceName }}
22

33
import (
44
"context"
5-
health_api "github.com/yourrepo/hello-world-idl/gen/go/health"
5+
health_api "{{.GitRepo}}/{{ .ProjectName }}-idl/gen/go/health"
66
//api "{{.GitRepo}}/{{ .ProjectName }}-idl/gen/go/{{ .ServiceName }}"
77
)
88

util/util.go

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,37 @@ var FuncMap = template.FuncMap{
2020
"Title": strings.Title,
2121
}
2222

23+
func createTemplatedFile(fullFilePath string, template *template.Template, data interface{}) {
24+
f, err := os.Create(fullFilePath)
25+
if err != nil {
26+
log.Printf("Error creating file: %v", err)
27+
}
28+
err = template.Execute(f, data)
29+
if err != nil {
30+
log.Printf("Error templating: %v", err)
31+
}
32+
}
33+
34+
35+
func TemplateFileAndOverwrite(fileDir string, fileName string, template *template.Template, data interface{}) {
36+
fullFilePath := fmt.Sprintf("%v/%v", fileDir, fileName)
37+
err := os.MkdirAll(fileDir, os.ModePerm)
38+
if err != nil {
39+
log.Printf("Error creating directory %v: %v", fullFilePath, err)
40+
}
41+
createTemplatedFile(fullFilePath, template, data)
42+
43+
}
44+
2345
func TemplateFileIfDoesNotExist(fileDir string, fileName string, template *template.Template, data interface{}) {
2446
fullFilePath := fmt.Sprintf("%v/%v", fileDir, fileName)
2547

2648
if _, err := os.Stat(fullFilePath); os.IsNotExist(err) {
2749
err := CreateDirIfDoesNotExist(fileDir)
28-
f, err := os.Create(fullFilePath)
29-
if err != nil {
30-
log.Printf("Error creating file: %v", err)
31-
}
32-
err = template.Execute(f, data)
3350
if err != nil {
34-
log.Printf("Error templating: %v", err)
51+
log.Printf("Error creating directory %v: %v", fullFilePath, err)
3552
}
53+
createTemplatedFile(fullFilePath, template, data)
3654
} else {
3755
log.Printf("%v already exists. skipping.", fullFilePath)
3856
}

0 commit comments

Comments
 (0)