fix find by name

Signed-off-by: Ivan Milchev <[email protected]>
mondoohq · Dec 12, 2024 · d6d54a4 · d6d54a4 · github-actions · Dec 12, 2024
1 parent 0aed479
commit d6d54a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/providers/os/connection/tar/fs.go b/providers/os/connection/tar/fs.go
@@ -209,7 +209,7 @@ func (fs *FS) Find(from string, r *regexp.Regexp, typ string, perm *uint32, dept
 		log.Trace().Str("path", k).Str("from", from).Str("prefix", from).Bool("prefix", p).Bool("m", m).Msg("check if matches")
 		if p && m {
 			entry := fs.FileMap[k]
-			if (typ == "directory" && entry.Typeflag == tar.TypeDir) || (typ == "file" && entry.Typeflag == tar.TypeReg) {
+			if (typ == "directory" && entry.Typeflag == tar.TypeDir) || (typ == "file" && entry.Typeflag == tar.TypeReg) || typ == "" {
 				list = append(list, k)
 				log.Debug().Msg("matches")
 				continue

diff --git a/providers/os/resources/files.go b/providers/os/resources/files.go
@@ -70,6 +70,11 @@ func (l *mqlFilesFind) list() ([]interface{}, error) {
 		if err != nil {
 			return nil, err
 		}
+	} else if len(l.Name.Data) > 0 {
+		compiledRegexp, err = regexp.Compile(l.Name.Data)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	var foundFiles []string
Benchmark suite	Current: `d6d54a4`	Previous: `ac14153`	Ratio
`BenchmarkScan_SingleAsset`	`14337252971` ns/op 239585696 B/op 5330352 allocs/op	`2080853322` ns/op 239715552 B/op 5334676 allocs/op	`6.89`
`BenchmarkScan_SingleAsset - ns/op`	`14337252971` ns/op	`2080853322` ns/op	`6.89`