fix: embed template files

tkasuz · Feb 22, 2023 · 8e0cf68 · 8e0cf68
1 parent c4d7848
commit 8e0cf68
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/cli/generate.go b/cli/generate.go
@@ -18,7 +18,6 @@ func GenerateAction(context *cli.Context) error {
 	apiBuilder := api.NewAppSyncApiBuilder()
 	apiBuilder.SetName(context.String("name"))
 	apiBuilder.SetExportPath(context.String("output"))
-	apiBuilder.SetTemplates("./codegen/templates")
 	apiBuilder.SetSchema(context.String("schema"))
 	fmt.Printf("✅ Generated GraphQL schema to %s\n", c.Sprint(filepath.Join(*apiBuilder.ExportPath, "schema.graphql")))
 	apiBuilder.AddDataSource("DYNAMODB", context.String("name"))

diff --git a/cli/generate_test.go b/cli/generate_test.go
@@ -1,18 +1,18 @@
 package cli
 
 import (
-	"github.com/kopkunka55/appsyncgen/codegen/api"
 	"testing"
+
+	"github.com/kopkunka55/appsyncgen/codegen/api"
 )
 
 func TestGenerate(t *testing.T) {
 	apiBuilder := api.NewAppSyncApiBuilder()
 	apiBuilder.SetExportPath("./../resolvers")
-	apiBuilder.SetTemplates("./../codegen/templates")
 	apiBuilder.SetSchema("./../testdata/schema.graphql")
 	apiBuilder.AddDataSource("DYNAMODB", "appsync")
 	apiBuilder.SetName("appsync")
 	appSync := apiBuilder.Build()
-	appSync.Synth()
 	appSync.Export()
+	appSync.Synth()
 }
diff --git a/codegen/api/builder.go b/codegen/api/builder.go
@@ -49,6 +49,7 @@ func (a *AppSyncApiBuilder) AddDataSource(datasourceType string, datasourceName
 }
 
 func (a *AppSyncApiBuilder) SetSchema(pathToSchema string) {
+	a.SetTemplates()
 	if a.ExportPath == nil {
 		log.Fatalln("export path should be set before setting schema")
 	}
@@ -65,14 +66,15 @@ func (a *AppSyncApiBuilder) SetSchema(pathToSchema string) {
 	a.Schema = schema
 }
 
-func (a *AppSyncApiBuilder) SetTemplates(pathToTemplate string) {
+func (a *AppSyncApiBuilder) SetTemplates() {
+
 	tmpl := templates.NewTemplate()
 	tmpl = templates.AddFunctionMap(tmpl, map[string]any{
 		"toLowerCase": strings.ToLower,
 	})
-	tmpl = templates.ImportTemplate(tmpl, filepath.Join(pathToTemplate, "resolver", "dynamodb", "*.tmpl"))
-	tmpl = templates.ImportTemplate(tmpl, filepath.Join(pathToTemplate, "resolver", "*.tmpl"))
-	tmpl = templates.ImportTemplate(tmpl, filepath.Join(pathToTemplate, "graphql", "*.tmpl"))
+	tmpl = templates.ImportTemplate(tmpl, "resolver/dynamodb/*.tmpl")
+	tmpl = templates.ImportTemplate(tmpl, "resolver/*.tmpl")
+	tmpl = templates.ImportTemplate(tmpl, "graphql/*.tmpl")
 	a.Templates = tmpl
 }
 

diff --git a/codegen/templates/template.go b/codegen/templates/template.go
@@ -2,12 +2,16 @@ package templates
 
 import (
 	"bytes"
+	"embed"
 	"fmt"
 	"log"
 	"os"
 	"text/template"
 )
 
+//go:embed *
+var f embed.FS
+
 type DynamoDBResolverTemplateData struct {
 	PK          string
 	SK          string
@@ -22,7 +26,7 @@ func NewTemplate() *template.Template {
 
 func ImportTemplate(tmpl *template.Template, tmplPaths ...string) *template.Template {
 	for _, p := range tmplPaths {
-		tmpl = template.Must(tmpl.ParseGlob(p))
+		tmpl = template.Must(tmpl.ParseFS(f, p))
 	}
 	return tmpl
 }