public inbox for pdm-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Lukas Wagner <l.wagner@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [PATCH datacenter-manager 08/20] context: introduce a ContextFactory to build application context
Date: Mon, 17 Aug 2026 14:57:15 +0200	[thread overview]
Message-ID: <20260817125727.454039-9-l.wagner@proxmox.com> (raw)
In-Reply-To: <20260817125727.454039-1-l.wagner@proxmox.com>

This makes it easier to selectively override behavior for the fake
remote feature, as well as integration tests.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 server/src/context/default.rs       |  5 ++
 server/src/context/faked_remotes.rs | 42 ++++++++++++++++
 server/src/context/mod.rs           | 78 ++++++++++++++++-------------
 3 files changed, 90 insertions(+), 35 deletions(-)
 create mode 100644 server/src/context/default.rs
 create mode 100644 server/src/context/faked_remotes.rs

diff --git a/server/src/context/default.rs b/server/src/context/default.rs
new file mode 100644
index 00000000..e9c29e53
--- /dev/null
+++ b/server/src/context/default.rs
@@ -0,0 +1,5 @@
+use crate::context::ContextFactory;
+
+pub struct DefaultContextFactory;
+
+impl ContextFactory for DefaultContextFactory {}
diff --git a/server/src/context/faked_remotes.rs b/server/src/context/faked_remotes.rs
new file mode 100644
index 00000000..b2ae1c3f
--- /dev/null
+++ b/server/src/context/faked_remotes.rs
@@ -0,0 +1,42 @@
+use std::sync::Arc;
+
+use anyhow::{Context, Error};
+use pdm_config::remotes::RemoteConfig;
+
+use crate::connection::ClientFactory;
+use crate::context::ContextFactory;
+use crate::test_support::fake_remote::{FakeClientFactory, FakeRemoteConfig};
+
+pub struct FakedRemoteContextFactory(FakeRemoteConfig);
+
+impl FakedRemoteContextFactory {
+    pub fn new() -> Result<Self, Error> {
+        let path = std::env::var("PDM_FAKED_REMOTE_CONFIG").context(
+            "compiled with remote_config = 'faked', but PDM_FAKED_REMOTE_CONFIG not set",
+        )?;
+
+        log::info!("using fake remotes from {path:?}");
+        let config = FakeRemoteConfig::from_json_config(&path)
+            .context("could not deserialize fake remote config")?;
+
+        Ok(Self(config))
+    }
+}
+
+impl ContextFactory for FakedRemoteContextFactory {
+    fn make_client_factory(&self) -> Result<Arc<dyn ClientFactory + Send + Sync>, Error> {
+        Ok(Arc::new(FakeClientFactory {
+            config: self.0.clone(),
+        }))
+    }
+
+    fn make_remote_config(&self) -> Result<Box<dyn RemoteConfig + Send + Sync>, Error> {
+        Ok(Box::new(self.0.clone()))
+    }
+
+    // No need to override subscription_key_config_impl here.
+    //
+    // The subscription key pool is product-only (PDM stores its own pool of
+    // keys regardless of how remotes are mocked or not), so initialise it on
+    // both paths.
+}
diff --git a/server/src/context/mod.rs b/server/src/context/mod.rs
index a4afcddd..24d653c3 100644
--- a/server/src/context/mod.rs
+++ b/server/src/context/mod.rs
@@ -2,48 +2,56 @@
 //!
 //! Make sure to call `init` *once* when starting up the API server.
 
+use std::sync::Arc;
+
 use anyhow::Error;
+use pdm_config::{remotes::RemoteConfig, subscriptions::SubscriptionKeyConfig};
 
-use crate::connection;
+use crate::connection::{self, ClientFactory};
 
