Properly rescue ENOENT on delete and send DataNotFoundError

so that callers can 404 when deleting a nonexistent path

1 files changed, 10 insertions, 6 deletions

diff --git a/lib/chef/chef_fs/file_system/file_system_entry.rb b/lib/chef/chef_fs/file_system/file_system_entry.rb
index 478631eac2..5ce8b3320a 100644
--- a/lib/chef/chef_fs/file_system/file_system_entry.rb
+++ b/lib/chef/chef_fs/file_system/file_system_entry.rb
@@ -72,13 +72,17 @@ class Chef
         end
 
         def delete(recurse)
-          if dir?
-            if !recurse
-              raise MustDeleteRecursivelyError.new(self, $!)
+          begin
+            if dir?
+              if !recurse
+                raise MustDeleteRecursivelyError.new(self, $!)
+              end
+              FileUtils.rm_r(file_path)
+            else
+              File.delete(file_path)
             end
-            FileUtils.rm_rf(file_path)
-          else
-            File.delete(file_path)
+          rescue Errno::ENOENT
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
           end
         end