Handle scenario where directory being watched is deleted

Author: dhurley

internal/watcher/file/file_watcher_service.go

@@ -8,7 +8,6 @@ package file
 import (
 	"context"
 	"errors"
-	"fmt"
 	"log/slog"
 	"os"
 	"path/filepath"
@@ -148,6 +147,12 @@ func (fws *FileWatcherService) addWatchers(ctx context.Context) {
 func (fws *FileWatcherService) removeWatchers(ctx context.Context) {
 	for _, directoryBeingWatched := range fws.watcher.WatchList() {
 		if _, err := os.Stat(directoryBeingWatched); errors.Is(err, os.ErrNotExist) {
+			slog.DebugContext(
+				ctx,
+				"Directory does not exist removing watcher",
+				"directory", directoryBeingWatched,
+			)
+
 			fws.removeWatcher(ctx, directoryBeingWatched)
 			fws.filesChanged.Store(true)
 		} else if _, ok := fws.directoriesToWatch[directoryBeingWatched]; !ok {
@@ -158,7 +163,6 @@ func (fws *FileWatcherService) removeWatchers(ctx context.Context) {
 }
 
 func (fws *FileWatcherService) handleEvent(ctx context.Context, event fsnotify.Event) {
-	fmt.Println(event)
 	if fws.enabled.Load() {
 		if fws.isEventSkippable(event) {
 			return

internal/watcher/file/file_watcher_service_test.go

@@ -273,16 +273,9 @@ func TestFileWatcherService_Watch(t *testing.T) {
 	})
 
 	t.Run("Test 3: Directory deleted", func(t *testing.T) {
-		fileDeleteError := os.Remove(file.Name())
-		require.NoError(t, fileDeleteError)
-		t.Logf("Removing directory %s", testDirectory)
 		dirDeleteError := os.RemoveAll(testDirectory)
 		require.NoError(t, dirDeleteError)
 
-		if _, err := os.Stat(testDirectory); !os.IsNotExist(err) {
-			t.Fatalf("Expected directory to not exist")
-		}
-
 		// Check that directory is no longer being watched
 		assert.Eventually(t, func() bool {
 			_, ok := fileWatcherService.directoriesToWatch[testDirectory]
@@ -291,7 +284,6 @@ func TestFileWatcherService_Watch(t *testing.T) {
 
 		assert.Eventually(t, func() bool {
 			directoriesBeingWatched := fileWatcherService.watcher.WatchList()
-			t.Log(directoriesBeingWatched)
 			return len(directoriesBeingWatched) == 0
 		}, 1*time.Second, 100*time.Millisecond)
 	})