-/// Dependency-inject production remote-config implementation and remote client factory
-#[allow(dead_code)]
-fn default_remote_setup() {
-    pdm_config::remotes::init(Box::new(pdm_config::remotes::DefaultRemoteConfig));
-    connection::init(Box::new(connection::DefaultClientFactory));
-}
+#[cfg(remote_config = "faked")]
+mod faked_remotes;
+
+#[cfg(not(remote_config = "faked"))]
+mod default;
 
 /// Dependency-inject concrete implementations needed at runtime.
 pub fn init() -> Result<(), Error> {
-    // The subscription key pool is product-only (PDM stores its own pool of
-    // keys regardless of how remotes are mocked or not), so initialise it on
-    // both paths.
-    pdm_config::subscriptions::init(Box::new(
-        pdm_config::subscriptions::DefaultSubscriptionKeyConfig,
-    ));
+    let factory = context_factory()?;
 
-    #[cfg(remote_config = "faked")]
-    {
-        use anyhow::bail;
-
-        use crate::test_support::fake_remote;
-
-        match std::env::var("PDM_FAKED_REMOTE_CONFIG") {
-            Ok(path) => {
-                log::info!("using fake remotes from {path:?}");
-                let config = fake_remote::FakeRemoteConfig::from_json_config(&path)?;
-                pdm_config::remotes::init(Box::new(config.clone()));
-                connection::init(Box::new(fake_remote::FakeClientFactory { config }));
-            }
-            Err(_) => {
-                bail!("compiled with remote_config = 'faked', but PDM_FAKED_REMOTE_CONFIG not set")
-            }
-        }
-    }
-    #[cfg(not(remote_config = "faked"))]
-    {
-        default_remote_setup();
-    }
+    pdm_config::subscriptions::init(factory.make_subscription_key_config()?);
+    pdm_config::remotes::init(factory.make_remote_config()?);
+    // FIXME: Rather let connection use an Application context object from here
+    connection::init(Box::new(connection::DefaultClientFactory));
 
     Ok(())
 }
+
+pub trait ContextFactory {
+    fn make_client_factory(&self) -> Result<Arc<dyn ClientFactory + Send + Sync>, Error> {
+        Ok(Arc::new(connection::DefaultClientFactory))
+    }
+
+    fn make_remote_config(&self) -> Result<Box<dyn RemoteConfig + Send + Sync>, Error> {
+        Ok(Box::new(pdm_config::remotes::DefaultRemoteConfig))
+    }
+
+    fn make_subscription_key_config(
+        &self,
+    ) -> Result<Box<dyn SubscriptionKeyConfig + Send + Sync>, Error> {
+        Ok(Box::new(
+            pdm_config::subscriptions::DefaultSubscriptionKeyConfig,
+        ))
+    }
+}
+
+fn context_factory() -> Result<impl ContextFactory, Error> {
+    #[cfg(remote_config = "faked")]
+    {
+        faked_remotes::FakedRemoteContextFactory::new()
+    }
+    #[cfg(not(remote_config = "faked"))]
+    {
+        Ok(default::DefaultContextFactory)
+    }
+}
-- 
2.47.3





  parent reply	other threads:[~2026-08-17 12:57 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-17 12:57 [PATCH datacenter-manager/proxmox 00/20] inject application context via API macro for easier integration testing Lukas Wagner
2026-08-17 12:57 ` [PATCH proxmox 01/20] router: introduce shared state Lukas Wagner
2026-08-17 13:26   ` Lukas Wagner
2026-08-20 11:23   ` Lukas Wagner
2026-08-21 13:59   ` Robert Obkircher
2026-08-17 12:57 ` [PATCH proxmox 02/20] rest-server: allow to inject " Lukas Wagner
2026-08-17 12:57 ` [PATCH proxmox 03/20] api-macro: support shared state extraction type Lukas Wagner
2026-08-21 13:59   ` Robert Obkircher
2026-08-17 12:57 ` [PATCH datacenter-manager 04/20] context: promote context to a dir-style module Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 05/20] pdm-config: remotes: rename trait methods to read/write/lock Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 06/20] pdm-config: subscriptions: " Lukas Wagner
2026-08-21 14:00   ` Robert Obkircher
2026-08-17 12:57 ` [PATCH datacenter-manager 07/20] remote iterator: pass remote config reader explicitly Lukas Wagner
2026-08-17 12:57 ` Lukas Wagner [this message]
2026-08-17 12:57 ` [PATCH datacenter-manager 09/20] context: establish PdmApplication object Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 10/20] context: register PdmApplication in router Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 11/20] parallel fetcher: pass arguments to closure in a single type Lukas Wagner
2026-08-21 14:00   ` Robert Obkircher
2026-08-17 12:57 ` [PATCH datacenter-manager 12/20] parallel fetcher: support a custom client factory Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 13/20] api: sdn: use PdmApplication handle for accessing remotes Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 14/20] tests: add helpers for building API-handler-level integration tests Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 15/20] tests: add example tests for SDN API routes Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 16/20] api-cache: add wrapper type Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 17/20] context: provide api-cache on the app object Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 18/20] api: subscriptions: use PdmApplication instead of globals Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 19/20] pdm-config: subscriptions: drop unused accessor functions Lukas Wagner
2026-08-17 12:57 ` [PATCH datacenter-manager 20/20] tests: add example tests for remote subscription management Lukas Wagner
2026-08-20 14:54 ` superseded: [PATCH datacenter-manager/proxmox 00/20] inject application context via API macro for easier integration testing Lukas Wagner

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=20260817125727.454039-9-l.wagner@proxmox.com \
    --to=l.wagner@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal