Clean up output, implement timeout, do not update the whole index when deploying a branch

g10k.go

@@ -158,10 +158,11 @@ type ForgeResult struct {
 	fileSize      int64
 }
 
-// ExecResult contains the exit code and output of an external command (e.g. git)
+// ExecResult contains the exit code, output of an external command (e.g. git), and the error (if any)
 type ExecResult struct {
 	returnCode int
 	output     string
+	err        error
 }
 
 func init() {

git.go

@@ -78,7 +78,7 @@ func resolveGitRepositories(uniqueGitModules map[string]GitModule) {
 			repoDir := strings.Replace(strings.Replace(url, "/", "_", -1), ":", "-", -1)
 			workDir := config.ModulesCacheDir + repoDir
 
-			doMirrorOrUpdate(url, workDir, privateKey, gm.ignoreUnreachable, 1)
+			doMirrorOrUpdate(url, workDir, privateKey, "", gm.ignoreUnreachable, 1)
 			//	doCloneOrPull(source, workDir, targetDir, sa.Remote, branch, sa.PrivateKey)
 		}(url, privateKey, gm, bar)
 		done <- true
@@ -89,16 +89,20 @@ func resolveGitRepositories(uniqueGitModules map[string]GitModule) {
 	wg.Wait()
 }
 
-func doMirrorOrUpdate(url string, workDir string, sshPrivateKey string, allowFail bool, retryCount int) bool {
+func doMirrorOrUpdate(url string, workDir string, sshPrivateKey string, envBranch string, allowFail bool, retryCount int) bool {
 	needSSHKey := true
 	if strings.Contains(url, "github.com") || len(sshPrivateKey) == 0 {
 		needSSHKey = false
 	}
 
 	er := ExecResult{}
-	gitCmd := "git clone --mirror " + url + " " + workDir
+	gitCmd := fmt.Sprintf(`git clone --mirror %s %s && git --git-dir %s remote update --prune`, url, workDir, workDir)
 	if isDir(workDir) {
-		gitCmd = "git --git-dir " + workDir + " remote update --prune"
+		if envBranch == "" {
+			gitCmd = "git --git-dir " + workDir + " remote update --prune"
+		} else {
+			gitCmd = "git --git-dir " + workDir + " fetch --force origin " + envBranch + ":" + envBranch
+		}
 	}
 
 	if needSSHKey {
@@ -114,7 +118,7 @@ func doMirrorOrUpdate(url string, workDir string, sshPrivateKey string, allowFai
 		} else if config.RetryGitCommands && retryCount > 0 {
 			Warnf("WARN: git command failed: " + gitCmd + " deleting local cached repository and retrying...")
 			purgeDir(workDir, "doMirrorOrUpdate, because git command failed, retrying")
-			return doMirrorOrUpdate(url, workDir, sshPrivateKey, false, retryCount-1)
+			return doMirrorOrUpdate(url, workDir, sshPrivateKey, envBranch, false, retryCount-1)
 		}
 		Warnf("WARN: git repository " + url + " does not exist or is unreachable at this moment!")
 		return false

helper.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"crypto/sha256"
 	"fmt"
 	"io"
@@ -165,7 +166,6 @@ func purgeDir(dir string, callingFunction string) {
 }
 
 func executeCommand(command string, timeout int, allowFail bool) ExecResult {
-	Debugf("Executing " + command)
 	parts := strings.SplitN(command, " ", 2)
 	cmd := parts[0]
 	cmdArgs := []string{}
@@ -178,10 +178,26 @@ func executeCommand(command string, timeout int, allowFail bool) ExecResult {
 		}
 	}
 
+	var ctx context.Context
+	var cancel context.CancelFunc
+	if timeout > 0 {
+		ctx, cancel = context.WithTimeout(context.Background(), time.Duration(timeout)*time.Second)
+		defer cancel()
+	} else {
+		ctx = context.Background()
+	}
+
 	before := time.Now()
-	out, err := exec.Command(cmd, cmdArgs...).CombinedOutput()
+	out, err := exec.CommandContext(ctx, cmd, cmdArgs...).CombinedOutput()
 	duration := time.Since(before).Seconds()
-	er := ExecResult{0, string(out)}
+
+	var errmsg string
+	if err != nil {
+		errmsg = err.Error()
+	}
+	Debugf("Executing " + command + " gave output: " + string(out) + ", and error: " + errmsg)
+
+	er := ExecResult{0, string(out), err}
 	if msg, ok := err.(*exec.ExitError); ok { // there is error code
 		er.returnCode = msg.Sys().(syscall.WaitStatus).ExitStatus()
 	}
@@ -200,7 +216,6 @@ func executeCommand(command string, timeout int, allowFail bool) ExecResult {
 			}
 		} else {
 			er.returnCode = 1
-			er.output = fmt.Sprint(err)
 		}
 	}
 	return er

puppetfile.go

@@ -52,7 +52,7 @@ func resolvePuppetEnvironment(envBranch string, tags bool, outputNameTag string)
 			// check if sa.Basedir exists
 			checkDirAndCreate(sa.Basedir, "basedir")
 
-			if success := doMirrorOrUpdate(sa.Remote, workDir, sa.PrivateKey, true, 1); success {
+			if success := doMirrorOrUpdate(sa.Remote, workDir, sa.PrivateKey, envBranch, true, 1); success {
 
 				// get all branches
 				er := executeCommand("git --git-dir "+workDir+" branch", config.Timeout, false)