From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v4 4/6] api: config s3: add bucket list api endpoint
Date: Thu, 31 Jul 2025 14:58:58 +0200 [thread overview]
Message-ID: <20250731125900.265494-9-c.ebner@proxmox.com> (raw)
In-Reply-To: <20250731125900.265494-1-c.ebner@proxmox.com>
This endpoint allows to list buckets accessible given the provided
endpoint configuration. The bucket list is intended to be used for
ease of datastore setup by providing a list of bucket names to the
user in the frontend.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
Reviewed-by: Lukas Wagner <l.wagner@proxmox.com>
Tested-by: Lukas Wagner <l.wagner@proxmox.com>
---
changes since version 3:
- no changes
src/api2/config/s3.rs | 48 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 45 insertions(+), 3 deletions(-)
diff --git a/src/api2/config/s3.rs b/src/api2/config/s3.rs
index 04b801028..047bf1fb1 100644
--- a/src/api2/config/s3.rs
+++ b/src/api2/config/s3.rs
@@ -5,8 +5,8 @@ use serde_json::Value;
use proxmox_router::{http_bail, Permission, Router, RpcEnvironment};
use proxmox_s3_client::{
- S3ClientConf, S3ClientConfig, S3ClientConfigUpdater, S3ClientConfigWithoutSecret,
- S3_CLIENT_ID_SCHEMA,
+ S3BucketListItem, S3Client, S3ClientConf, S3ClientConfig, S3ClientConfigUpdater,
+ S3ClientConfigWithoutSecret, S3ClientOptions, S3_CLIENT_ID_SCHEMA,
};
use proxmox_schema::{api, param_bail, ApiType};
@@ -273,6 +273,45 @@ pub fn delete_s3_client_config(
s3::save_config(&config)
}
+#[api(
+ input: {
+ properties: {
+ id: {
+ schema: S3_CLIENT_ID_SCHEMA,
+ },
+ },
+ },
+ access: {
+ permission: &Permission::Privilege(&[], PRIV_SYS_AUDIT, false),
+ },
+)]
+/// List buckets accessible by given s3 client configuration
+pub async fn list_buckets(
+ id: String,
+ _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Vec<S3BucketListItem>, Error> {
+ let (config, _digest) = pbs_config::s3::config()?;
+ let config: S3ClientConf = config
+ .lookup(S3_CFG_TYPE_ID, &id)
+ .context("config lookup failed")?;
+
+ let empty_prefix = String::new();
+ let options =
+ S3ClientOptions::from_config(config.config, config.secret_key, None, empty_prefix);
+ let client = S3Client::new(options).context("client creation failed")?;
+ let list_buckets_response = client
+ .list_buckets()
+ .await
+ .context("failed to list buckets")?;
+ let buckets = list_buckets_response
+ .buckets
+ .into_iter()
+ .map(|bucket| S3BucketListItem { name: bucket.name })
+ .collect();
+
+ Ok(buckets)
+}
+
// Check if the configured s3 client is still in-use by a datastore backend.
//
// If so, return the first datastore name with the configured client.
@@ -294,10 +333,13 @@ fn s3_client_in_use(id: &str) -> Result<Option<String>, Error> {
Ok(None)
}
+const LIST_BUCKETS_ROUTER: Router = Router::new().get(&API_METHOD_LIST_BUCKETS);
+
const ITEM_ROUTER: Router = Router::new()
.get(&API_METHOD_READ_S3_CLIENT_CONFIG)
.put(&API_METHOD_UPDATE_S3_CLIENT_CONFIG)
- .delete(&API_METHOD_DELETE_S3_CLIENT_CONFIG);
+ .delete(&API_METHOD_DELETE_S3_CLIENT_CONFIG)
+ .subdirs(&[("list-buckets", &LIST_BUCKETS_ROUTER)]);
pub const ROUTER: Router = Router::new()
.get(&API_METHOD_LIST_S3_CLIENT_CONFIG)
--
2.47.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2025-07-31 12:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-31 12:58 [pbs-devel] [PATCH proxmox{, -backup} v4 00/10] s3: implement list buckets and use bucket selector for datastore creation Christian Ebner
2025-07-31 12:58 ` [pbs-devel] [PATCH proxmox v4 1/4] s3 client: restrict bucket template pattern to start of endpoint url Christian Ebner
2025-07-31 12:58 ` [pbs-devel] [PATCH proxmox v4 2/4] s3 client: make bucket name optional in S3 client options Christian Ebner
2025-07-31 12:58 ` [pbs-devel] [PATCH proxmox v4 3/4] s3 client: implement list buckets method Christian Ebner
2025-07-31 12:58 ` [pbs-devel] [PATCH proxmox v4 4/4] s3 client: api types: add bucket list item type Christian Ebner
2025-07-31 12:58 ` [pbs-devel] [PATCH proxmox-backup v4 1/6] ui: fix formatting issues using proxmox-biome Christian Ebner
2025-07-31 12:58 ` [pbs-devel] [PATCH proxmox-backup v4 2/6] datastore: wrap bucket name, as in is now optional in the s3 client Christian Ebner
2025-07-31 12:58 ` [pbs-devel] [PATCH proxmox-backup v4 3/6] api: admin s3: make store prefix for check command optional Christian Ebner
2025-07-31 12:58 ` Christian Ebner [this message]
2025-07-31 12:58 ` [pbs-devel] [PATCH proxmox-backup v4 5/6] bin: expose list buckets as proxmox-backup-manager s3 subcommand Christian Ebner
2025-07-31 12:59 ` [pbs-devel] [PATCH proxmox-backup v4 6/6] ui: replace bucket field by bucket selector Christian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250731125900.265494-9-c.ebner@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox