fix: change according code review comment and fix the golangci-lint error

Signed-off-by: Daniel Hu <tao.hu@merico.dev>

Author: daniel-hutao

internal/pkg/configmanager/config.go

@@ -20,6 +20,11 @@ type Config struct {
 }
 
 func (c *Config) getToolsFromApps() (Tools, error) {
+	err := c.renderPipelineTemplateMap()
+	if err != nil {
+		return nil, err
+	}
+
 	var tools Tools
 	for _, a := range c.Apps {
 		appTools, err := c.getToolsWithVarsFromApp(a)
@@ -50,15 +55,10 @@ func (c *Config) getToolsWithVarsFromApp(a app) (Tools, error) {
 		return nil, fmt.Errorf("app parse yaml failed: %w", err)
 	}
 
-	err = c.renderPipelineTemplateMap()
-	if err != nil {
-		return nil, err
-	}
-
 	rawApp.setDefault()
 	appVars := mapz.Merge(c.Vars, rawApp.Spec)
 
-	// 3. generate app repo and tempalte repo from scmInfo
+	// 3. generate app repo and template repo from scmInfo
 	repoScaffoldingTool, err := rawApp.getRepoTemplateTool(appVars)
 	if err != nil {
 		return nil, fmt.Errorf("app[%s] get repo failed: %w", rawApp.Name, err)

internal/pkg/configmanager/pipelineTemplate.go

@@ -83,7 +83,7 @@ func (p *pipelineRaw) getOptions(piplineType string, repo *scm.SCMInfo) RawOptio
 func (p *pipelineRaw) newPipelineFromTemplate(templateMap map[string]string, globalVars map[string]any) (*pipelineTemplate, error) {
 	var t pipelineTemplate
 	if p.TemplateName == "" {
-		return nil, fmt.Errorf("%s.templateName is required", p.TemplateName)
+		return nil, fmt.Errorf("templateName is required")
 	}
 	templateStr, ok := templateMap[p.TemplateName]
 	if !ok {

internal/pkg/configmanager/variables.go

@@ -6,12 +6,7 @@ import (
 )
 
 func renderConfigWithVariables(fileContent string, variables map[string]interface{}) ([]byte, error) {
-	log.Debugf("renderConfigWithVariables got str: %s", fileContent)
-	log.Debugf("Vars: ---")
-	for k, v := range variables {
-		log.Debugf("%s: %s", k, v)
-	}
-	log.Debugf("---")
+	logFunc(fileContent, variables)
 
 	str, err := template.New().
 		FromContent(fileContent).
@@ -25,3 +20,12 @@ func renderConfigWithVariables(fileContent string, variables map[string]interfac
 
 	return []byte(str), nil
 }
+
+func logFunc(fileContent string, variables map[string]interface{}) {
+	log.Debugf("renderConfigWithVariables got str: %s", fileContent)
+	log.Debugf("Vars: ---")
+	for k, v := range variables {
+		log.Debugf("%s: %s", k, v)
+	}
+	log.Debugf("---")
+}