[pdm-devel] [PATCH datacenter-manager 1/3] server: adapt to proxmox-client compat mode changes

[Christian Ebner <c.ebner@proxmox.com>]

Adapt to the method name and type changes for setting the client
login compatibility mode.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 server/src/connection.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/server/src/connection.rs b/server/src/connection.rs
index 2eda452..5530812 100644
--- a/server/src/connection.rs
+++ b/server/src/connection.rs
@@ -19,7 +19,9 @@ use openssl::x509::X509StoreContextRef;
 use serde::Serialize;
 
 use proxmox_acme_api::CertificateInfo;
-use proxmox_client::{Client, HttpApiClient, HttpApiResponse, HttpApiResponseStream, TlsOptions};
+use proxmox_client::{
+    Client, CompatMode, HttpApiClient, HttpApiResponse, HttpApiResponseStream, TlsOptions,
+};
 
 use pdm_api_types::remotes::{NodeUrl, Remote, RemoteType, TlsProbeOutcome};
 use pve_api_types::client::PveClientImpl;
@@ -32,21 +34,21 @@ static INSTANCE: OnceLock<Box<dyn ClientFactory + Send + Sync>> = OnceLock::new(
 struct ConnectInfo {
     prefix: String,
     perl_compat: bool,
-    pve_compat: bool,
+    compat_mode: CompatMode,
     default_port: u16,
 }
 
 impl ConnectInfo {
     fn for_remote(remote: &Remote) -> Self {
-        let (prefix, perl_compat, pve_compat) = match remote.ty {
-            RemoteType::Pve => ("PVEAPIToken".to_string(), true, true),
-            RemoteType::Pbs => ("PBSAPIToken".to_string(), false, false),
+        let (prefix, perl_compat, compat_mode) = match remote.ty {
+            RemoteType::Pve => ("PVEAPIToken".to_string(), true, CompatMode::PveTfa),
+            RemoteType::Pbs => ("PBSAPIToken".to_string(), false, CompatMode::Generic),
         };
 
         ConnectInfo {
             prefix,
             perl_compat,
-            pve_compat,
+            compat_mode,
             default_port: remote.ty.default_port(),
         }
     }
@@ -56,7 +58,7 @@ impl ConnectInfo {
 fn prepare_connect_client_to_node(
     node: &NodeUrl,
     default_port: u16,
-    pve_compat: bool,
+    compat_mode: CompatMode,
 ) -> Result<Client, Error> {
     let mut options = TlsOptions::default();
 
@@ -75,7 +77,7 @@ fn prepare_connect_client_to_node(
 
     let mut client =
         proxmox_client::Client::with_options(uri.clone(), options, Default::default())?;
-    client.set_pve_compatibility(pve_compat);
+    client.set_compatibility(compat_mode);
     Ok(client)
 }
 
@@ -99,7 +101,7 @@ fn prepare_connect_client(
 
     let info = ConnectInfo::for_remote(remote);
 
-    let client = prepare_connect_client_to_node(node, info.default_port, info.pve_compat)?;
+    let client = prepare_connect_client_to_node(node, info.default_port, info.compat_mode)?;
 
     Ok((client, info))
 }
@@ -135,7 +137,7 @@ fn prepare_connect_multi_client(remote: &Remote) -> Result<(MultiClient, Connect
             client: Arc::new(prepare_connect_client_to_node(
                 node,
                 info.default_port,
-                info.pve_compat,
+                info.compat_mode,
             )?),
             hostname: node.hostname.clone(),
         });
-- 
2.47.3



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