From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id AD4231FF138 for ; Wed, 04 Mar 2026 14:58:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 15A96AF8B; Wed, 4 Mar 2026 14:59:41 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox v2 1/4] s3-client: parse and return headers for delete object response Date: Wed, 4 Mar 2026 14:59:17 +0100 Message-ID: <20260304135922.717714-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260304135922.717714-1-c.ebner@proxmox.com> References: <20260304135922.717714-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1772632750449 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.013 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.668 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.322 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 1.141 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: X3LCB5JT6BTYY4P3TPDX5H74EGJCSLKN X-Message-ID-Hash: X3LCB5JT6BTYY4P3TPDX5H74EGJCSLKN X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Mimic the response elements from the list objects parsing in the delete object response. In preparation for being able to perform delete objects via individual delete object api calls, if the respective provider quirk is set in the client options. Signed-off-by: Christian Ebner --- changes since version 1: - no changes proxmox-s3-client/src/client.rs | 9 +++++---- proxmox-s3-client/src/response_reader.rs | 21 +++++++++++++++++++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/proxmox-s3-client/src/client.rs b/proxmox-s3-client/src/client.rs index 83176b39..3d0af5d6 100644 --- a/proxmox-s3-client/src/client.rs +++ b/proxmox-s3-client/src/client.rs @@ -29,8 +29,9 @@ use crate::aws_sign_v4::AWS_SIGN_V4_DATETIME_FORMAT; use crate::aws_sign_v4::{aws_sign_v4_signature, aws_sign_v4_uri_encode}; use crate::object_key::S3ObjectKey; use crate::response_reader::{ - CopyObjectResponse, DeleteObjectsResponse, GetObjectResponse, HeadObjectResponse, - ListBucketsResponse, ListObjectsV2Response, PutObjectResponse, ResponseReader, + CopyObjectResponse, DeleteObjectsResponse, DeletedObject, GetObjectResponse, + HeadObjectResponse, ListBucketsResponse, ListObjectsV2Response, PutObjectResponse, + ResponseReader, }; /// Default timeout for s3 api requests. @@ -544,7 +545,7 @@ impl S3Client { /// Removes an object from a bucket. /// See reference docs: https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html - pub async fn delete_object(&self, object_key: S3ObjectKey) -> Result<(), Error> { + pub async fn delete_object(&self, object_key: S3ObjectKey) -> Result { let object_key = object_key.to_full_key(&self.options.common_prefix); let request = Request::builder() .method(Method::DELETE) @@ -553,7 +554,7 @@ impl S3Client { let response = self.send(request, None).await?; let response_reader = ResponseReader::new(response); - response_reader.delete_object_response().await + response_reader.delete_object_response(object_key).await } /// Delete multiple objects from a bucket using a single HTTP request. diff --git a/proxmox-s3-client/src/response_reader.rs b/proxmox-s3-client/src/response_reader.rs index 7066c33b..be7c0950 100644 --- a/proxmox-s3-client/src/response_reader.rs +++ b/proxmox-s3-client/src/response_reader.rs @@ -361,7 +361,10 @@ impl ResponseReader { /// Read and parse the delete object response. /// /// Returns with error if an unexpected status code is encountered. - pub(crate) async fn delete_object_response(self) -> Result<(), Error> { + pub(crate) async fn delete_object_response( + self, + key: S3ObjectKey, + ) -> Result { let (parts, _body) = self.response.into_parts(); match parts.status { @@ -369,7 +372,21 @@ impl ResponseReader { status_code => bail!("unexpected status code {status_code}"), }; - Ok(()) + let delete_marker = Self::parse_optional_header( + HeaderName::from_static("x-amz-delete-marker"), + &parts.headers, + )?; + let delete_marker_version_id = Self::parse_optional_header( + HeaderName::from_static("x-amz-version-id"), + &parts.headers, + )?; + + Ok(DeletedObject { + delete_marker, + delete_marker_version_id, + key: Some(key), + version_id: None, + }) } /// Read and parse the delete objects response. -- 2.47.3