Fix checking out of a SHA by using a different git command

The SHA-based workflow which was tested appeared to fail
to checkout the specific SHA due to the depth being 1 in the
default command, and the reference name being added and not
available.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

commands/fetch_templates.go

@@ -4,16 +4,17 @@
 package commands
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"slices"
 	"strings"
 	"time"
 
+	execute "github.com/alexellis/go-execute/v2"
 	"github.com/openfaas/faas-cli/builder"
 	"github.com/openfaas/faas-cli/versioncontrol"
 )
@@ -29,11 +30,16 @@ func fetchTemplates(templateURL, refName, templateName string, overwriteTemplate
 		return fmt.Errorf("pass valid templateURL")
 	}
 
-	log.Printf("Fetching templates from %s", templateURL)
+	refMsg := ""
+	if len(refName) > 0 {
+		refMsg = " [" + refName + "]"
+	}
+
+	log.Printf("Fetching templates from %s%s", templateURL, refMsg)
 
 	targetDir, err := os.MkdirTemp("", "openfaas-templates-*")
 	if err != nil {
-		return err
+		return fmt.Errorf("unable to create temporary directory: %s", err)
 	}
 
 	if !pullDebug {
@@ -45,21 +51,35 @@ func fetchTemplates(templateURL, refName, templateName string, overwriteTemplate
 	args := map[string]string{"dir": targetDir, "repo": templateURL}
 	cmd := versioncontrol.GitCloneDefault
 
-	if len(refName) > 0 && !strings.HasPrefix(refName, "sha-") {
-		args["refname"] = refName
-		cmd = versioncontrol.GitClone
+	if len(refName) > 0 {
+		if strings.HasPrefix(refName, "sha-") {
+			cmd = versioncontrol.GitCloneFullDepth
+		} else {
+			args["refname"] = refName
+		}
 	}
 
 	if err := cmd.Invoke(".", args); err != nil {
-		return err
+		return fmt.Errorf("error invoking git clone: %w", err)
 	}
 
 	if len(refName) > 0 && strings.HasPrefix(refName, "sha-") {
-		checkout := exec.Command("git", "-C", targetDir, "checkout", strings.TrimPrefix(refName, "sha-"))
+		targetCommit := strings.TrimPrefix(refName, "sha-")
+		checkoutArgs := []string{"-C", targetDir, "checkout", targetCommit}
 
-		if err := checkout.Run(); err != nil {
-			return err
+		t := execute.ExecTask{
+			Command: "git",
+			Args:    checkoutArgs,
+		}
+		res, err := t.Execute(context.Background())
+		if err != nil {
+			return fmt.Errorf("error checking out ref %s: %w", targetCommit, err)
 		}
+		if res.ExitCode != 0 {
+			out := res.Stdout + " " + res.Stderr
+			return fmt.Errorf("error checking out ref %s: %s", targetCommit, out)
+		}
+
 	}
 
 	// Get the long SHA digest from the clone repository.

versioncontrol/git.go

@@ -15,6 +15,14 @@ var GitClone = &vcsCmd{
 	scheme: []string{"git", "https", "http", "git+ssh", "ssh"},
 }
 
+// GitCloneFullDepth defines the command to clone a repo into a directory with full depth
+var GitCloneFullDepth = &vcsCmd{
+	name:   "Git",
+	cmd:    "git",
+	cmds:   []string{"clone {repo} {dir} --config core.autocrlf=false"},
+	scheme: []string{"git", "https", "http", "git+ssh", "ssh"},
+}
+
 // GitClone defines the command to clone the default branch of a repo into a directory
 var GitCloneDefault = &vcsCmd{
 	name:   "Git",