relink.py: Delete a redundant check.

handle_non_dir() doesn't need to check that path is under inputdata_root, because that is already checked in process_args.

Author: samsrabin

relink.py

@@ -93,23 +93,21 @@ def _handle_non_dir_str(path: str, user_uid: int):
     return None
 
 
-def handle_non_dir(var, user_uid, inputdata_root):
+def handle_non_dir(var, user_uid):
     """
     Check if a non-directory is owned by the user and should be processed. Passes var to a
     helper function depending on its type.
 
     Args:
         var (os.DirEntry or str): A directory entry from os.scandir(), or a string path.
         user_uid (int): The UID of the user whose files to find.
-        inputdata_root (str): The root of the directory tree containing CESM input data.
 
     Returns:
         str or None: The absolute path to the file if it's owned by the user
                      and is a regular file (not a symlink), otherwise None.
 
     Raises:
         TypeError: If var is not a DirEntry-like object.
-        ValueError: If the file path is not under inputdata_root.
     """
 
     # Handle a variable of type str.
@@ -130,12 +128,6 @@ def handle_non_dir(var, user_uid, inputdata_root):
             f"Unsure how to handle non-directory variable of type {type(var)}"
         )
 
-    # Check that resulting path is a child of inputdata_root
-    if file_path is not None and not Path(file_path).is_relative_to(inputdata_root):
-        raise ValueError(
-            f"'{file_path}' must be equivalent to or under '{inputdata_root}"
-        )
-
     return file_path
 
 
@@ -169,7 +161,7 @@ def find_owned_files_scandir(item, user_uid, inputdata_root=DEFAULT_SOURCE_ROOT)
 
                     # Things other than directories are handled separately
                     elif (
-                        entry_path := handle_non_dir(entry, user_uid, inputdata_root)
+                        entry_path := handle_non_dir(entry, user_uid)
                     ) is not None:
                         yield entry_path
 
@@ -178,7 +170,7 @@ def find_owned_files_scandir(item, user_uid, inputdata_root=DEFAULT_SOURCE_ROOT)
                     continue
 
     except NotADirectoryError:
-        if (file_path := handle_non_dir(item, user_uid, inputdata_root)) is not None:
+        if (file_path := handle_non_dir(item, user_uid)) is not None:
             yield file_path
 
     except (OSError, PermissionError) as e:

tests/relink/test_handle_non_dir.py

@@ -382,7 +382,7 @@ def test_works_with_direntry(self, temp_dirs):
         # Get DirEntry for the file
         with os.scandir(source_dir) as entries:
             entry = next(e for e in entries if e.name == "test.txt")
-            result = relink.handle_non_dir(entry, user_uid, source_dir)
+            result = relink.handle_non_dir(entry, user_uid)
 
         assert result == test_file
 
@@ -397,7 +397,7 @@ def test_works_with_str(self, temp_dirs):
             f.write("content")
 
         # Get path of the file
-        result = relink.handle_non_dir(test_file, user_uid, source_dir)
+        result = relink.handle_non_dir(test_file, user_uid)
 
         assert result == test_file
 
@@ -412,7 +412,7 @@ def test_errors_with_str_file_doesnt_exist(self, temp_dirs):
 
         # Get path of the file
         with pytest.raises(FileNotFoundError):
-            relink.handle_non_dir(test_file, user_uid, source_dir)
+            relink.handle_non_dir(test_file, user_uid)
 
     def test_raises_typeerror_for_int(self, temp_dirs):
         """Test that handle_non_dir raises TypeError for an integer."""
@@ -426,4 +426,4 @@ def test_raises_typeerror_for_int(self, temp_dirs):
             TypeError,
             match=f"Unsure how to handle non-directory variable of type.*{expected_type}",
         ):
-            relink.handle_non_dir(invalid_input, user_uid, source_dir)
+            relink.handle_non_dir(invalid_input, user_uid)