[pdm-devel] [PATCH datacenter-manager v2 09/13] remote updates: add support for PBS remotes

[Lukas Wagner <l.wagner@proxmox.com>]

The 'update_apt_database' function starts a new tracked remote task. The
remote task infrastructure needs a bit more work to work with PBS UPIDs,
so the code is commented out for now.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Shannon Sterz <s.sterz@proxmox.com>
Tested-by: Shannon Sterz <s.sterz@proxmox.com>
---
 server/src/api/pbs/mod.rs    | 15 ++++++++++++++-
 server/src/remote_updates.rs | 37 +++++++++++++++++++++++++++++++-----
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/server/src/api/pbs/mod.rs b/server/src/api/pbs/mod.rs
index ad82ab38..56192c01 100644
--- a/server/src/api/pbs/mod.rs
+++ b/server/src/api/pbs/mod.rs
@@ -9,13 +9,17 @@ use proxmox_sortable_macro::sortable;
 use pdm_api_types::remotes::{
     NodeUrl, Remote, RemoteListEntry, RemoteType, TlsProbeOutcome, REMOTE_ID_SCHEMA,
 };
-use pdm_api_types::{Authid, HOST_OPTIONAL_PORT_FORMAT, PRIV_RESOURCE_AUDIT, PRIV_SYS_MODIFY};
+use pdm_api_types::{
+    Authid, RemoteUpid, HOST_OPTIONAL_PORT_FORMAT, PRIV_RESOURCE_AUDIT, PRIV_SYS_MODIFY,
+};
 
 use crate::{
     connection::{self, probe_tls_connection},
     pbs_client::{self, get_remote, PbsClient},
 };
 
+use crate::remote_tasks;
+
 mod rrddata;
 
 pub const ROUTER: Router = Router::new()
@@ -65,6 +69,15 @@ const DATASTORE_ITEM_SUBDIRS: SubdirMap = &sorted!([
     ),
 ]);
 
+// converts a remote + pbs_api_types::UPID into a RemoteUpid and starts tracking it
+pub async fn new_remote_upid(
+    remote: String,
+    upid: pbs_api_types::UPID,
+) -> Result<RemoteUpid, Error> {
+    let remote_upid = remote_tasks::track_running_pbs_task(remote, upid).await?;
+    Ok(remote_upid)
+}
+
 #[api(
     returns: {
         type: Array,
diff --git a/server/src/remote_updates.rs b/server/src/remote_updates.rs
index ab5845bd..4c70495b 100644
--- a/server/src/remote_updates.rs
+++ b/server/src/remote_updates.rs
@@ -14,7 +14,6 @@ use pdm_api_types::remotes::{Remote, RemoteType};
 use pdm_api_types::RemoteUpid;
 use pdm_buildcfg::PDM_CACHE_DIR_M;
 
-use crate::api::pve::new_remote_upid;
 use crate::connection;
 use crate::parallel_fetcher::{NodeResults, ParallelFetcher};
 
@@ -64,9 +63,22 @@ pub async fn update_apt_database(remote: &Remote, node: &str) -> Result<RemoteUp
             };
             let upid = client.update_apt_database(node, params).await?;
 
-            new_remote_upid(remote.id.clone(), upid).await
+            crate::api::pve::new_remote_upid(remote.id.clone(), upid).await
+        }
+        RemoteType::Pbs => {
+            // let client = connection::make_pbs_client(remote)?;
+            //
+            // let params = crate::pbs_client::AptUpdateParams {
+            //     notify: Some(false),
+            //     quiet: Some(false),
+            // };
+            // let upid = client.update_apt_database(params).await?;
+            //
+            // crate::api::pbs::new_remote_upid(remote.id.clone(), upid).await
+            // TODO: task infrastructure for PBS not finished yet, uncomment once
+            // this is done.
+            bail!("PBS is not supported yet");
         }
-        RemoteType::Pbs => bail!("PBS is not supported yet"),
     }
 }
 
@@ -81,7 +93,14 @@ pub async fn get_changelog(remote: Remote, node: &str, package: String) -> Resul
                 .await
                 .map_err(Into::into)
         }
-        RemoteType::Pbs => bail!("PBS is not supported yet"),
+        RemoteType::Pbs => {
+            let client = connection::make_pbs_client(&remote)?;
+
+            client
+                .get_package_changelog(package, None)
+                .await
+                .map_err(Into::into)
+        }
     }
 }
 
@@ -249,7 +268,15 @@ async fn fetch_available_updates(
                 updates,
             })
         }
-        RemoteType::Pbs => bail!("PBS is not supported yet"),
+        RemoteType::Pbs => {
+            let client = connection::make_pbs_client(&remote)?;
+            let updates = client.list_available_updates().await?;
+
+            Ok(NodeUpdateInfo {
+                last_refresh: proxmox_time::epoch_i64(),
+                updates,
+            })
+        }
     }
 }
 
-- 
2.47.3



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel