Skip to content

Commit 2cf58bb

Browse files
committed
expend excluded patterns
1 parent 760eef8 commit 2cf58bb

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
@@ -352,11 +352,14 @@ func GetExcludePatterns(module jfrogappsconfig.Module, scanner *jfrogappsconfig.
352352
// Adding exclusions from jfrog-apps-config IF no exclusions provided from other source (flags, env vars, config profile)
353353
excludePatterns := module.ExcludePatterns
354354
if scanner != nil {
355+
log.Debug("Using scanner exclude patterns:", strings.Join(scanner.ExcludePatterns, ","))
355356
excludePatterns = append(excludePatterns, scanner.ExcludePatterns...)
356357
}
357358
if len(excludePatterns) == 0 {
359+
log.Debug("No exclude patterns provided, using default exclude patterns", strings.Join(utils.DefaultJasExcludePatterns, ","))
358360
return utils.DefaultJasExcludePatterns
359361
}
362+
log.Debug("Using exclude patterns:", strings.Join(excludePatterns, ","))
360363
return excludePatterns
361364
}
362365

@@ -366,6 +369,11 @@ func GetExcludePatterns(module jfrogappsconfig.Module, scanner *jfrogappsconfig.
366369
func filterUniqueAndConvertToFilesExcludePatterns(excludePatterns []string) []string {
367370
uniqueExcludePatterns := datastructures.MakeSet[string]()
368371
for _, excludePattern := range excludePatterns {
372+
373+
// Add ignore for the pattern as-is, not only the pattern as a directory
374+
uniqueExcludePatterns.Add(excludePattern)
375+
376+
// Avoid adding the pattern as a directory twice
369377
if !strings.HasPrefix(excludePattern, "**/") {
370378
excludePattern = "**/" + excludePattern
371379
}

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)