fixes

Author: subhashish-devtron

pkg/git/GitBaseManager.go

@@ -134,7 +134,7 @@ func (impl *GitManagerBaseImpl) LogMergeBase(gitCtx GitContext, rootDir, from st
 	if err != nil {
 		return nil, err
 	}
-	commits, err := ProcessGitLogOutput(output)
+	commits, err := ProcessGitLogOutputForAnalytics(output)
 	if err != nil {
 		impl.logger.Errorw("error in parsing log output", "err", err, "output", output)
 		return nil, err
@@ -280,7 +280,7 @@ func (impl *GitManagerBaseImpl) FetchDiffStatBetweenCommits(gitCtx GitContext, o
 }
 
 func (impl *GitManagerBaseImpl) CreateCmdWithContext(ctx GitContext, name string, arg ...string) (*exec.Cmd, context.CancelFunc) {
-	newCtx := ctx.Context
+	newCtx := context.Background()
 	cancel := func() {}
 
 	//TODO: how to make it generic, currently works because the

pkg/git/GitCliManager.go

@@ -6,8 +6,8 @@ import (
 	"gopkg.in/src-d/go-billy.v4/osfs"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strconv"
+	"strings"
 )
 
 type GitCliManager interface {
@@ -152,27 +152,27 @@ func (impl *GitCliManagerImpl) GitShow(gitCtx GitContext, rootDir string, hash s
 	return commits[0], nil
 }
 
+func (impl *GitCliManagerImpl) GetCommitStats(gitCtx GitContext, commit GitCommit) (FileStats, error) {
+	gitCommit := commit.GetCommit()
+	fileStat, errorMsg, err := impl.FetchDiffStatBetweenCommits(gitCtx, gitCommit.Commit, "", gitCommit.CheckoutPath)
+	if err != nil {
+		impl.logger.Errorw("error in fetching fileStat of commit: ", gitCommit.Commit, "checkoutPath", gitCommit.CheckoutPath, "errorMsg", errorMsg, "err", err)
+		return nil, err
+	}
+	return getFileStat(fileStat)
+}
+
 func (impl *GitCliManagerImpl) processGitLogOutput(out string, rootDir string) ([]GitCommit, error) {
 
+	gitCommits := make([]GitCommit, 0)
 	if len(out) == 0 {
-		return make([]GitCommit, 0), nil
+		return gitCommits, nil
 	}
-
-	logOut := strconv.Quote(out)
-
-	m1 := regexp.MustCompile("devtron_delimiter")
-	logOut = m1.ReplaceAllString(logOut, `"`)
-
-	logOut = logOut[:len(logOut)-1]      // Remove the last ","
-	logOut = fmt.Sprintf("[%s]", logOut) // Add []
-
-	var gitCommitFormattedList []GitCommitFormat
-	err := json.Unmarshal([]byte(logOut), &gitCommitFormattedList)
+	gitCommitFormattedList, err := parseFormattedLogOutput(out)
 	if err != nil {
-		return nil, err
+		return gitCommits, err
 	}
 
-	gitCommits := make([]GitCommit, 0)
 	for _, formattedCommit := range gitCommitFormattedList {
 
 		cm := GitCommitBase{
@@ -189,12 +189,23 @@ func (impl *GitCliManagerImpl) processGitLogOutput(out string, rootDir string) (
 	return gitCommits, nil
 }
 
-func (impl *GitCliManagerImpl) GetCommitStats(gitCtx GitContext, commit GitCommit) (FileStats, error) {
-	gitCommit := commit.GetCommit()
-	fileStat, errorMsg, err := impl.FetchDiffStatBetweenCommits(gitCtx, gitCommit.Commit, "", gitCommit.CheckoutPath)
+func parseFormattedLogOutput(out string) ([]GitCommitFormat, error) {
+	//remove the new line character which is after each terminal comma
+	out = strings.ReplaceAll(out, "},\n", "},")
+
+	// to escape the special characters like quotes and newline characters in the commit data
+	logOut := strconv.Quote(out)
+
+	//replace the delimiter with quotes to make it parsable json
+	logOut = strings.ReplaceAll(logOut, "devtron_delimiter", `"`)
+
+	logOut = logOut[1 : len(logOut)-2]   // trim surround characters (surrounding quotes and trailing com,a)
+	logOut = fmt.Sprintf("[%s]", logOut) // Add []
+
+	var gitCommitFormattedList []GitCommitFormat
+	err := json.Unmarshal([]byte(logOut), &gitCommitFormattedList)
 	if err != nil {
-		impl.logger.Errorw("error in fetching fileStat of commit: ", gitCommit.Commit, "checkoutPath", gitCommit.CheckoutPath, "errorMsg", errorMsg, "err", err)
 		return nil, err
 	}
-	return getFileStat(fileStat)
-}
+	return gitCommitFormattedList, nil
+}

pkg/git/GitFormatter.go

@@ -3,7 +3,7 @@ package git
 import "time"
 
 // var GITFORMAT = `--pretty=format:{"commit":"%H","parent":"%P","refs":"%D","subject":"%s","body":"%b","author":{"name":"%aN","email":"%aE","date":"%ad"},"commiter":{"name":"%cN","email":"%cE","date":"%cd"}},`
-var GITFORMAT = `--pretty=format:{devtron_delimitercommitdevtron_delimiter:devtron_delimiter%Hdevtron_delimiter,devtron_delimiterparentdevtron_delimiter:devtron_delimiter%Pdevtron_delimiter,devtron_delimiterrefsdevtron_delimiter:devtron_delimiter%Ddevtron_delimiter,devtron_delimitersubjectdevtron_delimiter:devtron_delimiter%sdevtron_delimiter,devtron_delimiterbodydevtron_delimiter:devtron_delimiter%bdevtron_delimiter,devtron_delimiterauthordevtron_delimiter:{devtron_delimiternamedevtron_delimiter:devtron_delimiter%aNdevtron_delimiter,devtron_delimiteremaildevtron_delimiter:devtron_delimiter%aEdevtron_delimiter,devtron_delimiterdatedevtron_delimiter:devtron_delimiter%addevtron_delimiter},devtron_delimitercommiterdevtron_delimiter:{devtron_delimiternamedevtron_delimiter:devtron_delimiter%cNdevtron_delimiter,devtron_delimiteremaildevtron_delimiter:devtron_delimiter%cEdevtron_delimiter,devtron_delimiterdatedevtron_delimiter:devtron_delimiter%cddevtron_delimiter}},`
+var GITFORMAT = "--pretty=format:{devtron_delimitercommitdevtron_delimiter:devtron_delimiter%Hdevtron_delimiter,devtron_delimiterparentdevtron_delimiter:devtron_delimiter%Pdevtron_delimiter,devtron_delimiterrefsdevtron_delimiter:devtron_delimiter%Ddevtron_delimiter,devtron_delimitersubjectdevtron_delimiter:devtron_delimiter%sdevtron_delimiter,devtron_delimiterbodydevtron_delimiter:devtron_delimiter%bdevtron_delimiter,devtron_delimiterauthordevtron_delimiter:{devtron_delimiternamedevtron_delimiter:devtron_delimiter%aNdevtron_delimiter,devtron_delimiteremaildevtron_delimiter:devtron_delimiter%aEdevtron_delimiter,devtron_delimiterdatedevtron_delimiter:devtron_delimiter%addevtron_delimiter},devtron_delimitercommiterdevtron_delimiter:{devtron_delimiternamedevtron_delimiter:devtron_delimiter%cNdevtron_delimiter,devtron_delimiteremaildevtron_delimiter:devtron_delimiter%cEdevtron_delimiter,devtron_delimiterdatedevtron_delimiter:devtron_delimiter%cddevtron_delimiter}},"
 
 type GitPerson struct {
 	Name  string    `json:"name"`

pkg/git/RepositoryManagerAnalytics.go

@@ -2,7 +2,6 @@ package git
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"github.com/devtron-labs/git-sensor/util"
 	"gopkg.in/src-d/go-git.v4"
@@ -303,19 +302,14 @@ func (impl RepositoryManagerAnalyticsImpl) getPatchObject(gitCtx GitContext, rep
 	return patch, nil
 }
 
-func ProcessGitLogOutput(out string) ([]*Commit, error) {
+func ProcessGitLogOutputForAnalytics(out string) ([]*Commit, error) {
 	gitCommits := make([]*Commit, 0)
 	if len(out) == 0 {
 		return gitCommits, nil
 	}
-	logOut := out
-	logOut = logOut[:len(logOut)-1]      // Remove the last ","
-	logOut = fmt.Sprintf("[%s]", logOut) // Add []
-
-	var gitCommitFormattedList []GitCommitFormat
-	err := json.Unmarshal([]byte(logOut), &gitCommitFormattedList)
+	gitCommitFormattedList, err := parseFormattedLogOutput(out)
 	if err != nil {
-		return nil, err
+		return gitCommits, err
 	}
 
 	for _, formattedCommit := range gitCommitFormattedList {