Hide log messages behind FAAS_DEBUG=1

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

Author: alexellis

commands/fetch_templates.go

@@ -84,15 +84,24 @@ func fetchTemplates(templateURL, refName, templateName string, overwriteTemplate
 		}
 	}
 
-	task := execute.ExecTask{
-		Command: "git",
-		Args:    []string{"-C", extractedPath, "log", "-1"},
-	}
-	res, err := task.Execute(context.Background())
-	if err != nil {
-		return fmt.Errorf("error getting git log: %w", err)
+	if os.Getenv("FAAS_DEBUG") == "1" {
+		task := execute.ExecTask{
+			Command: "git",
+			Args:    []string{"-C", extractedPath, "log", "-1", "--oneline"},
+		}
+
+		res, err := task.Execute(context.Background())
+		if err != nil {
+			return fmt.Errorf("error executing git log: %w", err)
+		}
+		if res.ExitCode != 0 {
+			e := fmt.Errorf("exit code: %d, stderr: %s, stdout: %s", res.ExitCode, res.Stderr, res.Stdout)
+			return fmt.Errorf("error from: git log: %w", e)
+		}
+
+		log.Printf("[git] log: %s", strings.TrimSpace(res.Stdout))
 	}
-	log.Printf("Git log: %s", res.Stdout)
+
 	// Get the long SHA digest from the clone repository.
 	sha, err := versioncontrol.GetGitSHAFor(extractedPath, false)
 	if err != nil {
@@ -254,7 +263,6 @@ func pullTemplate(repository, templateName string, overwriteTemplates bool) erro
 	}
 
 	repository, refName := versioncontrol.ParsePinnedRemote(repository)
-
 	isShaRefName := strings.HasPrefix(refName, "sha-")
 	if refName != "" && !isShaRefName {
 		err := versioncontrol.GitCheckRefName.Invoke("", map[string]string{"refname": refName})

versioncontrol/core.go

@@ -49,7 +49,10 @@ func (v *vcsCmd) run(dir string, cmdline string, keyval map[string]string, verbo
 		return nil, err
 	}
 
-	log.Printf("[git] Running command: %s %s", v.cmd, strings.Join(args, " "))
+	if os.Getenv("FAAS_DEBUG") == "1" {
+		log.Printf("[git] %s %s", v.cmd, strings.Join(args, " "))
+	}
+
 	cmd := exec.Command(v.cmd, args...)
 	cmd.Dir = dir
 	cmd.Env = envWithPWD(cmd.Dir)