halo/plugin-s3
1
0
Fork 0
mirror of https://github.com/halo-dev/plugin-s3.git synced 2025-10-17 16:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore non-existing object when deleting (#193)

Browse Source
This commit is contained in:
John Niang
2025-06-11 00:24:19 +08:00
committed by GitHub
parent 19469d0537
commit 42e27da86b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/run/halo/s3os/S3OsAttachmentHandler.java
View File

@@ -91,13 +91,16 @@ public class S3OsAttachmentHandler implements AttachmentHandler {
return Mono.just(context);
}
var properties = S3OsProperties.convertFrom(deleteContext.configMap());
return Mono.using(() -> buildS3Client(properties),
return Mono.using(
() -> buildS3Client(properties),
client -> Mono.fromCallable(
() -> client.deleteObject(DeleteObjectRequest.builder()
.bucket(properties.getBucket())
.key(objectKey)
.build())).subscribeOn(Schedulers.boundedElastic()),
S3Client::close)
.build())),
S3Client::close
)
.subscribeOn(Schedulers.boundedElastic())
.doOnNext(response -> {
checkResult(response, "delete object");
log.info("Delete object {} from bucket {} successfully",
@@ -105,8 +108,10 @@ public class S3OsAttachmentHandler implements AttachmentHandler {
})
.thenReturn(context);
})
// ignore when the object does not exist
.onErrorComplete(NoSuchKeyException.class::isInstance)
.onErrorMap(S3ExceptionHandler::map)
.map(DeleteContext::attachment);
.thenReturn(deleteContext.attachment());
}
@Override