diff options
| author | Alex <lx@deuxfleurs.fr> | 2025-01-29 18:25:44 +0000 |
|---|---|---|
| committer | Alex <lx@deuxfleurs.fr> | 2025-01-29 18:25:44 +0000 |
| commit | ab71544499679685877cd7bd683ba4556b4331f2 (patch) | |
| tree | 7445be8428cfccd0996109b23a06ec2b7b959f40 /src/api/k2v/item.rs | |
| parent | 991edbe02c9493e932614f1b801fe2bbdf020c53 (diff) | |
| parent | 9f3c7c3720d323bc9df3892197e6da5d89d1b84a (diff) | |
| download | garage-ab71544499679685877cd7bd683ba4556b4331f2.tar.gz garage-ab71544499679685877cd7bd683ba4556b4331f2.zip | |
Merge pull request 'api: better handling of helper errors to distinguish error codes' (#942) from fix-getkeyinfo-404 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/942
Diffstat (limited to 'src/api/k2v/item.rs')
| -rw-r--r-- | src/api/k2v/item.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/api/k2v/item.rs b/src/api/k2v/item.rs index af3af4e4..87371727 100644 --- a/src/api/k2v/item.rs +++ b/src/api/k2v/item.rs @@ -18,6 +18,10 @@ pub enum ReturnFormat { Either, } +pub(crate) fn parse_causality_token(s: &str) -> Result<CausalContext, Error> { + CausalContext::parse(s).ok_or(Error::InvalidCausalityToken) +} + impl ReturnFormat { pub fn from(req: &Request<ReqBody>) -> Result<Self, Error> { let accept = match req.headers().get(header::ACCEPT) { @@ -136,7 +140,7 @@ pub async fn handle_insert_item( .get(X_GARAGE_CAUSALITY_TOKEN) .map(|s| s.to_str()) .transpose()? - .map(CausalContext::parse_helper) + .map(parse_causality_token) .transpose()?; let body = http_body_util::BodyExt::collect(req.into_body()) @@ -176,7 +180,7 @@ pub async fn handle_delete_item( .get(X_GARAGE_CAUSALITY_TOKEN) .map(|s| s.to_str()) .transpose()? - .map(CausalContext::parse_helper) + .map(parse_causality_token) .transpose()?; let value = DvvsValue::Deleted; |