From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E23B91FF187 for ; Mon, 28 Jul 2025 08:46:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8573B1A4D4; Mon, 28 Jul 2025 08:47:39 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 28 Jul 2025 08:46:41 +0200 Message-ID: <20250728064645.158414-7-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250728064645.158414-1-c.ebner@proxmox.com> References: <20250728064645.158414-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753685213975 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 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-backup 2/6] datastore: wrap bucket name, as in is now optional in the s3 client 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" The bucket name is now optional so it is possible to also instantiate a client to perform operations without a bucket, e.g. listing of available buckets. Adapt the callsides accordingly. Signed-off-by: Christian Ebner --- pbs-datastore/src/datastore.rs | 2 +- src/api2/admin/s3.rs | 2 +- src/api2/config/datastore.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index e8be576f7..01122c6de 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -256,7 +256,7 @@ impl DataStore { let options = S3ClientOptions::from_config( config.config, config.secret_key, - bucket, + Some(bucket), self.name().to_owned(), ); let s3_client = S3Client::new(options)?; diff --git a/src/api2/admin/s3.rs b/src/api2/admin/s3.rs index 1a0932945..90cc41ea6 100644 --- a/src/api2/admin/s3.rs +++ b/src/api2/admin/s3.rs @@ -48,7 +48,7 @@ pub async fn check( .context("config lookup failed")?; let options = - S3ClientOptions::from_config(config.config, config.secret_key, bucket, store_prefix); + S3ClientOptions::from_config(config.config, config.secret_key, Some(bucket), store_prefix); let test_object_key = S3ObjectKey::try_from(".s3-client-test").context("failed to generate s3 object key")?; diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index d24323152..cf8e306cc 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -151,7 +151,7 @@ pub(crate) fn do_create_datastore( let options = S3ClientOptions::from_config( config.config, config.secret_key, - bucket, + Some(bucket), datastore.name.to_owned(), ); let s3_client = S3Client::new(options).context("failed to create s3 client")?; @@ -379,7 +379,7 @@ pub fn create_datastore( let options = S3ClientOptions::from_config( config.config, config.secret_key, - bucket, + Some(bucket), store_name.clone(), ); let s3_client = S3Client::new(options).context("failed to create s3 client")?; -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel