fix(flag): use globalstar to skip directories (#4854)

aquasecurity · Jul 23, 2023 · a61531c · a61531c
1 parent 78cc209
commit a61531c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/fanal/walker/walk.go b/pkg/fanal/walker/walk.go
@@ -2,7 +2,6 @@ package walker
 
 import (
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 
@@ -80,7 +79,7 @@ func (w *walker) shouldSkipDir(dir string) bool {
 
 	// Skip system dirs and specified dirs (absolute path)
 	for _, pattern := range w.skipDirs {
-		if match, err := path.Match(pattern, dir); err != nil {
+		if match, err := doublestar.Match(pattern, dir); err != nil {
 			return false // return early if bad pattern
 		} else if match {
 			log.Logger.Debugf("Skipping directory: %s", dir)

diff --git a/pkg/fanal/walker/walk_test.go b/pkg/fanal/walker/walk_test.go
@@ -104,6 +104,13 @@ func Test_shouldSkipDir(t *testing.T) {
 				filepath.Join("/etc/foo/bar"): false,
 			},
 		},
+		{
+			skipDirs: []string{"**/.terraform"},
+			skipMap: map[string]bool{
+				".terraform":              true,
+				"test/foo/bar/.terraform": true,
+			},
+		},
 	}
 
 	for i, tc := range testCases {