fix test and logic

Author: eranturgeman

commands/audit/sca/conan/conan.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os/exec"
+	"path/filepath"
 
 	"github.com/jfrog/gofrog/datastructures"
 	"github.com/jfrog/gofrog/io"
@@ -108,12 +109,16 @@ func calculateUniqueDependencies(nodes map[string]conanRef) []string {
 }
 
 func calculateDependencies(executablePath, workingDir string, params utils.AuditParams) (dependencyTrees []*xrayUtils.GraphNode, uniqueDeps []string, err error) {
-	graphInfo := append([]string{"info", ".", "--format=json"}, params.Args()...)
+	graphInfo := []string{"info"}
 	if params.PipRequirementsFile() != "" {
-		// We allow passing a name for the descriptor file to be used in the 'graph info' command.
+		// We allow passing a name for the descriptor file to be used in the 'graph info' command. If non has provided we execute the command on the current dir.
 		// Since this ability already exists for python we leverage this ability
-		graphInfo = append(graphInfo, "-f", params.PipRequirementsFile())
+		graphInfo = append(graphInfo, filepath.Join(workingDir, params.PipRequirementsFile()))
+	} else {
+		graphInfo = append(graphInfo, ".")
 	}
+	graphInfo = append(graphInfo, "--format=json")
+	graphInfo = append(graphInfo, params.Args()...)
 	conanGraphInfoContent, err := getConanCmd(executablePath, workingDir, "graph", graphInfo...).RunWithOutput()
 	if err != nil {
 		return

commands/audit/sca/conan/conan_test.go

@@ -43,7 +43,6 @@ func TestParseConanDependencyTree(t *testing.T) {
 	}
 }
 
-// TODO eran add a testcase with a provided descriptor name
 func TestBuildDependencyTree(t *testing.T) {
 	testcases := []struct {
 		name           string
@@ -64,8 +63,7 @@ func TestBuildDependencyTree(t *testing.T) {
 			params := &utils.AuditBasicParams{}
 			if testcase.descriptorName != "" {
 				// changing the name of the descriptor to verify the work with a non-default descriptor name
-				changeNameCmd := exec.Command("mv", "conanfile.txt", testcase.descriptorName)
-				changeNameCmd.Dir = dir
+				changeNameCmd := exec.Command("mv", filepath.Join(dir, "conanfile.txt"), filepath.Join(dir, testcase.descriptorName))
 				_, err := changeNameCmd.CombinedOutput()
 				require.NoError(t, err)
 				require.FileExists(t, filepath.Join(dir, testcase.descriptorName))