Lint issue newline before return fixed

re write the job run logic for sbt

File permission logic changes

Test case updated as for logic update for sbt job run()

Author: biswajit-patra-dev

internal/resolution/pm/sbt/job.go

@@ -38,36 +38,63 @@ func NewJob(file string, cmdFactory ICmdFactory, buildService IBuildService, mav
 }
 
 func (j *Job) Run() {
+	if err := j.parseBuildFile(); err != nil {
+		return
+	}
+
+	if err := j.generatePomFile(); err != nil {
+		return
+	}
+
+	pomFile, err := j.locatePomFile()
+	if err != nil {
+		return
+	}
+
+	pomXml, err := j.convertToPomXml(pomFile)
+	if err != nil {
+		return
+	}
+
+	if err := j.parseAndProcessWithMaven(pomXml); err != nil {
+		return
+	}
+}
+
+func (j *Job) parseBuildFile() error {
 	status := "parsing SBT build file"
 	j.SendStatus(status)
 
 	file := j.GetFile()
 	_, err := j.buildService.ParseBuildModules(file)
 	if err != nil {
 		doc := err.Error()
-
 		if doc == "EOF" {
 			doc = "This file doesn't contain valid SBT build content"
 		}
 
 		parsingError := util.NewPMJobError(err.Error())
 		parsingError.SetStatus(status)
 		parsingError.SetDocumentation(doc)
-
 		j.Errors().Critical(parsingError)
 
-		return
+		return err
 	}
 
+	return nil
+}
+
+func (j *Job) generatePomFile() error {
+	file := j.GetFile()
 	workingDirectory := filepath.Dir(filepath.Clean(file))
 	cmd, err := j.cmdFactory.MakePomCmd(workingDirectory)
 	if err != nil {
 		j.handleError(util.NewPMJobError(err.Error()))
 
-		return
+		return err
 	}
 
-	status = "generating Maven POM file"
+	status := "generating Maven POM file"
 	j.SendStatus(status)
 
 	output, err := cmd.CombinedOutput()
@@ -79,11 +106,18 @@ func (j *Job) Run() {
 
 		cmdErr := util.NewPMJobError(errContent)
 		cmdErr.SetStatus(status)
-
 		j.handleError(cmdErr)
+
+		return err
 	}
 
-	status = "locating generated POM file"
+	return nil
+}
+
+func (j *Job) locatePomFile() (string, error) {
+	file := j.GetFile()
+	workingDirectory := filepath.Dir(filepath.Clean(file))
+	status := "locating generated POM file"
 	j.SendStatus(status)
 
 	pomFile, err := j.buildService.FindPomFile(workingDirectory)
@@ -95,56 +129,86 @@ func (j *Job) Run() {
 
 		cmdErr := util.NewPMJobError(errorMsg)
 		cmdErr.SetStatus(status)
-
 		j.handleError(cmdErr)
 
-		return
+		return "", err
 	}
 
-	status = "converting POM file to pom.xml"
+	return pomFile, nil
+}
+
+func (j *Job) convertToPomXml(pomFile string) (string, error) {
+	file := j.GetFile()
+	workingDirectory := filepath.Dir(filepath.Clean(file))
+	status := "converting POM file to pom.xml"
 	j.SendStatus(status)
 
 	pomXml, err := j.buildService.RenamePomToXml(pomFile, workingDirectory)
 	if err != nil {
 		cmdErr := util.NewPMJobError(err.Error())
 		cmdErr.SetStatus(status)
-
 		j.handleError(cmdErr)
 
-		return
+		return "", err
+	}
+
+	return pomXml, nil
+}
+
+func (j *Job) parseAndProcessWithMaven(pomXml string) error {
+	status := "parsing Maven POM file"
+	j.SendStatus(status)
+
+	if err := j.parseMavenPom(pomXml); err != nil {
+		return err
+	}
+
+	file := j.GetFile()
+	workingDirectory := filepath.Dir(filepath.Clean(file))
+	if err := j.createMavenDependencyGraph(workingDirectory, pomXml); err != nil {
+		return err
 	}
 
-	status = "parsing Maven POM file"
+	status = fmt.Sprintf("processing dependencies with Maven resolver using %s", pomXml)
+	j.SendStatus(status)
+
+	return nil
+}
+
+func (j *Job) parseMavenPom(pomXml string) error {
+	status := "parsing Maven POM file"
 	j.SendStatus(status)
 
-	_, err = j.mavenPomService.ParsePomModules(pomXml)
+	_, err := j.mavenPomService.ParsePomModules(pomXml)
 	if err != nil {
 		doc := err.Error()
-
 		if doc == "EOF" {
 			doc = "This file doesn't contain valid XML"
 		}
 
 		parsingError := util.NewPMJobError(err.Error())
 		parsingError.SetStatus(status)
 		parsingError.SetDocumentation(doc)
-
 		j.Errors().Critical(parsingError)
 
-		return
+		return err
 	}
 
-	status = "creating Maven dependency graph"
+	return nil
+}
+
+func (j *Job) createMavenDependencyGraph(workingDirectory string, pomXml string) error {
+	status := "creating Maven dependency graph"
 	j.SendStatus(status)
 
-	cmd, err = j.mavenCmdFactory.MakeDependencyTreeCmd(workingDirectory)
+	cmd, err := j.mavenCmdFactory.MakeDependencyTreeCmd(workingDirectory)
 	if err != nil {
 		j.handleError(util.NewPMJobError(err.Error()))
 
-		return
+		return err
 	}
 
-	output, err = cmd.Output()
+	output, err := cmd.Output()
 	if err != nil {
 		errContent := err.Error()
 		if output != nil {
@@ -153,14 +217,12 @@ func (j *Job) Run() {
 
 		cmdErr := util.NewPMJobError(errContent)
 		cmdErr.SetStatus(status)
-
 		j.handleError(cmdErr)
 
-		return
+		return err
 	}
 
-	status = fmt.Sprintf("processing dependencies with Maven resolver using %s", pomXml)
-	j.SendStatus(status)
+	return nil
 }
 
 func (j *Job) handleError(cmdError job.IError) {

internal/resolution/pm/sbt/job_test.go

@@ -106,7 +106,7 @@ func TestRunCmdOutputErr(t *testing.T) {
 	assert.True(t, error.HasError())
 
 	allErrors := error.GetAll()
-	assert.Len(t, allErrors, 2)
+	assert.Len(t, allErrors, 1)
 	assert.Contains(t, allErrors[0].Error(), "executable file not found")
 }
 
@@ -124,10 +124,9 @@ func TestRunCmdOutputErrNoOutput(t *testing.T) {
 	j.Run()
 
 	errs := j.Errors().GetAll()
-	assert.Len(t, errs, 2)
+	assert.Len(t, errs, 1)
 
 	assert.Contains(t, errs[0].Error(), "unknown command")
-	assert.Contains(t, errs[1].Error(), "exec: no command")
 }
 
 func TestRun(t *testing.T) {
@@ -140,15 +139,15 @@ lazy val core = project("core-module")
 lazy val api = project("api-module")
 lazy val util = project("util-module")
 `
-	err := os.WriteFile(buildSbtPath, []byte(buildSbtContent), 0644)
+	err := os.WriteFile(buildSbtPath, []byte(buildSbtContent), 0600)
 	assert.NoError(t, err)
 
 	targetDir := filepath.Join(tempDir, "target", "scala-3.6.4")
 	err = os.MkdirAll(targetDir, 0755)
 	assert.NoError(t, err)
 
 	pomFilePath := filepath.Join(targetDir, "project.pom")
-	err = os.WriteFile(pomFilePath, []byte("<project></project>"), 0644)
+	err = os.WriteFile(pomFilePath, []byte("<project></project>"), 0600)
 	assert.NoError(t, err)
 
 	// Create the job with the test file and explicit command