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 5E0AD1FF140 for ; Fri, 24 Apr 2026 10:30:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8E766DA94; Fri, 24 Apr 2026 10:29:55 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v2 4/9] client: add 'server-identity' sub-command Date: Fri, 24 Apr 2026 10:29:38 +0200 Message-ID: <20260424082943.89614-5-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260424082943.89614-1-l.wagner@proxmox.com> References: <20260424082943.89614-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1777019297673 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.054 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs] Message-ID-Hash: HBEOVJSEV3ARQOTEAJ6CCRPXGKO2AV2K X-Message-ID-Hash: HBEOVJSEV3ARQOTEAJ6CCRPXGKO2AV2K X-MailFrom: l.wagner@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 VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This allows users to query the pbs-instance-id from the proxmox-backup-client tool. This will also be used by the PBS client in PVE to lookup the pbs-instance-id from a yet to be introduced API endpoint that returns the pbs-instance-id for a given PBS storage. Signed-off-by: Lukas Wagner --- proxmox-backup-client/src/main.rs | 42 +++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 7e63b63c0..1c1ad9a0f 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -26,8 +26,8 @@ use pxar::accessor::{MaybeReady, ReadAt, ReadAtOperation}; use pbs_api_types::{ ArchiveType, Authid, BackupArchiveName, BackupDir, BackupGroup, BackupNamespace, BackupPart, BackupType, ClientRateLimitConfig, CryptMode, Fingerprint, GroupListItem, PathPattern, - PruneJobOptions, PruneListItem, RateLimitConfig, SnapshotListItem, StorageStatus, - BACKUP_ID_SCHEMA, BACKUP_TIME_SCHEMA, BACKUP_TYPE_SCHEMA, CATALOG_NAME, + PruneJobOptions, PruneListItem, RateLimitConfig, ServerIdentity, SnapshotListItem, + StorageStatus, BACKUP_ID_SCHEMA, BACKUP_TIME_SCHEMA, BACKUP_TYPE_SCHEMA, CATALOG_NAME, ENCRYPTED_KEY_BLOB_NAME, MANIFEST_BLOB_NAME, }; use pbs_client::catalog_shell::Shell; @@ -140,6 +140,40 @@ fn record_repository(repo: &BackupRepository) { ); } +#[api( + input: { + properties: { + repo: { + type: BackupRepositoryArgs, + flatten: true, + }, + "output-format": { + schema: OUTPUT_FORMAT, + optional: true, + }, + }, + }, +)] +/// Return the server identity information for this Proxmox Backup Server. +async fn get_server_identity(param: Value) -> Result { + let repo = extract_repository_from_value(¶m)?; + let output_format = get_output_format(¶m); + let client = connect(&repo)?; + + let mut result = client + .get("api2/json/nodes/localhost/identity", None) + .await?; + + let id: ServerIdentity = serde_json::from_value(result["data"].take())?; + + if output_format == "text" { + println!("pbs-instance-id: {}", id.pbs_instance_id); + } else { + format_and_print_result(&id, &output_format); + } + Ok(Value::Null) +} + async fn api_datastore_list_snapshots( client: &HttpClient, store: &str, @@ -2054,6 +2088,9 @@ fn main() { let version_cmd_def = CliCommand::new(&API_METHOD_API_VERSION).completion_cb("repository", complete_repository); + let server_identity_cmd_def = CliCommand::new(&API_METHOD_GET_SERVER_IDENTITY) + .completion_cb("repository", complete_repository); + let change_owner_cmd_def = CliCommand::new(&API_METHOD_CHANGE_BACKUP_OWNER) .arg_param(&["group", "new-owner"]) .completion_cb("ns", complete_namespace) @@ -2064,6 +2101,7 @@ fn main() { let cmd_def = CliCommandMap::new() .insert("backup", backup_cmd_def) .insert("garbage-collect", garbage_collect_cmd_def) + .insert("server-identity", server_identity_cmd_def) .insert("list", list_cmd_def) .insert("login", login_cmd_def) .insert("logout", logout_cmd_def) -- 2.47.3