Merge branch 'cluster-folder-methods' into use-cluster-folder-apis

run-house · Aug 12, 2024 · 39dce2e · 39dce2e
2 parents ebb8cd7 + 88e36d7
commit 39dce2e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/runhouse/servers/http/http_server.py b/runhouse/servers/http/http_server.py
@@ -81,19 +81,9 @@ async def wrapper(*args, **kwargs):
 
         func_call: bool = func.__name__ in ["post_call", "get_call"]
 
-        # restrict access for folder APIs
+        # restrict access for folder specific APIs
         access_level_required = (
-            ResourceAccess.WRITE
-            if func.__name__
-            in [
-                "folder_ls_cmd",
-                "folder_mkdir_cmd",
-                "folder_get_cmd",
-                "folder_put_cmd",
-                "folder_rm_cmd",
-                "folder_mv_cmd",
-            ]
-            else None
+            ResourceAccess.WRITE if func.__name__.startswith("folder") else None
         )
         token = get_token_from_request(request)
 

diff --git a/runhouse/servers/http/http_utils.py b/runhouse/servers/http/http_utils.py
@@ -429,7 +429,10 @@ def folder_put(
             with open(file_path, mode) as f:
                 f.write(file_obj)
         except Exception as e:
-            HTTPException(status_code=500, detail=f"Failed to write file: {str(e)}")
+            HTTPException(
+                status_code=500,
+                detail=f"Failed to write file with mode '{mode}': {str(e)}",
+            )
 
     return Response(output_type=OutputType.SUCCESS)
 

diff --git a/tests/test_resources/test_clusters/test_cluster.py b/tests/test_resources/test_clusters/test_cluster.py
@@ -939,17 +939,15 @@ def test_cluster_mkdir_mv_and_rm(self, cluster):
         assert "new-folder" in [os.path.basename(f) for f in file_contents]
 
         # Should not be able to mv to an existing directory if `overwrite=False`
-        with pytest.raises(FileExistsError):
+        with pytest.raises(Exception):
             cluster._folder_mv(
                 path="~/.rh/new-folder", dest_path="~/new-folder", overwrite=False
             )
 
-        cluster._folder_mv(path="~/.rh/new-folder", dest_path="~/new-folder")
-
         # Delete folder contents and directory itself
         cluster._folder_rm(path="~/new-folder", recursive=True)
 
-        assert not cluster._exists(path="~/new-folder")
+        assert not cluster._folder_exists(path="~/new-folder")
 
     @pytest.mark.level("release")
     @pytest.mark.clustertest