Remove DirectoryNotEmptyError

Author: denik

integration/cmd/fs/rm_test.go

@@ -95,7 +95,6 @@ func TestFsRmNonEmptyDirectory(t *testing.T) {
 			// Run rm command
 			_, _, err = testcli.RequireErrorRun(t, ctx, "fs", "rm", path.Join(tmpDir, "a"))
 			assert.ErrorIs(t, err, fs.ErrInvalid)
-			assert.ErrorAs(t, err, &filer.DirectoryNotEmptyError{})
 		})
 	}
 }

integration/libs/filer/filer_test.go

@@ -107,7 +107,7 @@ func commonFilerRecursiveDeleteTest(t *testing.T, ctx context.Context, f filer.F
 	assert.Equal(t, []string{"file1", "file2", "subdir1", "subdir2"}, names)
 
 	err = f.Delete(ctx, "dir")
-	assert.ErrorAs(t, err, &filer.DirectoryNotEmptyError{})
+	require.Error(t, err)
 
 	err = f.Delete(ctx, "dir", filer.DeleteRecursively)
 	assert.NoError(t, err)
@@ -210,8 +210,7 @@ func commonFilerReadWriteTests(t *testing.T, ctx context.Context, f filer.Filer)
 
 	// Delete should fail for a non-empty directory.
 	err = f.Delete(ctx, "/foo")
-	assert.ErrorAs(t, err, &filer.DirectoryNotEmptyError{})
-	assert.ErrorIs(t, err, fs.ErrInvalid)
+	require.Error(t, err)
 
 	// Delete should succeed for a non-empty directory if the DeleteRecursively flag is set.
 	err = f.Delete(ctx, "/foo", filer.DeleteRecursively)
@@ -645,7 +644,7 @@ func TestFilerWorkspaceFilesExtensionsDelete(t *testing.T) {
 
 	// Delete directory
 	err := wf.Delete(ctx, "dir")
-	assert.ErrorIs(t, err, fs.ErrInvalid)
+	require.Error(t, err)
 
 	// Delete directory recursively
 	err = wf.Delete(ctx, "dir", filer.DeleteRecursively)

libs/filer/dbfs_client.go

@@ -212,25 +212,6 @@ func (w *DbfsClient) Delete(ctx context.Context, name string, mode ...DeleteMode
 		Recursive: recursive,
 	})
 
-	// Return early on success.
-	if err == nil {
-		return nil
-	}
-
-	// Special handling of this error only if it is an API error.
-	var aerr *apierr.APIError
-	if !errors.As(err, &aerr) {
-		return err
-	}
-
-	switch aerr.StatusCode {
-	case http.StatusBadRequest:
-		// Anecdotally, this error is returned when attempting to delete a non-empty directory.
-		if aerr.ErrorCode == "IO_ERROR" {
-			return DirectoryNotEmptyError{absPath}
-		}
-	}
-
 	return err
 }
 

libs/filer/filer.go

@@ -90,18 +90,6 @@ func (err NotAFile) Is(other error) bool {
 	return other == fs.ErrInvalid
 }
 
-type DirectoryNotEmptyError struct {
-	path string
-}
-
-func (err DirectoryNotEmptyError) Error() string {
-	return "directory not empty: " + err.path
-}
-
-func (err DirectoryNotEmptyError) Is(other error) bool {
-	return other == fs.ErrInvalid
-}
-
 type CannotDeleteRootError struct{}
 
 func (err CannotDeleteRootError) Error() string {

libs/filer/files_client.go

@@ -246,30 +246,7 @@ func (w *FilesClient) deleteDirectory(ctx context.Context, name string) error {
 		return CannotDeleteRootError{}
 	}
 
-	err = w.workspaceClient.Files.DeleteDirectoryByDirectoryPath(ctx, absPath)
-
-	var aerr *apierr.APIError
-	// Special handling of this error only if it is an API error.
-	if !errors.As(err, &aerr) {
-		return err
-	}
-
-	// The directory delete API returns a 400 if the directory is not empty
-	if aerr.StatusCode == http.StatusBadRequest {
-		var reasons []string
-		details := aerr.ErrorDetails()
-		if details.ErrorInfo != nil {
-			reasons = append(reasons, details.ErrorInfo.Reason)
-		}
-		// Error code 400 is generic and can be returned for other reasons. Make
-		// sure one of the reasons for the error is that the directory is not empty.
-		if !slices.Contains(reasons, "FILES_API_DIRECTORY_IS_NOT_EMPTY") {
-			return err
-		}
-		return DirectoryNotEmptyError{absPath}
-	}
-
-	return err
+	return w.workspaceClient.Files.DeleteDirectoryByDirectoryPath(ctx, absPath)
 }
 
 func (w *FilesClient) recursiveDelete(ctx context.Context, name string) error {

libs/filer/local_client.go

@@ -125,7 +125,6 @@ func (w *LocalClient) Delete(ctx context.Context, name string, mode ...DeleteMod
 		if slices.Contains(mode, DeleteRecursively) {
 			return os.RemoveAll(absPath)
 		}
-		return DirectoryNotEmptyError{path: absPath}
 	}
 
 	return err

libs/filer/workspace_files_client.go

@@ -268,10 +268,6 @@ func (w *WorkspaceFilesClient) Delete(ctx context.Context, name string, mode ...
 	}
 
 	switch aerr.StatusCode {
-	case http.StatusBadRequest:
-		if aerr.ErrorCode == "DIRECTORY_NOT_EMPTY" {
-			return DirectoryNotEmptyError{absPath}
-		}
 	case http.StatusNotFound:
 		return FileDoesNotExistError{absPath}
 	}