Fix template pull stack command

Signed-off-by: Han Verstraete (OpenFaaS Ltd) <[email protected]>

Author: welteki

commands/fetch_templates.go

@@ -155,6 +155,7 @@ func canWriteLanguage(existingLanguages []string, language string, overwriteTemp
 // It returns the existing languages and the fetched languages
 // It also returns an error if the templates cannot be read
 func moveTemplates(localTemplatesDir, extractedPath, templateName string, overwriteTemplate bool, repository string, refName string, sha string) ([]string, []string, error) {
+	template := strings.SplitN(templateName, "@", 2)[0]
 
 	var (
 		existingLanguages  []string
@@ -197,13 +198,26 @@ func moveTemplates(localTemplatesDir, extractedPath, templateName string, overwr
 			refSuffix = "@" + refName
 		}
 
+		if len(template) > 0 && language != template {
+			continue
+		}
+
 		if canWriteLanguage(existingLanguages, language, overwriteTemplate) {
 			// Do cp here
 			languageSrc := filepath.Join(extractedPath, TemplateDirectory, language)
-			languageDest := filepath.Join(localTemplatesDir, language)
+
+			var languageDest string
+			if len(templateName) > 0 {
+				languageDest = filepath.Join(localTemplatesDir, templateName)
+			} else {
+				languageDest = filepath.Join(localTemplatesDir, language)
+				if refName != "" {
+					languageDest += "@" + refName
+				}
+			}
+
 			langName := language
 			if refName != "" {
-				languageDest += "@" + refName
 				langName = language + "@" + refName
 			}
 			fetchedLanguages = append(fetchedLanguages, langName)
@@ -281,6 +295,8 @@ func pullTemplate(repository, templateName string, overwriteTemplates bool) erro
 		}
 	}
 
+	fmt.Printf("Fetching template %s\n", templateName)
+
 	if err := fetchTemplates(repository, refName, templateName, overwriteTemplates); err != nil {
 		return fmt.Errorf("error while fetching templates: %w", err)
 	}

commands/template_pull_stack.go

@@ -41,7 +41,7 @@ func runTemplatePullStack(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	return pullStackTemplates([]string{}, templatesConfig, cmd)
+	return pullConfigTemplates(templatesConfig)
 }
 
 func loadTemplateConfig() ([]stack.TemplateSource, error) {
@@ -69,6 +69,17 @@ func readStackConfig() (stack.Configuration, error) {
 	return configField, nil
 }
 
+func pullConfigTemplates(templateSources []stack.TemplateSource) error {
+	for _, config := range templateSources {
+		fmt.Printf("Pulling template: %s from %s\n", config.Name, config.Source)
+
+		if err := pullTemplate(config.Source, config.Name, overwrite); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func pullStackTemplates(missingTemplates []string, templateSources []stack.TemplateSource, cmd *cobra.Command) error {
 
 	for _, val := range missingTemplates {