👻 Adding Fixes for the broken tests (#1106)

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Bug Fixes**
* Improved Windows drive-path handling so exclusions and tracked files
behave correctly on Windows.

* **Refactor**
* More accurate path matching and relative-path computation, plus
deduplication of aggregated search results for more reliable filtering.

* **Tests**
* Expanded test coverage for regex-based exclusions and tightened test
setup with explicit init/teardown and increased verbosity.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Signed-off-by: Shawn Hurley <shawn@hurley.page>

Author: shawn-hurley

provider/internal/builtin/service_client.go

@@ -500,7 +500,12 @@ func (b *builtinServiceClient) getWorkingCopies() ([]string, []string) {
 	excludedPaths := []string{}
 	for _, wc := range b.workingCopyMgr.getWorkingCopies() {
 		additionalIncludedPaths = append(additionalIncludedPaths, wc.wcPath)
-		excludedPaths = append(excludedPaths, wc.filePath)
+		if runtime.GOOS == "windows" && wc.drive != "" {
+			path := filepath.Join(wc.drive, wc.filePath[1:])
+			excludedPaths = append(excludedPaths, path)
+		} else {
+			excludedPaths = append(excludedPaths, wc.filePath)
+		}
 	}
 	return additionalIncludedPaths, excludedPaths
 }

provider/internal/builtin/service_client_test.go

@@ -681,11 +681,6 @@ func Test_builtinServiceClient_Evaluate_InclusionExclusion(t *testing.T) {
 					},
 				},
 			},
