Skip to content

Commit e0bdc35

Browse files
committed
expend excluded patterns
1 parent 93b7ef2 commit e0bdc35

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

jas/common.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,11 +408,14 @@ func GetExcludePatterns(module jfrogappsconfig.Module, scanner *jfrogappsconfig.
408408
// Adding exclusions from jfrog-apps-config IF no exclusions provided from other source (flags, env vars, config profile)
409409
excludePatterns := module.ExcludePatterns
410410
if scanner != nil {
411+
log.Debug("Using scanner exclude patterns:", strings.Join(scanner.ExcludePatterns, ","))
411412
excludePatterns = append(excludePatterns, scanner.ExcludePatterns...)
412413
}
413414
if len(excludePatterns) == 0 {
415+
log.Debug("No exclude patterns provided, using default exclude patterns", strings.Join(utils.DefaultJasExcludePatterns, ","))
414416
return utils.DefaultJasExcludePatterns
415417
}
418+
log.Debug("Using exclude patterns:", strings.Join(excludePatterns, ","))
416419
return excludePatterns
417420
}
418421

@@ -422,6 +425,11 @@ func GetExcludePatterns(module jfrogappsconfig.Module, scanner *jfrogappsconfig.
422425
func filterUniqueAndConvertToFilesExcludePatterns(excludePatterns []string) []string {
423426
uniqueExcludePatterns := datastructures.MakeSet[string]()
424427
for _, excludePattern := range excludePatterns {
428+
429+
// Add ignore for the pattern as-is, not only the pattern as a directory
430+
uniqueExcludePatterns.Add(excludePattern)
431+
432+
// Avoid adding the pattern as a directory twice
425433
if !strings.HasPrefix(excludePattern, "**/") {
426434
excludePattern = "**/" + excludePattern
427435
}

utils/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const (
3939

4040
var (
4141
// Exclude pattern for files.
42-
DefaultJasExcludePatterns = []string{"**/.git/**", "**/*test*/**", "**/*venv*/**", NodeModulesPattern, "**/target/**", "**/dist/**"}
42+
DefaultJasExcludePatterns = []string{"**/.git/**", "**/*test*/**", "**/*venv*/**", NodeModulesPattern, "**/target/**", "**/dist/**", "**test.go"}
4343
// Exclude pattern for directories.
4444
DefaultScaExcludePatterns = []string{"*.git*", "*node_modules*", "*target*", "*venv*", "*test*", "dist"}
4545
)

0 commit comments

Comments
 (0)