Minor improvement

Author: RobiNino

artifactory/commands/buildinfo/addgit.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/forPelevin/gomoji"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
-	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	"github.com/spf13/viper"
 )
@@ -80,15 +79,9 @@ func (config *BuildAddGitCommand) Run() error {
 	}
 
 	// Find .git if it wasn't provided in the command.
-	if config.dotGitPath == "" {
-		var exists bool
-		config.dotGitPath, exists, err = fileutils.FindUpstream(".git", fileutils.Any)
-		if err != nil {
-			return err
-		}
-		if !exists {
-			return errorutils.CheckErrorf("Could not find .git")
-		}
+	config.dotGitPath, err = utils.GetDotGit(config.dotGitPath)
+	if err != nil {
+		return err
 	}
 
 	// Collect URL, branch and revision into GitManager.
@@ -101,7 +94,7 @@ func (config *BuildAddGitCommand) Run() error {
 	// Collect issues if required.
 	var issues []buildinfo.AffectedIssue
 	if config.configFilePath != "" {
-		issues, err = config.collectBuildIssues(gitManager.GetUrl())
+		issues, err = config.collectBuildIssues()
 		if err != nil {
 			return err
 		}
@@ -159,7 +152,7 @@ func (config *BuildAddGitCommand) CommandName() string {
 	return "rt_build_add_git"
 }
 
-func (config *BuildAddGitCommand) collectBuildIssues(vcsUrl string) ([]buildinfo.AffectedIssue, error) {
+func (config *BuildAddGitCommand) collectBuildIssues() ([]buildinfo.AffectedIssue, error) {
 	log.Info("Collecting build issues from VCS...")
 
 	// Initialize issues-configuration.
@@ -178,7 +171,7 @@ func (config *BuildAddGitCommand) collectBuildIssues(vcsUrl string) ([]buildinfo
 	}
 
 	// Run issues collection.
-	gitDetails := utils.GitParsingDetails{DotGitPath: config.dotGitPath, VcsUrl: vcsUrl, LogLimit: config.issuesConfig.LogLimit, PrettyFormat: gitParsingPrettyFormat}
+	gitDetails := utils.GitParsingDetails{DotGitPath: config.dotGitPath, LogLimit: config.issuesConfig.LogLimit, PrettyFormat: gitParsingPrettyFormat}
 	err = utils.ParseGitLogsFromLastBuild(config.issuesConfig.ServerDetails, config.buildConfiguration, gitDetails, logRegExp)
 	if err != nil {
 		return nil, err

artifactory/utils/vcs.go

@@ -10,6 +10,7 @@ import (
 	artclientutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
+	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	"io"
 	"os"
@@ -62,21 +63,33 @@ func getLatestBuildInfo(serverDetails *utilsconfig.ServerDetails, buildConfigura
 }
 
 type GitParsingDetails struct {
-	DotGitPath   string
-	VcsUrl       string
 	LogLimit     int
 	PrettyFormat string
+	// Optional
+	DotGitPath string
 }
 
+// Parses git logs from the last build's VCS revision.
+// Calls git log with a custom format, and parses each line of the output with regexp. logRegExp is used to parse the log lines.
 func ParseGitLogsFromLastBuild(serverDetails *utilsconfig.ServerDetails, buildConfiguration *build.BuildConfiguration, gitDetails GitParsingDetails, logRegExp *gofrogcmd.CmdOutputPattern) error {
 	// Check that git exists in path.
 	_, err := exec.LookPath("git")
 	if err != nil {
 		return errorutils.CheckError(err)
 	}
 
+	gitDetails.DotGitPath, err = GetDotGit(gitDetails.DotGitPath)
+	if err != nil {
+		return err
+	}
+
+	vcsUrl, err := getVcsUrl(gitDetails.DotGitPath)
+	if err != nil {
+		return err
+	}
+
 	// Get latest build's VCS revision from Artifactory.
-	lastVcsRevision, err := getLatestVcsRevision(serverDetails, buildConfiguration, gitDetails.VcsUrl)
+	lastVcsRevision, err := getLatestVcsRevision(serverDetails, buildConfiguration, vcsUrl)
 	if err != nil {
 		return err
 	}
@@ -143,6 +156,30 @@ func createErrRegExpHandler(lastVcsRevision string) (*gofrogcmd.CmdOutputPattern
 	return &errRegExp, nil
 }
 
+// Looks for the .git directory in the current directory and its parents.
+func GetDotGit(providedDotGitPath string) (string, error) {
+	if providedDotGitPath != "" {
+		return providedDotGitPath, nil
+	}
+	dotGitPath, exists, err := fileutils.FindUpstream(".git", fileutils.Any)
+	if err != nil {
+		return "", err
+	}
+	if !exists {
+		return "", errorutils.CheckErrorf("Could not find .git")
+	}
+	return dotGitPath, nil
+
+}
+
+func getVcsUrl(dotGitPath string) (string, error) {
+	gitManager := clientutils.NewGitManager(dotGitPath)
+	if err := gitManager.ReadConfig(); err != nil {
+		return "", err
+	}
+	return gitManager.GetUrl(), nil
+}
+
 type LogCmd struct {
 	logLimit        int
 	lastVcsRevision string