-			chainTemplate: engine.ChainTemplate{
-				Filepaths: []string{
-					filepath.Join("dir_b", "dir_a", "ba.xml"),
-				},
-			},
 			notifiedFileChanges: []provider.FileChange{
 				{
 					Path:    filepath.Join(baseLocation, "dir_b", "b.xml"),
@@ -776,12 +771,14 @@ func Test_builtinServiceClient_Evaluate_InclusionExclusion(t *testing.T) {
 				config: provider.InitConfig{
 					Location: baseLocation,
 				},
-				log:            testr.New(t),
+				log: testr.NewWithOptions(t, testr.Options{
+					Verbosity: 10,
+				}),
 				includedPaths:  tt.includedPathsFromConfig,
 				excludedDirs:   tt.excludedPathsFromConfig,
 				locationCache:  map[string]float64{},
 				cacheMutex:     sync.RWMutex{},
-				workingCopyMgr: NewTempFileWorkingCopyManger(testr.New(t)),
+				workingCopyMgr: NewTempFileWorkingCopyManger(testr.NewWithOptions(t, testr.Options{Verbosity: 10})),
 			}
 			p.workingCopyMgr.init()
 			defer p.workingCopyMgr.stop()
@@ -987,6 +984,8 @@ func Test_builtinServiceClient_Evaluate_ExcludeDirs(t *testing.T) {
 				cacheMutex:     sync.RWMutex{},
 				workingCopyMgr: NewTempFileWorkingCopyManger(testr.New(t)),
 			}
+			sc.workingCopyMgr.init()
+			defer sc.workingCopyMgr.stop()
 			conditionInfo, err := yaml.Marshal(&tt.condition)
 			if err != nil {
 				t.Errorf("builtinServiceClient.Evaluate() invalid test case, please check if condition is correct")

provider/internal/builtin/wcmanger.go

@@ -2,9 +2,9 @@ package builtin
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"path/filepath"
-	"regexp"
 	"runtime"
 	"strings"
 	"sync"
@@ -17,6 +17,7 @@ import (
 type workingCopy struct {
 	filePath string
 	wcPath   string
+	drive    string
 }
 
 type workingCopyManager struct {
@@ -77,10 +78,19 @@ func (t *workingCopyManager) reformatIncidents(incidents ...provider.IncidentCon
 		inc := &incidents[i]
 		if strings.HasPrefix(string(inc.FileURI), "file://") &&
 			strings.HasPrefix(inc.FileURI.Filename(), t.tempDir) {
-			inc.FileURI = uri.File(
-				filepath.Clean(strings.Replace(
-					inc.FileURI.Filename(), t.tempDir, "", -1)))
+			if runtime.GOOS == "windows" {
+				parts := strings.Split(strings.ReplaceAll(inc.FileURI.Filename(), t.tempDir, ""), string(filepath.Separator))
+				t.log.Info("parts here", "parts", parts, "temp-dir", t.tempDir)
+				driveLetter := fmt.Sprintf("%s:\\", parts[1])
+				newParts := []string{driveLetter}
+				newParts = append(newParts, parts[2:]...)
+				inc.FileURI = uri.File(filepath.Clean(filepath.Join(newParts...)))
+			} else {
+				inc.FileURI = uri.File(filepath.Clean(strings.ReplaceAll(
+					inc.FileURI.Filename(), t.tempDir, "")))
+			}
 		}
+
 		formatted = append(formatted, *inc)
 	}
 	return formatted
@@ -96,9 +106,11 @@ func (t *workingCopyManager) startWorker() {
 				return
 			}
 			// we need to get rid of volume label on windows
+			var drive string
 			if runtime.GOOS == "windows" {
-				volLabel := regexp.MustCompile(`^[a-zA-Z]:`)
-				change.Path = volLabel.ReplaceAllString(change.Path, "")
+				drive = filepath.VolumeName(change.Path)
+				driveUpdated, _ := strings.CutSuffix(drive, ":")
+				change.Path = strings.ReplaceAll(change.Path, drive, driveUpdated)
 			}
 			_, wcExists := t.workingCopies[change.Path]
 			wcPath := filepath.Join(t.tempDir, change.Path)
@@ -131,6 +143,7 @@ func (t *workingCopyManager) startWorker() {
 				t.workingCopies[change.Path] = workingCopy{
 					filePath: change.Path,
 					wcPath:   wcPath,
+					drive:    drive,
 				}
 				t.wcMutex.Unlock()
 			}

provider/lib.go

@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"slices"
 	"strings"
 
 	"github.com/go-logr/logr"
@@ -181,6 +182,7 @@ func (f *FileSearcher) Search(s SearchCriteria) ([]string, error) {
 		finalSearchResult = append(finalSearchResult, files...)
 	}
 
+	finalSearchResult = dedupSlice(finalSearchResult...)
 	// apply baseline include patterns and any search patterns
 	finalSearchResult = f.filterFilesByPathsOrPatterns(statFunc, includedPatterns, finalSearchResult, false)
 	// apply patterns from search criteria
@@ -227,19 +229,32 @@ func (f *FileSearcher) filterFilesByPathsOrPatterns(statFunc cachedOsStat, patte
 			} else {
 				rPattern := pattern
 				// if the pattern doesn't contain a wildcard, do an exact match only
-				if regexp.QuoteMeta(pattern) == pattern {
+				if !strings.ContainsAny(pattern, "*?[]$^") {
 					rPattern = "^" + pattern + "$"
 				}
 				// try matching as go regex pattern
-				relPath, err := filepath.Rel(f.BasePath, file)
-				if err != nil {
-					// This should never happen, if paths are found outside the base path, then something did not occur
-					// correctly.
+				var relPath string
+				if strings.HasPrefix(file, f.BasePath) {
+					// This is not in a working copy manager or some other additional path
+					// We want to just search for matches within the base path.
+					var err error
+					relPath, err = filepath.Rel(f.BasePath, file)
+					if err != nil {
+						f.Log.Error(fmt.Errorf("unable to get relative path for file from base path"),
+							"this should not happen, please file a bug", "basePath", f.BasePath, "filePath", file)
+						continue
+					}
+					relPath = filepath.Join(string(os.PathSeparator), relPath)
+				} else if slices.Contains(f.AdditionalPaths, file) {
+					// When this comes from an addional path, we won't know
+					// where to search from, so fall back to the full file path.
+					relPath = file
+				} else {
 					f.Log.Error(fmt.Errorf("unable to get relative path for file from base path"),
 						"this should not happen, please file a bug", "basePath", f.BasePath, "filePath", file)
 					continue
 				}
-				relPath = filepath.Join(string(os.PathSeparator), relPath)
+
 				f.Log.V(9).Info("using regex to search", "pattern", pattern, "relPath", relPath)
 				regex, regexErr := regexp.Compile(rPattern)
 				if regexErr == nil && (regex.MatchString(relPath) || regex.MatchString(filepath.Base(file))) {

provider/lib_test.go

@@ -432,6 +432,30 @@ func TestFileSearcher_Search(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name:     "exclude pattern with regex",
+			basePath: testBasePath,
+			providerConfigConstraints: IncludeExcludeConstraints{
+				IncludePathsOrPatterns: []string{},
+				ExcludePathsOrPatterns: []string{`.*\.txt$`},
+			},
+			searchCriteria: SearchCriteria{
+				Patterns:           []string{},
+				ConditionFilepaths: []string{},
+			},
+			wantFilePatterns: []string{
+				".mvn/maven-wrapper.jar",
+				"node_modules/package.json",
+				"src/helper.go",
+				"lib/util.go",
+				"lib/common.go",
+				"vendor/dep.go",
+				"README.md",
+				"config.yaml",
+				"src/main.go",
+			},
+			wantErr: false,
+		},
 		{
 			name:     "include pattern with wildcard",
 			basePath: testBasePath,