diff options
author | Florian Klink <flokli@flokli.de> | 2024-08-17T19·00+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-08-18T17·22+0000 |
commit | e086c76ee941198c70756e1b7b383edcb3572b4b (patch) | |
tree | 58fbfe1eeb992489a2feff0bf9ff8852309cd720 /tvix/castore/src/import/mod.rs | |
parent | 56fa533e438bd367aa5cae6fa505508aced42156 (diff) |
refactor(tvix/castore): have SymlinkTarget-specific errors r/8514
Don't use ValidateNodeError, but SymlinkTargetError. Also, add checks for too long symlink targets. Change-Id: I4b533325d494232ff9d0b3f4f695f5a1a0a36199 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12230 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: edef <edef@edef.eu> Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/castore/src/import/mod.rs')
-rw-r--r-- | tvix/castore/src/import/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/castore/src/import/mod.rs b/tvix/castore/src/import/mod.rs index a7c459fdb56a..6e10a64939a4 100644 --- a/tvix/castore/src/import/mod.rs +++ b/tvix/castore/src/import/mod.rs @@ -6,7 +6,7 @@ use crate::directoryservice::{DirectoryPutter, DirectoryService}; use crate::path::{Path, PathBuf}; -use crate::{B3Digest, Directory, Node}; +use crate::{B3Digest, Directory, Node, SymlinkTargetError}; use futures::{Stream, StreamExt}; use tracing::Level; @@ -91,10 +91,10 @@ where } IngestionEntry::Symlink { ref target, .. } => Node::Symlink { target: bytes::Bytes::copy_from_slice(target).try_into().map_err( - |e: crate::ValidateNodeError| { + |e: SymlinkTargetError| { IngestionError::UploadDirectoryError( entry.path().to_owned(), - crate::Error::StorageError(e.to_string()), + crate::Error::StorageError(format!("invalid symlink target: {}", e)), ) }, )?, |