Skip to content

Commit b3f05be

Browse files
committed
add more comments
1 parent 6be448e commit b3f05be

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

internal/file/file_manager_service.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,10 @@ func (fms *FileManagerService) DetermineFileActions(
356356
// if file is in manifestFiles but not in modified files, file has been deleted
357357
// copy contents, set file action
358358
for fileName, manifestFile := range filesMap {
359-
_, existsOnDisk := modifiedFiles[fileName]
359+
_, existsInReq := modifiedFiles[fileName]
360360

361+
// allowed directories may have been updated since manifest file was written
362+
// if file is outside allowed directories skip deletion and return error
361363
if !fms.agentConfig.IsDirectoryAllowed(fileName) {
362364
return nil, fmt.Errorf("error deleting file %s: file not in allowed directories", fileName)
363365
}
@@ -368,12 +370,14 @@ func (fms *FileManagerService) DetermineFileActions(
368370
continue
369371
}
370372

373+
// if file doesn't exist on disk skip deletion
371374
if _, err := os.Stat(fileName); os.IsNotExist(err) {
372375
slog.DebugContext(ctx, "File already deleted, skipping", "file", fileName)
373376
continue
374377
}
375378

376-
if !existsOnDisk {
379+
// go ahead and delete the file
380+
if !existsInReq {
377381
fileDiff[fileName] = &model.FileCache{
378382
File: manifestFile,
379383
Action: model.Delete,

0 commit comments

Comments
 (0)