From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 2A57D1FF0A8 for ; Thu, 20 Aug 2026 16:52:38 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 3867A21621; Thu, 20 Aug 2026 16:52:32 +0200 (CEST) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Subject: [PATCH datacenter-manager v2 08/20] context: introduce a ContextFactory to build application context Date: Thu, 20 Aug 2026 16:52:08 +0200 Message-ID: <20260820145220.418032-9-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260820145220.418032-1-l.wagner@proxmox.com> References: <20260820145220.418032-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1787237518780 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.739 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 7BCU6IZYO2BINXP3VLGTLJA3GTUVNMCY X-Message-ID-Hash: 7BCU6IZYO2BINXP3VLGTLJA3GTUVNMCY 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 Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This makes it easier to selectively override behavior for the fake remote feature, as well as integration tests. Signed-off-by: Lukas Wagner --- 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 { + 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, Error> { + Ok(Arc::new(FakeClientFactory { + config: self.0.clone(), + })) + } + + fn make_remote_config(&self) -> Result, 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, Error> { + Ok(Arc::new(connection::DefaultClientFactory)) + } + + fn make_remote_config(&self) -> Result, Error> { + Ok(Box::new(pdm_config::remotes::DefaultRemoteConfig)) + } + + fn make_subscription_key_config( + &self, + ) -> Result, Error> { + Ok(Box::new( + pdm_config::subscriptions::DefaultSubscriptionKeyConfig, + )) + } +} + +fn context_factory() -> Result { + #[cfg(remote_config = "faked")] + { + faked_remotes::FakedRemoteContextFactory::new() + } + #[cfg(not(remote_config = "faked"))] + { + Ok(default::DefaultContextFactory) + } +} -- 2.47.3