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 784B81FF141 for ; Mon, 13 Apr 2026 15:37:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7CC2926D15; Mon, 13 Apr 2026 15:38:30 +0200 (CEST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Mon, 13 Apr 2026 15:37:55 +0200 Message-Id: Subject: Re: [PATCH pve-storage 7/7] api: add /nodes//storage//instance-id route From: "Lukas Wagner" To: "Shannon Sterz" , "Lukas Wagner" , , X-Mailer: aerc 0.21.0-0-g5549850facc2-dirty References: <20260413121057.371772-1-l.wagner@proxmox.com> <20260413121057.371772-8-l.wagner@proxmox.com> In-Reply-To: X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776087401657 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 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 POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 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.001 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 0.001 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [status.pm] Message-ID-Hash: YZXLF7RG2VTUQ4B76Z554OSQ7OWE2HCR X-Message-ID-Hash: YZXLF7RG2VTUQ4B76Z554OSQ7OWE2HCR 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 Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Mon Apr 13, 2026 at 3:26 PM CEST, Shannon Sterz wrote: > On Mon Apr 13, 2026 at 2:10 PM CEST, Lukas Wagner wrote: >> This API allows us to retrieve the instance ID of PBS storages. This is >> useful to establish a mapping between PBS storage and PBS remotes in >> PDM. >> >> Signed-off-by: Lukas Wagner >> --- >> >> Notes: >> Maybe we want to make this more general and just call it /id or >> something, in case we want to use a similar mechanism for other stor= age >> types as well? >> >> Also could make sense to cache the response. >> >> src/PVE/API2/Storage/Status.pm | 50 +++++++++++++++++++++++++++++++++- >> 1 file changed, 49 insertions(+), 1 deletion(-) >> >> diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Statu= s.pm >> index 8225c3a..52aa673 100644 >> --- a/src/PVE/API2/Storage/Status.pm >> +++ b/src/PVE/API2/Storage/Status.pm >> @@ -14,7 +14,7 @@ use PVE::JSONSchema qw(get_standard_option); >> use PVE::RESTHandler; >> use PVE::RPCEnvironment; >> use PVE::RRD; >> -use PVE::Tools qw(run_command); >> +use PVE::Tools qw(run_command extract_param); >> >> use PVE::API2::Storage::Content; >> use PVE::API2::Storage::FileRestore; >> @@ -308,6 +308,7 @@ __PACKAGE__->register_method({ >> { subdir =3D> 'download-url' }, >> { subdir =3D> 'file-restore' }, >> { subdir =3D> 'import-metadata' }, >> + { subdir =3D> 'instance-id' }, >> { subdir =3D> 'oci-registry-pull' }, >> { subdir =3D> 'prunebackups' }, >> { subdir =3D> 'rrd' }, >> @@ -1118,4 +1119,51 @@ __PACKAGE__->register_method({ >> }, >> }); >> >> +__PACKAGE__->register_method({ >> + name =3D> 'instance_id', >> + path =3D> '{storage}/instance-id', >> + method =3D> 'GET', >> + description =3D> "Return unique storage instance ID (PBS only)", >> + permissions =3D> { >> + check =3D> ['perm', '/storage/{storage}', ['Datastore.Audit']], >> + }, >> + protected =3D> 1, >> + proxyto =3D> 'node', >> + parameters =3D> { >> + additionalProperties =3D> 0, >> + properties =3D> { >> + node =3D> get_standard_option('pve-node'), >> + storage =3D> get_standard_option('pve-storage-id'), >> + }, >> + }, >> + returns =3D> { >> + type =3D> "object", >> + properties =3D> { >> + 'instance-id' =3D> { >> + type =3D> 'string', >> + description =3D> 'Unique instance ID', >> + }, >> + }, >> + }, >> + code =3D> sub { >> + my ($param) =3D @_; >> + >> + my $rpcenv =3D PVE::RPCEnvironment::get(); >> + my $user =3D $rpcenv->get_user(); > > sorry if im missing something, but are these two lines a copy-paste > mistake or do you rely on a side-effect of `get_user()` here (i.e. > making sure that this function is called in an `RPCEnvironment` with a > set user)? > argh yeah, sorry - I copied the handler from somewhere else and forgot to clean this part out! Thanks! :) >> + my $storeid =3D extract_param($param, 'storage'); >> + >> + my $cfg =3D PVE::Storage::config(); >> + my $scfg =3D PVE::Storage::storage_config($cfg, $storeid); >> + >> + raise_param_exc({ 'storage' =3D> "Only PBS storages supported."= }) >> + if $scfg->{type} ne 'pbs'; >> + >> + my $client =3D PVE::PBSClient->new($scfg, $storeid); >> + my $ret =3D $client->get_instance_id(); >> + >> + return $ret; >> + }, >> +}); >> + >> 1;