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 8A5D61FF187 for ; Mon, 28 Jul 2025 12:00:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A1E871F41F; Mon, 28 Jul 2025 12:02:13 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 28 Jul 2025 12:01:51 +0200 Message-ID: <20250728100154.556438-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250728100154.556438-1-c.ebner@proxmox.com> References: <20250728100154.556438-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753696921653 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.046 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox 1/2] s3 client: api types: extend client config by optional quirks X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Add optional provider specific quirks to the client configuration, allowing to set a variant of the client to follow some custom implementation variants. Add backblaze as first variant, as it does not accept the `If-None-Match` header in put object requests. Signed-off-by: Christian Ebner --- proxmox-s3-client/examples/s3_client.rs | 1 + proxmox-s3-client/src/api_types.rs | 18 +++++++++++++++++- proxmox-s3-client/src/client.rs | 3 +++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/proxmox-s3-client/examples/s3_client.rs b/proxmox-s3-client/examples/s3_client.rs index 1cbb3939..25df9609 100644 --- a/proxmox-s3-client/examples/s3_client.rs +++ b/proxmox-s3-client/examples/s3_client.rs @@ -38,6 +38,7 @@ async fn run() -> Result<(), anyhow::Error> { // `openssl s_client -connect testbucket.s3.pve-c1.local:7480 < /dev/null | openssl x509 -fingerprint -sha256 -noout` fingerprint: Some("".to_string()), put_rate_limit: None, + quirks: None, }; // Creating a client instance and connect to api endpoint diff --git a/proxmox-s3-client/src/api_types.rs b/proxmox-s3-client/src/api_types.rs index eff15f37..59fda383 100644 --- a/proxmox-s3-client/src/api_types.rs +++ b/proxmox-s3-client/src/api_types.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; use proxmox_schema::api_types::{ CERT_FINGERPRINT_SHA256_SCHEMA, DNS_LABEL_STR, IPRE_STR, SAFE_ID_FORMAT, }; -use proxmox_schema::{api, const_regex, ApiStringFormat, Schema, StringSchema, Updater}; +use proxmox_schema::{api, const_regex, ApiStringFormat, EnumEntry, Schema, StringSchema, Updater}; #[rustfmt::skip] /// Regex to match S3 endpoint full qualified domain names, including template patterns for bucket @@ -80,6 +80,15 @@ pub const S3_BUCKET_NAME_SCHEMA: Schema = StringSchema::new("Bucket name for S3 .max_length(63) .schema(); +/// Provider specific feature implementation quirks +pub const S3_PROVIDER_QUIRKS_SCHEMA: Schema = + StringSchema::new("Provider specific feature implementation quirks.") + .format(&ApiStringFormat::Enum(&[EnumEntry::new( + "backblaze", + "Backblaze", + )])) + .schema(); + #[api( properties: { endpoint: { @@ -109,6 +118,10 @@ pub const S3_BUCKET_NAME_SCHEMA: Schema = StringSchema::new("Bucket name for S3 type: u64, optional: true, }, + quirks: { + schema: S3_PROVIDER_QUIRKS_SCHEMA, + optional: true, + }, }, )] #[derive(Serialize, Deserialize, Updater, Clone, PartialEq)] @@ -134,6 +147,9 @@ pub struct S3ClientConfig { /// Rate limit for put requests given as #reqest/s. #[serde(skip_serializing_if = "Option::is_none")] pub put_rate_limit: Option, + /// Provider specific feature implementation quirks + #[serde(skip_serializing_if = "Option::is_none")] + pub quirks: Option, } impl S3ClientConfig { diff --git a/proxmox-s3-client/src/client.rs b/proxmox-s3-client/src/client.rs index 3a981bf4..bbe363da 100644 --- a/proxmox-s3-client/src/client.rs +++ b/proxmox-s3-client/src/client.rs @@ -69,6 +69,8 @@ pub struct S3ClientOptions { pub fingerprint: Option, /// Rate limit for put requests given as #reqest/s. pub put_rate_limit: Option, + /// Provider specific feature implementation quirks + pub quirks: Option, } impl S3ClientOptions { @@ -90,6 +92,7 @@ impl S3ClientOptions { access_key: config.access_key, secret_key, put_rate_limit: config.put_rate_limit, + quirks: config.quirks, } } } -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel