From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH datacenter-manager 3/8] server: api: subscription: add remote type to subscription info
Date: Mon, 1 Dec 2025 11:39:05 +0100 [thread overview]
Message-ID: <20251201103917.1357369-6-d.csapak@proxmox.com> (raw)
In-Reply-To: <20251201103917.1357369-1-d.csapak@proxmox.com>
so we can differentiate between pbs and pve for the subscription check.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
lib/pdm-api-types/src/subscription.rs | 5 +++++
server/src/api/resources.rs | 1 +
2 files changed, 6 insertions(+)
diff --git a/lib/pdm-api-types/src/subscription.rs b/lib/pdm-api-types/src/subscription.rs
index 35910bc7..285aba56 100644
--- a/lib/pdm-api-types/src/subscription.rs
+++ b/lib/pdm-api-types/src/subscription.rs
@@ -6,6 +6,8 @@ use serde::{Deserialize, Serialize};
use proxmox_schema::api;
use proxmox_subscription::SubscriptionStatus;
+use crate::remotes::RemoteType;
+
#[api]
// order is important here, since we use that for determining if a node has a valid subscription
#[derive(Default, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
@@ -129,6 +131,9 @@ pub struct RemoteSubscriptions {
/// Remote name
pub remote: String,
+ /// Remote type
+ pub remote_type: RemoteType,
+
/// Any error that occurred when querying remote resources
#[serde(skip_serializing_if = "Option::is_none")]
pub error: Option<String>,
diff --git a/server/src/api/resources.rs b/server/src/api/resources.rs
index 6fd96b64..ec4fdc4a 100644
--- a/server/src/api/resources.rs
+++ b/server/src/api/resources.rs
@@ -672,6 +672,7 @@ pub async fn get_subscription_status(
Some(RemoteSubscriptions {
remote: remote_name,
+ remote_type: remote.ty,
error,
state,
node_status: if verbose { node_status } else { None },
--
2.47.3
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
next prev parent reply other threads:[~2025-12-01 10:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-01 10:39 [pdm-devel] [PATCH datacenter-manager/yew-comp 00/10] add subscription checks to apt repository updates & login Dominik Csapak
2025-12-01 10:39 ` [pdm-devel] [PATCH yew-comp 1/2] subscription: refactor api subscription check for showing the alert Dominik Csapak
2025-12-01 10:39 ` [pdm-devel] [PATCH yew-comp 2/2] apt package manager: add optional subscription check on 'Refresh' button Dominik Csapak
2025-12-01 10:39 ` [pdm-devel] [PATCH datacenter-manager 1/8] server: api: subscription: fix permission check Dominik Csapak
2025-12-01 10:39 ` [pdm-devel] [PATCH datacenter-manager 2/8] server: api: subscription: include basic info about remotes without permissions Dominik Csapak
2025-12-01 10:39 ` Dominik Csapak [this message]
2025-12-01 10:39 ` [pdm-devel] [PATCH datacenter-manager 4/8] ui: login: enable subscription check Dominik Csapak
2025-12-01 10:39 ` [pdm-devel] [PATCH datacenter-manager 5/8] server: api: pve/pbs: node: add subscription api call Dominik Csapak
2025-12-01 10:39 ` [pdm-devel] [PATCH datacenter-manager 6/8] ui: pve/pbs: updates: add subscription_url Dominik Csapak
2025-12-01 10:39 ` [pdm-devel] [PATCH datacenter-manager 7/8] ui: refactor check_subscription into lib Dominik Csapak
2025-12-01 10:39 ` [pdm-devel] [PATCH datacenter-manager 8/8] ui: remote updates: add subscription check on 'Refresh all' Dominik Csapak
2025-12-01 13:54 ` [pdm-devel] superseded: [PATCH datacenter-manager/yew-comp 00/10] add subscription checks to apt repository updates & login Dominik Csapak
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=20251201103917.1357369-6-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pdm-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