Add review changes and resolve to use maven after creating pom.xml file

Author: biswajit-patra-dev

internal/resolution/pm/maven/testdata/cmd_factory_mock.go

@@ -1,6 +1,9 @@
 package testdata
 
-import "os/exec"
+import (
+	"os/exec"
+	"runtime"
+)
 
 type CmdFactoryMock struct {
 	Err  error
@@ -12,5 +15,10 @@ func (f CmdFactoryMock) MakeDependencyTreeCmd(_ string) (*exec.Cmd, error) {
 	if len(f.Arg) == 0 {
 		f.Arg = `"MakeDependencyTreeCmd"`
 	}
+
+	if runtime.GOOS == "windows" && f.Name == "echo" {
+		return exec.Command("cmd", "/C", f.Name, f.Arg), nil
+	}
+	
 	return exec.Command(f.Name, f.Arg), f.Err
 }

internal/resolution/pm/sbt/README.md

@@ -18,7 +18,9 @@ This approach allows SBT projects to leverage the existing Maven resolution logi
 
 ## Private Dependencies
 
-Similar to Maven projects, SBT projects might use dependencies from repositories other than the default ones. The SBT `makePom` command will include these repository configurations in the generated POM file, and then the Maven resolution process will handle them as described in the Maven README.
+Similar to Maven projects, SBT projects might use dependencies from repositories other than the default ones. The
+SBT `makePom` command will include these repository configurations in the generated POM file, and then the Maven
+resolution process will handle them as described in the Maven README.
 
 ## Troubleshooting
 
@@ -46,6 +48,7 @@ debricked resolve /path/to/scala/project
 ```
 
 This will:
+
 1. Find all `build.sbt` files in the specified path
 2. Generate a POM file for each one
 3. Resolve dependencies using the Maven resolver

internal/resolution/pm/sbt/build_service.go

@@ -8,6 +8,8 @@ import (
 
 type IBuildService interface {
 	ParseBuildModules(path string) ([]string, error)
+	FindPomFile(dir string) (string, error)
+	RenamePomToXml(pomFile, destDir string) (string, error)
 }
 
 type BuildService struct{}
@@ -31,7 +33,7 @@ func (b BuildService) ParseBuildModules(path string) ([]string, error) {
 	return modules, nil
 }
 
-func FindPomFile(dir string) (string, error) {
+func (b BuildService) FindPomFile(dir string) (string, error) {
 	targetDir := filepath.Join(dir, "target")
 
 	scalaVersionDirs, err := filepath.Glob(filepath.Join(targetDir, "scala-*"))
@@ -49,7 +51,7 @@ func FindPomFile(dir string) (string, error) {
 	return "", nil
 }
 
-func RenamePomToXml(pomFile, destDir string) (string, error) {
+func (b BuildService) RenamePomToXml(pomFile, destDir string) (string, error) {
 	content, err := os.ReadFile(pomFile)
 	if err != nil {
 		return "", err

internal/resolution/pm/sbt/build_service_test.go

@@ -74,7 +74,8 @@ func TestFindPomFile(t *testing.T) {
 		t.Fatalf("Failed to create pom file: %v", err)
 	}
 
-	foundPom, err := FindPomFile(tempDir)
+	b := BuildService{}
+	foundPom, err := b.FindPomFile(tempDir)
 
 	assert.Nil(t, err)
 	assert.Equal(t, pomPath, foundPom)
@@ -87,7 +88,8 @@ func TestFindPomFileNoTarget(t *testing.T) {
 	}
 	defer os.RemoveAll(tempDir)
 
-	foundPom, err := FindPomFile(tempDir)
+	b := BuildService{}
+	foundPom, err := b.FindPomFile(tempDir)
 
 	assert.Nil(t, err)
 	assert.Empty(t, foundPom)
@@ -107,7 +109,8 @@ func TestRenamePomToXml(t *testing.T) {
 		t.Fatalf("Failed to create pom file: %v", err)
 	}
 
-	xmlPath, err := RenamePomToXml(pomPath, tempDir)
+	b := BuildService{}
+	xmlPath, err := b.RenamePomToXml(pomPath, tempDir)
 
 	assert.Nil(t, err)
 	assert.Equal(t, filepath.Join(tempDir, "pom.xml"), xmlPath)

internal/resolution/pm/sbt/job.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/debricked/cli/internal/resolution/job"
+	"github.com/debricked/cli/internal/resolution/pm/maven"
 	"github.com/debricked/cli/internal/resolution/pm/util"
 )
 
@@ -20,50 +21,80 @@ const (
 
 type Job struct {
 	job.BaseJob
-	cmdFactory   ICmdFactory
-	buildService IBuildService
+	cmdFactory      ICmdFactory
+	buildService    IBuildService
+	mavenPomService maven.IPomService
+	mavenCmdFactory maven.ICmdFactory
 }
 
-func NewJob(file string, cmdFactory ICmdFactory, buildService IBuildService) *Job {
+func NewJob(file string, cmdFactory ICmdFactory, buildService IBuildService, mavenPomService maven.IPomService, mavenCmdFactory maven.ICmdFactory) *Job {
 	return &Job{
-		BaseJob:      job.NewBaseJob(file),
-		cmdFactory:   cmdFactory,
-		buildService: buildService,
+		BaseJob:         job.NewBaseJob(file),
+		cmdFactory:      cmdFactory,
+		buildService:    buildService,
+		mavenPomService: mavenPomService,
+		mavenCmdFactory: mavenCmdFactory,
 	}
 }
 
 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()
@@ -75,14 +106,21 @@ 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 := FindPomFile(workingDirectory)
+	pomFile, err := j.buildService.FindPomFile(workingDirectory)
 	if err != nil || pomFile == "" {
 		errorMsg := "No pom file found in target directory"
 		if err != nil {
@@ -91,27 +129,100 @@ 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 := RenamePomToXml(pomFile, workingDirectory)
+	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 = 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)
+	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 err
+	}
+
+	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)
+	if err != nil {
+		j.handleError(util.NewPMJobError(err.Error()))
+
+		return err
+	}
+
+	output, err := cmd.Output()
+	if err != nil {
+		errContent := err.Error()
+		if output != nil {
+			errContent = string(output)
+		}
+
+		cmdErr := util.NewPMJobError(errContent)
+		cmdErr.SetStatus(status)
+		j.handleError(cmdErr)
+
+		return err
+	}
+
+	return nil
 }
 
 func (j *Job) handleError(cmdError job.IError) {