Skip to content

Commit

Permalink
feat: Return hinted error for S3 wildcard if-none-match (#5506)
Browse files Browse the repository at this point in the history
  • Loading branch information
gruuya authored Jan 4, 2025
1 parent c866d4b commit d569629
Showing 1 changed file with 46 additions and 11 deletions.
57 changes: 46 additions & 11 deletions core/src/layers/correctness_check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,16 @@ impl<A: Access> LayeredAccess for CorrectnessAccessor<A> {
"if_not_exists",
));
}
if args.if_none_match().is_some() && !capability.write_with_if_none_match {
return Err(new_unsupported_error(
self.info.as_ref(),
Operation::Write,
"if_none_match",
));
if let Some(if_none_match) = args.if_none_match() {
if !capability.write_with_if_none_match {
let mut err =
new_unsupported_error(self.info.as_ref(), Operation::Write, "if_none_match");
if if_none_match == "*" && capability.write_with_if_not_exists {
err = err.with_context("hint", "use if_not_exists instead");
}

return Err(err);
}
}

self.inner.write(path, args).await
Expand Down Expand Up @@ -304,7 +308,7 @@ mod tests {
}

async fn write(&self, _: &str, _: OpWrite) -> Result<(RpWrite, Self::Writer)> {
Ok((RpWrite::new(), Box::new(())))
Ok((RpWrite::new(), Box::new(MockWriter)))
}

async fn list(&self, _: &str, _: OpList) -> Result<(RpList, Self::Lister)> {
Expand All @@ -316,6 +320,22 @@ mod tests {
}
}

struct MockWriter;

impl oio::Write for MockWriter {
async fn write(&mut self, _: Buffer) -> Result<()> {
Ok(())
}

async fn close(&mut self) -> Result<()> {
Ok(())
}

async fn abort(&mut self) -> Result<()> {
Ok(())
}
}

struct MockDeleter;

impl oio::Delete for MockDeleter {
Expand Down Expand Up @@ -376,6 +396,7 @@ mod tests {
async fn test_write_with() {
let op = new_test_operator(Capability {
write: true,
write_with_if_not_exists: true,
..Default::default()
});
let res = op.write_with("path", "".as_bytes()).append(true).await;
Expand All @@ -384,17 +405,31 @@ mod tests {

let res = op
.write_with("path", "".as_bytes())
.if_not_exists(true)
.if_none_match("etag")
.await;
assert!(res.is_err());
assert_eq!(res.unwrap_err().kind(), ErrorKind::Unsupported);
assert_eq!(
res.unwrap_err().to_string(),
"Unsupported (permanent) at write => service memory doesn't support operation write with args if_none_match"
);

// Now try a wildcard if-none-match
let res = op
.write_with("path", "".as_bytes())
.if_none_match("etag")
.if_none_match("*")
.await;
assert!(res.is_err());
assert_eq!(res.unwrap_err().kind(), ErrorKind::Unsupported);
assert_eq!(
res.unwrap_err().to_string(),
"Unsupported (permanent) at write, context: { hint: use if_not_exists instead } => \
service memory doesn't support operation write with args if_none_match"
);

let res = op
.write_with("path", "".as_bytes())
.if_not_exists(true)
.await;
assert!(res.is_ok());

let op = new_test_operator(Capability {
write: true,
Expand Down

0 comments on commit d569629

Please sign in to comment.