Merge pull request #1366 from merico-dev/refactor-template-package

refactor: use client for template

Author: aFlyBird0

internal/pkg/configmanager/variables.go

@@ -8,12 +8,10 @@ import (
 func renderConfigWithVariables(fileContent string, variables map[string]interface{}) ([]byte, error) {
 	logFunc(fileContent, variables)
 
-	str, err := template.New().
-		FromContent(fileContent).
-		AddDotForVariablesInConfigProcessor().
-		AddQuoteForVariablesInConfigProcessor().
-		SetDefaultRender(fileContent, variables).
-		Render()
+	str, err := template.NewRenderClient(&template.TemplateOption{
+		Name: "configmanager",
+	}, template.ContentGetter, template.AddDotForVariablesInConfigProcessor, template.AddQuoteForVariablesInConfigProcessor,
+	).Render(fileContent, variables)
 
 	if err != nil {
 		return nil, err

internal/pkg/develop/plugin/plugin.go

@@ -79,7 +79,12 @@ func (p *Plugin) renderTplString(tplStr string) (string, error) {
 		"dirFormat": pluginTpl.FormatPackageDirName,
 	}
 
-	res, err := templateUtil.New().FromContent(tplStr).SetDefaultRender("default", *p, funcMap).Render()
+	res, err := templateUtil.NewRenderClient(
+		&templateUtil.TemplateOption{
+			Name:    "plugins",
+			FuncMap: funcMap,
+		}, templateUtil.ContentGetter,
+	).Render(tplStr, *p)
 	if err != nil {
 		log.Debugf("Template execute failed: %s.", err)
 		log.Debugf("Template content: %s.", tplStr)

internal/pkg/plugin/argocdapp/options.go

@@ -82,7 +82,9 @@ func (o *options) getArgocdDefaultConfigFiles(configLocation downloader.Resource
 	}
 	// 3. get file content
 	fContentFunc := func(filePath string) ([]byte, error) {
-		renderContent, err := template.New().FromLocalFile(filePath).SetDefaultRender("argocd config", o).Render()
+		renderContent, err := template.NewRenderClient(&template.TemplateOption{
+			Name: "argocd",
+		}, template.LocalFileGetter).Render(filePath, o)
 		if err != nil {
 			return nil, err
 		}

internal/pkg/plugin/gitlabci/gitlabci.go

@@ -64,12 +64,12 @@ func createGitlabRunnerByHelm(repoInfo *git.RepoInfo) error {
 		return err
 	}
 	// 2. else create runner for this project
-	valuesYaml, err := template.New().FromContent(helmValueTpl).SetDefaultRender(
-		"gitlab-runner tpl", map[string]any{
+	valuesYaml, err := template.NewRenderClient(&template.TemplateOption{
+		Name: "gitlab-runner"}, template.ContentGetter).Render(
+		helmValueTpl, map[string]any{
 			"GitlabURL":     repoInfo.BaseURL,
 			"RegisterToken": runnerToken,
-		},
-	).Render()
+		})
 	if err != nil {
 		return err
 	}

internal/pkg/plugin/harbordocker/harbordocker.go

@@ -57,7 +57,9 @@ func renderConfig(options configmanager.RawOptions) (configmanager.RawOptions, e
 		return nil, err
 	}
 
-	content, err := template.New().FromContent(HarborConfigTemplate).SetDefaultRender("compose", opts).Render()
+	content, err := template.NewRenderClient(&template.TemplateOption{
+		Name: "docker-compose",
+	}, template.ContentGetter).Render(HarborConfigTemplate, opts)
 	if err != nil {
 		return nil, err
 	}

internal/pkg/plugin/installer/ci/cifile/cifile.go

@@ -68,7 +68,9 @@ func (c *CIFileConfig) newCIServerClient() (ciClient server.CIServerOptions) {
 func (c *CIFileConfig) renderContent(ciFileContent string) (string, error) {
 	needRenderContent := len(c.Vars) > 0
 	if needRenderContent {
-		return template.New().FromContent(ciFileContent).SetDefaultRender(ciTemplateName, c.Vars).Render()
+		return template.NewRenderClient(&template.TemplateOption{
+			Name: fmt.Sprintf("ci-%s", ciTemplateName),
+		}, template.ContentGetter).Render(ciFileContent, c.Vars)
 	}
 	return ciFileContent, nil
 

internal/pkg/plugin/installer/ci/cifile/utils.go

@@ -1,6 +1,7 @@
 package cifile
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/devstream-io/devstream/pkg/util/file"
@@ -16,7 +17,9 @@ func processCIFilesFunc(vars map[string]interface{}) file.DirFileContentFunc {
 		if len(vars) == 0 {
 			return os.ReadFile(filePath)
 		}
-		renderContent, err := template.New().FromLocalFile(filePath).SetDefaultRender(ciTemplateName, vars).Render()
+		renderContent, err := template.NewRenderClient(&template.TemplateOption{
+			Name: fmt.Sprintf("ci-%s", ciTemplateName),
+		}, template.LocalFileGetter).Render(filePath, vars)
 		if err != nil {
 			return nil, err
 		}

internal/pkg/plugin/installer/kubectl/installer.go

@@ -25,7 +25,9 @@ func ProcessByContent(action, content string) installer.BaseOperation {
 }
 
 func renderKubectlContent(content string, options configmanager.RawOptions) (io.Reader, error) {
-	content, err := template.New().FromContent(content).SetDefaultRender("kubectl", options).Render()
+	content, err := template.NewRenderClient(&template.TemplateOption{
+		Name: "kubectl",
+	}, template.ContentGetter).Render(content, options)
 	if err != nil {
 		return nil, err
 	}
@@ -38,7 +40,9 @@ func renderKubectlContent(content string, options configmanager.RawOptions) (io.
 
 func ProcessByURL(action, url string) installer.BaseOperation {
 	return func(options configmanager.RawOptions) error {
-		content, err := template.New().FromURL(url).SetDefaultRender("kubectl", options).Render()
+		content, err := template.NewRenderClient(&template.TemplateOption{
+			Name: "kubectl",
+		}, template.URLGetter).Render(url, options)
 		if err != nil {
 			return err
 		}

internal/pkg/plugin/installer/reposcaffolding/utils.go

@@ -49,7 +49,9 @@ func processRepoFileFunc(appName string, vars map[string]interface{}) file.DirFi
 		log.Debugf("Walk: found file: %s.", filePath)
 		// if file endswith tpl, render this file, else copy this file directly
 		if strings.Contains(filePath, "tpl") {
-			fileContentStr, err := template.New().FromLocalFile(filePath).SetDefaultRender(appName, vars).Render()
+			fileContentStr, err := template.NewRenderClient(&template.TemplateOption{
+				Name: "repo-scaffolding",
+			}, template.LocalFileGetter).Render(filePath, vars)
 			if err != nil {
 				log.Warnf("repo render file failed: %s", err)
 				return fileContent, err

internal/pkg/plugin/jiragithub/render.go

@@ -14,5 +14,7 @@ func renderTemplate(workflow *github.Workflow, options *Options) (string, error)
 		return "", err
 	}
 
-	return template.New().FromContent(workflow.WorkflowContent).SetDefaultRender("jiragithub", opts).Render()
+	return template.NewRenderClient(&template.TemplateOption{
+		Name: "jiragithub",
+	}, template.ContentGetter).Render(workflow.WorkflowContent, opts)
 }