Merge pull request #190 from hypnoglow/switch-to-runcommand

Replace exec.Command with runCommand

cmd/git-sync/main.go

@@ -123,6 +123,9 @@ var (
 	}, []string{"status"})
 )
 
+// initTimeout is a timeout for initialization, like git credentials setup.
+const initTimeout = time.Second * 30
+
 func init() {
 	prometheus.MustRegister(syncDuration)
 	prometheus.MustRegister(syncCount)
@@ -217,8 +220,12 @@ func main() {
 		os.Exit(1)
 	}
 
+	// This context is used only for git credentials initialization. There are no long-running operations like
+	// `git clone`, so initTimeout set to 30 seconds should be enough.
+	ctx, cancel := context.WithTimeout(context.Background(), initTimeout)
+
 	if *flUsername != "" && *flPassword != "" {
-		if err := setupGitAuth(*flUsername, *flPassword, *flRepo); err != nil {
+		if err := setupGitAuth(ctx, *flUsername, *flPassword, *flRepo); err != nil {
 			fmt.Fprintf(os.Stderr, "ERROR: can't create .netrc file: %v\n", err)
 			os.Exit(1)
 		}
@@ -232,12 +239,15 @@ func main() {
 	}
 
 	if *flCookieFile {
-		if err := setupGitCookieFile(); err != nil {
+		if err := setupGitCookieFile(ctx); err != nil {
 			fmt.Fprintf(os.Stderr, "ERROR: can't set git cookie file: %v\n", err)
 			os.Exit(1)
 		}
 	}
 
+	// The scope of the initialization context ends here, so we call cancel to release resources associated with it.
+	cancel()
+
 	if *flHTTPBind != "" {
 		ln, err := net.Listen("tcp", *flHTTPBind)
 		if err != nil {
@@ -624,25 +634,48 @@ func runCommand(ctx context.Context, cwd, command string, args ...string) (strin
 	return string(output), nil
 }
 
-func setupGitAuth(username, password, gitURL string) error {
+func runCommandWithStdin(ctx context.Context, cwd, stdin, command string, args ...string) (string, error) {
-	log.V(1).Info("setting up git credential cache")
+	log.V(5).Info("running command", "cwd", cwd, "cmd", cmdForLog(command, args...))
-	cmd := exec.Command(*flGitCmd, "config", "--global", "credential.helper", "cache")
+
-	output, err := cmd.CombinedOutput()
+	cmd := exec.CommandContext(ctx, command, args...)
-	if err != nil {
+	if cwd != "" {
-		return fmt.Errorf("error setting up git credentials %v: %s", err, string(output))
+		cmd.Dir = cwd
 	}
 
-	cmd = exec.Command(*flGitCmd, "credential", "approve")
+	in, err := cmd.StdinPipe()
-	stdin, err := cmd.StdinPipe()
 	if err != nil {
-		return err
+		return "", err
+	}
+	if _, err := io.Copy(in, bytes.NewBufferString(stdin)); err != nil {
+		return "", err
+	}
+	if err := in.Close(); err != nil {
+		return "", err
+	}
+
+	output, err := cmd.CombinedOutput()
+	if ctx.Err() == context.DeadlineExceeded {
+		return "", fmt.Errorf("command timed out: %v: %q", err, string(output))
 	}
-	creds := fmt.Sprintf("url=%v\nusername=%v\npassword=%v\n", gitURL, username, password)
-	io.Copy(stdin, bytes.NewBufferString(creds))
-	stdin.Close()
-	output, err = cmd.CombinedOutput()
 	if err != nil {
-		return fmt.Errorf("error setting up git credentials %v: %s", err, string(output))
+		return "", fmt.Errorf("error running command: %v: %q", err, string(output))
+	}
+
+	return string(output), nil
+}
+
+func setupGitAuth(ctx context.Context, username, password, gitURL string) error {
+	log.V(1).Info("setting up git credential cache")
+
+	_, err := runCommand(ctx, "", *flGitCmd, "config", "--global", "credential.helper", "cache")
+	if err != nil {
+		return fmt.Errorf("error setting up git credentials: %v", err)
+	}
+
+	creds := fmt.Sprintf("url=%v\nusername=%v\npassword=%v\n", gitURL, username, password)
+	_, err = runCommandWithStdin(ctx, "", creds, *flGitCmd, "credential", "approve")
+	if err != nil {
+		return fmt.Errorf("error setting up git credentials: %v", err)
 	}
 
 	return nil
@@ -678,7 +711,7 @@ func setupGitSSH(setupKnownHosts bool) error {
 	return nil
 }
 
-func setupGitCookieFile() error {
+func setupGitCookieFile(ctx context.Context) error {
 	log.V(1).Info("configuring git cookie file")
 
 	var pathToCookieFile = "/etc/git-secret/cookie_file"
@@ -688,10 +721,9 @@ func setupGitCookieFile() error {
 		return fmt.Errorf("error: could not access git cookie file: %v", err)
 	}
 
-	cmd := exec.Command(*flGitCmd, "config", "--global", "http.cookiefile", pathToCookieFile)
+	if _, err = runCommand(ctx, "",
-	output, err := cmd.CombinedOutput()
+		*flGitCmd, "config", "--global", "http.cookiefile", pathToCookieFile); err != nil {
-	if err != nil {
+		return fmt.Errorf("error configuring git cookie file: %v", err)
-		return fmt.Errorf("error configuring git cookie file %v: %s", err, string(output))
 	}
 
 	return nil