code improv to propagae cli output

Author: ayu-devtron

pkg/RepoManages.go

@@ -200,7 +200,7 @@ func (impl RepoManagerImpl) updatePipelineMaterialCommit(gitCtx git.GitContext,
 
 		fetchCount := impl.configuration.GitHistoryCount
 		var repository *git.GitRepository
-		commits, err := impl.repositoryManager.ChangesSinceByRepository(gitCtx, repository, pipelineMaterial.Value, "", "", fetchCount, material.CheckoutLocation, true)
+		commits, _, _, err := impl.repositoryManager.ChangesSinceByRepository(gitCtx, repository, pipelineMaterial.Value, "", "", fetchCount, material.CheckoutLocation, true)
 		//commits, err := impl.FetchChanges(pipelineMaterial.Id, "", "", 0)
 		if err == nil {
 			impl.logger.Infow("commits found", "commit", commits)
@@ -670,7 +670,7 @@ func (impl RepoManagerImpl) GetLatestCommitForBranch(gitCtx git.GitContext, pipe
 		return nil, err
 	}
 
-	commits, err := impl.repositoryManager.ChangesSinceByRepository(gitCtx, repo, branchName, "", "", 1, gitMaterial.CheckoutLocation, false)
+	commits, _, _, err := impl.repositoryManager.ChangesSinceByRepository(gitCtx, repo, branchName, "", "", 1, gitMaterial.CheckoutLocation, false)
 
 	if commits == nil {
 		return nil, err
@@ -720,9 +720,9 @@ func (impl RepoManagerImpl) GetCommitMetadataForPipelineMaterial(gitCtx git.GitC
 		impl.locker.ReturnLocker(gitMaterial.Id)
 	}()
 	var repository *git.GitRepository
-	commits, err := impl.repositoryManager.ChangesSinceByRepository(gitCtx, repository, branchName, "", gitHash, 1, gitMaterial.CheckoutLocation, true)
+	commits, cliOutput, _, err := impl.repositoryManager.ChangesSinceByRepository(gitCtx, repository, branchName, "", gitHash, 1, gitMaterial.CheckoutLocation, true)
 	if err != nil {
-		if strings.Contains(err.Error(), git.NO_COMMIT_CUSTOM_ERROR_MESSAGE) {
+		if strings.Contains(cliOutput, git.NO_COMMIT_CUSTOM_ERROR_MESSAGE) {
 			impl.logger.Warnw("No commit found for given hash", "hash", gitHash, "branchName", branchName)
 			return nil, nil
 		}

pkg/git/GitBaseManager.go

@@ -36,7 +36,7 @@ type GitManager interface {
 	// GetCommitStats retrieves the stats for the given commit vs its parent
 	GetCommitStats(gitCtx GitContext, commit GitCommit, checkoutPath string) (FileStats, error)
 	// GetCommitIterator returns an iterator for the provided git repo and iterator request describing the commits to fetch
-	GetCommitIterator(gitCtx GitContext, repository *GitRepository, iteratorRequest IteratorRequest) (CommitIterator, error)
+	GetCommitIterator(gitCtx GitContext, repository *GitRepository, iteratorRequest IteratorRequest) (commitIterator CommitIterator, cliOutput string, errMsg string, err error)
 	// GetCommitForHash retrieves the commit reference for given tag
 	GetCommitForHash(gitCtx GitContext, checkoutPath, commitHash string) (GitCommit, error)
 	// GetCommitsForTag retrieves the commit reference for given tag

pkg/git/GitCliManager.go

@@ -17,7 +17,6 @@
 package git
 
 import (
-	"errors"
 	"go.uber.org/zap"
 	"gopkg.in/src-d/go-billy.v4/osfs"
 	"os"
@@ -80,16 +79,16 @@ func (impl *GitCliManagerImpl) GetCommitForHash(gitCtx GitContext, checkoutPath,
 
 	return impl.GitShow(gitCtx, checkoutPath, commitHash)
 }
-func (impl *GitCliManagerImpl) GetCommitIterator(gitCtx GitContext, repository *GitRepository, iteratorRequest IteratorRequest) (CommitIterator, error) {
+func (impl *GitCliManagerImpl) GetCommitIterator(gitCtx GitContext, repository *GitRepository, iteratorRequest IteratorRequest) (commitIterator CommitIterator, cliOutput string, errMsg string, err error) {
 
-	commits, err := impl.GetCommits(gitCtx, iteratorRequest.BranchRef, iteratorRequest.Branch, repository.rootDir, iteratorRequest.CommitCount, iteratorRequest.FromCommitHash, iteratorRequest.ToCommitHash)
+	commits, cliOutput, errMsg, err := impl.GetCommits(gitCtx, iteratorRequest.BranchRef, iteratorRequest.Branch, repository.rootDir, iteratorRequest.CommitCount, iteratorRequest.FromCommitHash, iteratorRequest.ToCommitHash)
 	if err != nil {
 		impl.logger.Errorw("error in fetching commits for", "err", err, "path", repository.rootDir)
-		return nil, err
+		return nil, cliOutput, errMsg, err
 	}
 	return &CommitCliIterator{
 		commits: commits,
-	}, nil
+	}, "", "", nil
 }
 
 func openGitRepo(path string) error {
@@ -117,25 +116,22 @@ func (impl *GitCliManagerImpl) GitCreateRemote(gitCtx GitContext, rootDir string
 	return err
 }
 
-func (impl *GitCliManagerImpl) GetCommits(gitCtx GitContext, branchRef string, branch string, rootDir string, numCommits int, from string, to string) ([]GitCommit, error) {
+func (impl *GitCliManagerImpl) GetCommits(gitCtx GitContext, branchRef string, branch string, rootDir string, numCommits int, from string, to string) (commits []GitCommit, cliOutput string, errMsg string, err error) {
 	baseCmdArgs := []string{"-C", rootDir, "log"}
 	rangeCmdArgs := []string{branchRef}
 	extraCmdArgs := []string{"-n", strconv.Itoa(numCommits), "--date=iso-strict", GITFORMAT}
 	cmdArgs := impl.getCommandForLogRange(branchRef, from, to, rangeCmdArgs, baseCmdArgs, extraCmdArgs)
 	impl.logger.Debugw("git", cmdArgs)
-	output, errMsg, err := impl.GitManagerBase.ExecuteCustomCommand(gitCtx, "git", cmdArgs...)
-	impl.logger.Debugw("root", rootDir, "opt", output, "errMsg", errMsg, "error", err)
+	cliOutput, errMsg, err = impl.GitManagerBase.ExecuteCustomCommand(gitCtx, "git", cmdArgs...)
+	impl.logger.Debugw("root", rootDir, "cliOutput", cliOutput, "errMsg", errMsg, "error", err)
 	if err != nil {
-		if strings.Contains(output, NO_COMMIT_GIT_ERROR_MESSAGE) {
-			return nil, errors.New(NO_COMMIT_CUSTOM_ERROR_MESSAGE)
-		}
-		return nil, err
+		return nil, cliOutput, errMsg, err
 	}
-	commits, err := impl.processGitLogOutput(output)
+	commits, err = impl.processGitLogOutput(cliOutput)
 	if err != nil {
-		return nil, err
+		return nil, "", "", err
 	}
-	return commits, nil
+	return commits, "", "", nil
 }
 
 func (impl *GitCliManagerImpl) getCommandForLogRange(branchRef string, from string, to string, rangeCmdArgs []string, baseCmdArgs []string, extraCmdArgs []string) []string {

pkg/git/GoGitSDKManager.go

@@ -94,19 +94,19 @@ func (impl *GoGitSDKManagerImpl) GetCommitForHash(gitCtx GitContext, checkoutPat
 	return gitCommit, nil
 }
 
-func (impl *GoGitSDKManagerImpl) GetCommitIterator(gitCtx GitContext, repository *GitRepository, iteratorRequest IteratorRequest) (CommitIterator, error) {
+func (impl *GoGitSDKManagerImpl) GetCommitIterator(gitCtx GitContext, repository *GitRepository, iteratorRequest IteratorRequest) (commitIterator CommitIterator, cliOutput string, errMsg string, err error) {
 
 	ref, err := repository.Reference(plumbing.ReferenceName(iteratorRequest.BranchRef), true)
 	if err != nil && err == plumbing.ErrReferenceNotFound {
-		return nil, fmt.Errorf("ref not found %s branch  %s", err, iteratorRequest.Branch)
+		return nil, "", "", fmt.Errorf("ref not found %s branch  %s", err, iteratorRequest.Branch)
 	} else if err != nil {
-		return nil, fmt.Errorf("error in getting reference %s branch  %s", err, iteratorRequest.Branch)
+		return nil, "", "", fmt.Errorf("error in getting reference %s branch  %s", err, iteratorRequest.Branch)
 	}
 	itr, err := repository.Log(&git.LogOptions{From: ref.Hash()})
 	if err != nil {
-		return nil, fmt.Errorf("error in getting iterator %s branch  %s", err, iteratorRequest.Branch)
+		return nil, "", "", fmt.Errorf("error in getting iterator %s branch  %s", err, iteratorRequest.Branch)
 	}
-	return &CommitGoGitIterator{itr}, nil
+	return &CommitGoGitIterator{itr}, "", "", nil
 }
 
 func (impl *GoGitSDKManagerImpl) OpenRepoPlain(checkoutPath string) (*GitRepository, error) {

pkg/git/RepositoryManager.go

@@ -49,7 +49,7 @@ type RepositoryManager interface {
 	// Clean cleans a directory
 	Clean(cloneDir string) error
 	// ChangesSinceByRepository returns the latest commits list for the given range and count for an existing repo
-	ChangesSinceByRepository(gitCtx GitContext, repository *GitRepository, branch string, from string, to string, count int, checkoutPath string, openNewGitRepo bool) ([]*GitCommitBase, error)
+	ChangesSinceByRepository(gitCtx GitContext, repository *GitRepository, branch string, from string, to string, count int, checkoutPath string, openNewGitRepo bool) (gitCommits []*GitCommitBase, cliOutput string, errMsg string, err error)
 	// GetCommitMetadata retrieves the commit metadata for given hash
 	GetCommitMetadata(gitCtx GitContext, checkoutPath, commitHash string) (*GitCommitBase, error)
 	// GetCommitForTag retrieves the commit metadata for given tag
@@ -238,20 +238,19 @@ func (impl *RepositoryManagerImpl) GetCommitMetadata(gitCtx GitContext, checkout
 
 // from -> old commit
 // to -> new commit
-func (impl *RepositoryManagerImpl) ChangesSinceByRepository(gitCtx GitContext, repository *GitRepository, branch string, from string, to string, count int, checkoutPath string, openNewGitRepo bool) ([]*GitCommitBase, error) {
+func (impl *RepositoryManagerImpl) ChangesSinceByRepository(gitCtx GitContext, repository *GitRepository, branch string, from string, to string, count int, checkoutPath string, openNewGitRepo bool) (gitCommits []*GitCommitBase, cliOutput string, errMsg string, err error) {
 	// fix for azure devops (manual trigger webhook bases pipeline) :
 	// branch name comes as 'refs/heads/master', we need to extract actual branch name out of it.
 	// https://stackoverflow.com/questions/59956206/how-to-get-a-branch-name-with-a-slash-in-azure-devops
 
-	var err error
 	if count == 0 {
 		count = impl.configuration.GitHistoryCount
 	}
 
 	if openNewGitRepo {
 		repository, err = impl.gitManager.OpenRepoPlain(checkoutPath)
 		if err != nil {
-			return nil, err
+			return nil, "", "", err
 		}
 	}
 
@@ -260,7 +259,7 @@ func (impl *RepositoryManagerImpl) ChangesSinceByRepository(gitCtx GitContext, r
 		util.TriggerGitOperationMetrics("changesSinceByRepository", start, err)
 	}()
 	branch, branchRef := GetBranchReference(branch)
-	itr, err := impl.gitManager.GetCommitIterator(gitCtx, repository, IteratorRequest{
+	itr, cliOutput, errMsg, err := impl.gitManager.GetCommitIterator(gitCtx, repository, IteratorRequest{
 		BranchRef:      branchRef,
 		Branch:         branch,
 		CommitCount:    count,
@@ -269,9 +268,8 @@ func (impl *RepositoryManagerImpl) ChangesSinceByRepository(gitCtx GitContext, r
 	})
 	if err != nil {
 		impl.logger.Errorw("error in getting iterator", "branch", branch, "err", err)
-		return nil, err
+		return nil, cliOutput, errMsg, err
 	}
-	var gitCommits []*GitCommitBase
 	itrCounter := 0
 	commitToFind := len(to) == 0 //no commit mentioned
 	breakLoop := false
@@ -337,7 +335,7 @@ func (impl *RepositoryManagerImpl) ChangesSinceByRepository(gitCtx GitContext, r
 			}
 		}()
 	}
-	return gitCommits, err
+	return gitCommits, "", "", err
 }
 
 func (impl *RepositoryManagerImpl) TrimLastGitCommit(gitCommits []*GitCommitBase, count int) []*GitCommitBase {

pkg/git/RepositoryManagerIT_test.go

@@ -599,7 +599,7 @@ func TestRepositoryManager_ChangesSinceByRepository(t *testing.T) {
 		r, err := repositoryManagerImpl.gitManager.OpenRepoPlain(tt.payload.checkoutPath)
 		assert.Nil(t, err)
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := repositoryManagerImpl.ChangesSinceByRepository(BuildGitContext(context.Background()), r, tt.payload.branch, tt.payload.from, tt.payload.to, tt.payload.count, tt.payload.checkoutPath)
+			got, _, _, err := repositoryManagerImpl.ChangesSinceByRepository(BuildGitContext(context.Background()), r, tt.payload.branch, tt.payload.from, tt.payload.to, tt.payload.count, tt.payload.checkoutPath)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("ChangesSinceByRepository() error in %s, error = %v, wantErr %v", tt.name, err, tt.wantErr)
 				return

pkg/git/Watcher.go

@@ -248,7 +248,7 @@ func (impl GitWatcherImpl) pollGitMaterialAndNotify(material *sql.GitMaterial) e
 			lastSeenHash = material.LastSeenHash
 		}
 		fetchCount := impl.configuration.GitHistoryCount
-		commits, err := impl.repositoryManager.ChangesSinceByRepository(gitCtx, repo, material.Value, lastSeenHash, "", fetchCount, checkoutLocation, false)
+		commits, _, _, err := impl.repositoryManager.ChangesSinceByRepository(gitCtx, repo, material.Value, lastSeenHash, "", fetchCount, checkoutLocation, false)
 		if err != nil {
 			material.Errored = true
 			material.ErrorMsg = err.Error()