Improve recursive scan detection

xray/commands/audit/audit.go

@@ -87,14 +87,18 @@ func (auditCmd *AuditCommand) Run() (err error) {
 	if err != nil {
 		return
 	}
+	// If no workingDirs were provided by the user, we apply a recursive scan on the root repository
+	applyRecursiveScan := len(auditCmd.workingDirs) == 0
+
 	auditParams := NewAuditParams().
 		SetXrayGraphScanParams(auditCmd.CreateXrayGraphScanParams()).
 		SetWorkingDirs(workingDirs).
 		SetMinSeverityFilter(auditCmd.minSeverityFilter).
 		SetFixableOnly(auditCmd.fixableOnly).
 		SetGraphBasicParams(auditCmd.AuditBasicParams).
 		SetThirdPartyApplicabilityScan(auditCmd.thirdPartyApplicabilityScan).
-		SetExclusions(auditCmd.exclusions)
+		SetExclusions(auditCmd.exclusions).
+		SetApplyRecursiveScan(applyRecursiveScan)
 	auditResults, err := RunAudit(auditParams)
 	if err != nil {
 		return

xray/commands/audit/auditparams.go

@@ -16,6 +16,7 @@ type AuditParams struct {
 	xrayVersion string
 	// Include third party dependencies source code in the applicability scan.
 	thirdPartyApplicabilityScan bool
+	applyRecursiveScan          bool
 }
 
 func NewAuditParams() *AuditParams {
@@ -50,6 +51,11 @@ func (params *AuditParams) SetExclusions(exclusions []string) *AuditParams {
 	return params
 }
 
+func (params *AuditParams) SetApplyRecursiveScan(applyRecursiveScan bool) *AuditParams {
+	params.applyRecursiveScan = applyRecursiveScan
+	return params
+}
+
 func (params *AuditParams) SetXrayGraphScanParams(xrayGraphScanParams *services.XrayGraphScanParams) *AuditParams {
 	params.xrayGraphScanParams = xrayGraphScanParams
 	return params

xray/commands/audit/scarunner.go

@@ -72,10 +72,10 @@ func runScaScan(params *AuditParams, results *xrayutils.Results) (err error) {
 
 // Calculate the scans to preform
 func getScaScansToPreform(currentWorkingDir string, params *AuditParams) (scansToPreform []*xrayutils.ScaScanResult) {
-	requestedDirectories, isRecursive := getRequestedDirectoriesToScan(currentWorkingDir, params)
+	requestedDirectories := getRequestedDirectoriesToScan(currentWorkingDir, params)
 	for _, requestedDirectory := range requestedDirectories {
 		// Detect descriptors and technologies in the requested directory.
-		techToWorkingDirs, err := coreutils.DetectTechnologiesDescriptors(requestedDirectory, isRecursive, params.Technologies(), getRequestedDescriptors(params), getExcludePattern(params, isRecursive))
+		techToWorkingDirs, err := coreutils.DetectTechnologiesDescriptors(requestedDirectory, params.applyRecursiveScan, params.Technologies(), getRequestedDescriptors(params), getExcludePattern(params, params.applyRecursiveScan))
 		if err != nil {
 			log.Warn("Couldn't detect technologies in", requestedDirectory, "directory.", err.Error())
 			continue
@@ -119,15 +119,15 @@ func getExcludePattern(params *AuditParams, recursive bool) string {
 // Get the directories to scan base on the given parameters.
 // If no working directories were specified, the current working directory will be returned with recursive mode.
 // If working directories were specified, the recursive mode will be false.
-func getRequestedDirectoriesToScan(currentWorkingDir string, params *AuditParams) ([]string, bool) {
+func getRequestedDirectoriesToScan(currentWorkingDir string, params *AuditParams) []string {
 	workingDirs := datastructures.MakeSet[string]()
 	for _, wd := range params.workingDirs {
 		workingDirs.Add(wd)
 	}
 	if len(params.workingDirs) == 0 {
-		return []string{currentWorkingDir}, true
+		return []string{currentWorkingDir}
 	}
-	return workingDirs.ToSlice(), false
+	return workingDirs.ToSlice()
 }
 
 // Preform the SCA scan for the given scan information.

xray/commands/audit/scarunner_test.go

@@ -168,11 +168,10 @@ func TestGetExcludePattern(t *testing.T) {
 
 func TestGetRequestedDirectoriesToScan(t *testing.T) {
 	tests := []struct {
-		name              string
-		cwd               string
-		params            func() *AuditParams
-		expectedRecursive bool
-		expectedDirs      []string
+		name         string
+		cwd          string
+		params       func() *AuditParams
+		expectedDirs []string
 	}{
 		{
 			name: "Test specific directories",
@@ -182,23 +181,20 @@ func TestGetRequestedDirectoriesToScan(t *testing.T) {
 				param.SetWorkingDirs([]string{filepath.Join("tmp", "dir1"), filepath.Join("tmp", "dir2")})
 				return param
 			},
-			expectedRecursive: false,
-			expectedDirs:      []string{filepath.Join("tmp", "dir1"), filepath.Join("tmp", "dir2")},
+			expectedDirs: []string{filepath.Join("tmp", "dir1"), filepath.Join("tmp", "dir2")},
 		},
 		{
-			name:              "Test recursive",
-			cwd:               "tmp",
-			params:            NewAuditParams,
-			expectedRecursive: true,
-			expectedDirs:      []string{"tmp"},
+			name:         "Test recursive",
+			cwd:          "tmp",
+			params:       NewAuditParams,
+			expectedDirs: []string{"tmp"},
 		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			dirs, recursive := getRequestedDirectoriesToScan(test.cwd, test.params())
+			dirs := getRequestedDirectoriesToScan(test.cwd, test.params())
 			assert.ElementsMatch(t, test.expectedDirs, dirs)
-			assert.Equal(t, test.expectedRecursive, recursive)
 		})
 	}
 }
@@ -217,7 +213,7 @@ func TestGetScaScansToPreform(t *testing.T) {
 			name: "Test specific technologies",
 			wd:   dir,
 			params: func() *AuditParams {
-				param := NewAuditParams()
+				param := NewAuditParams().SetApplyRecursiveScan(true)
 				param.SetTechnologies([]string{"maven", "npm", "go"})
 				return param
 			},
@@ -244,9 +240,12 @@ func TestGetScaScansToPreform(t *testing.T) {
 			},
 		},
 		{
-			name:   "Test all",
-			wd:     dir,
-			params: NewAuditParams,
+			name: "Test all",
+			wd:   dir,
+			params: func() *AuditParams {
+				param := NewAuditParams().SetApplyRecursiveScan(true)
+				return param
+			},
 			expected: []*xrayutils.ScaScanResult{
 				{
 					Technology:       coreutils.Maven,