Reduce duplicated code

alexellis · alexellis · commit 8eaf281572b6 · 2026-03-23T18:33:30.000Z
The getMissingTemplates call was performed within an if/else
but was identical so could be moved up one level higher.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) &lt;alexellis2@gmail.com&gt;
diff --git a/commands/publish.go b/commands/publish.go
@@ -147,12 +147,12 @@ func runPublish(cmd *cobra.Command, args []string) error {
 	cwd, _ := os.Getwd()
 	templatesPath := filepath.Join(cwd, TemplateDirectory)
 
-	if len(services.StackConfiguration.TemplateConfigs) > 0 && !disableStackPull {
-		missingTemplates, err := getMissingTemplates(services.Functions, templatesPath)
-		if err != nil {
-			return fmt.Errorf("error accessing existing templates folder: %s", err.Error())
-		}
+	missingTemplates, err := getMissingTemplates(services.Functions, templatesPath)
+	if err != nil {
+		return fmt.Errorf("error accessing existing templates folder: %s", err.Error())
+	}
 
+	if len(services.StackConfiguration.TemplateConfigs) > 0 && !disableStackPull {
 		if err := pullStackTemplates(missingTemplates, services.StackConfiguration.TemplateConfigs, cmd); err != nil {
 			return fmt.Errorf("error pulling templates: %s", err.Error())
 		}
@@ -163,18 +163,11 @@ func runPublish(cmd *cobra.Command, args []string) error {
 		// When the configuration.templates section is empty, it's only possible to pull from the store
 		// this store can be overridden by a flag or environment variable
 
-		missingTemplates, err := getMissingTemplates(services.Functions, templatesPath)
-		if err != nil {
-			return fmt.Errorf("error accessing existing templates folder: %s", err.Error())
-		}
-
 		for _, missingTemplate := range missingTemplates {
-
 			if err := runTemplateStorePull(cmd, []string{missingTemplate}); err != nil {
 				return fmt.Errorf("error pulling template: %s", err.Error())
 			}
 		}
-
 	}
 
 	if resetQemu {
diff --git a/versioncontrol/parse.go b/versioncontrol/parse.go
@@ -52,11 +52,7 @@ func ParsePinnedRemote(repoURL string) (remoteURL, refName string) {
 
 	atIndex := strings.LastIndex(repoURL, pinCharacter)
 	if atIndex > 0 {
-
 		remoteURL, refName, _ = strings.Cut(repoURL, pinCharacter)
-
-		// refName = repoURL[atIndex+len(pinCharacter):]
-		// remoteURL = repoURL[:atIndex]
 	}
 
 	if !IsGitRemote(remoteURL) {
