common function to build error message using cli output and err

Author: ayu-devtron

pkg/RepoManages.go

@@ -25,6 +25,7 @@ import (
 	"github.com/devtron-labs/git-sensor/internals/sql"
 	"github.com/devtron-labs/git-sensor/internals/util"
 	"github.com/devtron-labs/git-sensor/pkg/git"
+	util2 "github.com/devtron-labs/git-sensor/util"
 	_ "github.com/robfig/cron/v3"
 	"go.uber.org/zap"
 	"strings"
@@ -209,11 +210,7 @@ func (impl RepoManagerImpl) updatePipelineMaterialCommit(gitCtx git.GitContext,
 			return gitCtx.Err()
 		} else if err != nil {
 			pipelineMaterial.Errored = true
-			if errMsg != "" {
-				pipelineMaterial.ErrorMsg = errMsg
-			} else {
-				pipelineMaterial.ErrorMsg = err.Error()
-			}
+			pipelineMaterial.ErrorMsg = util2.BuildDisplayErrorMessage(errMsg, err)
 			pipelineMaterial.LastSeenHash = ""
 		} else {
 			impl.logger.Infow("commits found", "commit", commits)
@@ -377,11 +374,7 @@ func (impl RepoManagerImpl) checkoutMaterial(gitCtx git.GitContext, material *sq
 	} else if err != nil {
 		material.CheckoutStatus = false
 		material.CheckoutMsgAny = err.Error()
-		if errMsg != "" {
-			material.FetchErrorMessage = errMsg
-		} else {
-			material.FetchErrorMessage = err.Error()
-		}
+		material.FetchErrorMessage = util2.BuildDisplayErrorMessage(errMsg, err)
 	} else {
 		material.CheckoutLocation = checkoutLocationForFetching
 		material.CheckoutStatus = true
@@ -683,11 +676,7 @@ func (impl RepoManagerImpl) GetLatestCommitForBranch(gitCtx git.GitContext, pipe
 	if err != nil {
 		gitMaterial.CheckoutStatus = false
 		gitMaterial.CheckoutMsgAny = err.Error()
-		if errMsg != "" {
-			gitMaterial.FetchErrorMessage = errMsg
-		} else {
-			gitMaterial.FetchErrorMessage = err.Error()
-		}
+		gitMaterial.FetchErrorMessage = util2.BuildDisplayErrorMessage(errMsg, err)
 
 		impl.logger.Errorw("error in fetching the repository ", "gitMaterial", gitMaterial, "err", err)
 		return nil, err

pkg/git/Watcher.go

@@ -28,6 +28,7 @@ import (
 	"github.com/devtron-labs/git-sensor/internals"
 	"github.com/devtron-labs/git-sensor/internals/middleware"
 	"github.com/devtron-labs/git-sensor/internals/sql"
+	util2 "github.com/devtron-labs/git-sensor/util"
 	"github.com/gammazero/workerpool"
 	"github.com/robfig/cron/v3"
 	"go.uber.org/zap"
@@ -172,11 +173,7 @@ func (impl GitWatcherImpl) pollAndUpdateGitMaterial(materialReq *sql.GitMaterial
 	material.FetchStatus = err == nil
 	if err != nil {
 		material.LastFetchErrorCount = material.LastFetchErrorCount + 1
-		if errMsg != "" {
-			material.FetchErrorMessage = errMsg
-		} else {
-			material.FetchErrorMessage = err.Error()
-		}
+		material.FetchErrorMessage = util2.BuildDisplayErrorMessage(errMsg, err)
 	} else {
 		material.LastFetchErrorCount = 0
 		material.FetchErrorMessage = ""
@@ -256,11 +253,7 @@ func (impl GitWatcherImpl) pollGitMaterialAndNotify(material *sql.GitMaterial) (
 		commits, errMsg, err := impl.repositoryManager.ChangesSinceByRepository(gitCtx, repo, material.Value, lastSeenHash, "", fetchCount, checkoutLocation, false)
 		if err != nil {
 			material.Errored = true
-			if errMsg != "" {
-				material.ErrorMsg = errMsg
-			} else {
-				material.ErrorMsg = err.Error()
-			}
+			material.ErrorMsg = util2.BuildDisplayErrorMessage(errMsg, err)
 
 			erroredMaterialsModels = append(erroredMaterialsModels, material)
 		} else if len(commits) > 0 {

util/ErrorUtil.go

@@ -25,6 +25,19 @@ func IsErrNoRows(err error) bool {
 	return pg.ErrNoRows == err
 }
 
+func BuildDisplayErrorMessage(cliMessage string, err error) string {
+	customErrorMessage := GetErrMsgFromCliMessage(cliMessage, err)
+	if customErrorMessage != "" {
+		return customErrorMessage
+	} else {
+		if cliMessage != "" {
+			return cliMessage
+		} else {
+			return err.Error()
+		}
+	}
+}
+
 // This function returns custom error message. If cliMessage is empty then it checks same handling in err.Error()
 func GetErrMsgFromCliMessage(cliMessage string, err error) string {
 	errMsg := strings.TrimSpace(cliMessage)