Remove all usages of TEdgeConfigRepository::new(config_location).load()

didier-wenzek · didier-wenzek · commit e77a5dfb64e7 · 2024-03-04T09:37:31.000+01:00
Signed-off-by: Didier Wenzek &lt;didier.wenzek@free.fr&gt;
diff --git a/crates/common/tedge_config/src/tedge_config_cli/tedge_config.rs b/crates/common/tedge_config/src/tedge_config_cli/tedge_config.rs
@@ -42,6 +42,7 @@ impl<T> OptionalConfigError<T> for OptionalConfig<T> {
     }
 }
 
+#[derive(Clone)]
 pub struct TEdgeConfig(TEdgeConfigReader);
 
 impl std::ops::Deref for TEdgeConfig {
diff --git a/crates/core/plugin_sm/src/plugin_manager.rs b/crates/core/plugin_sm/src/plugin_manager.rs
@@ -146,9 +146,8 @@ impl ExternalPlugins {
     pub fn load(&mut self) -> anyhow::Result<()> {
         self.plugin_map.clear();
 
-        let config = tedge_config::TEdgeConfigRepository::new(self.config_location.clone())
-            .load()
-            .map_err(|err| {
+        let config =
+            tedge_config::TEdgeConfig::new(self.config_location.clone()).map_err(|err| {
                 io::Error::new(
                     ErrorKind::Other,
                     format!("Failed to load tedge config: {}", err),
diff --git a/crates/core/plugin_sm/tests/plugin.rs b/crates/core/plugin_sm/tests/plugin.rs
@@ -59,7 +59,7 @@ mod tests {
         let tmpfile = make_config(100)?;
         let config_location =
             TEdgeConfigLocation::from_custom_root(tmpfile.path().to_str().unwrap());
-        let config = tedge_config::TEdgeConfigRepository::new(config_location).load()?;
+        let config = tedge_config::TEdgeConfig::new(config_location)?;
 
         let plugin = ExternalPluginCommand::new(
             "test",
diff --git a/crates/core/tedge/src/cli/certificate/cli.rs b/crates/core/tedge/src/cli/certificate/cli.rs
@@ -36,7 +36,7 @@ pub enum TEdgeCertCli {
 
 impl BuildCommand for TEdgeCertCli {
     fn build_command(self, context: BuildContext) -> Result<Box<dyn Command>, ConfigError> {
-        let config = context.config_repository.load()?;
+        let config = context.load_config()?;
 
         let cmd = match self {
             TEdgeCertCli::Create { id } => {
diff --git a/crates/core/tedge/src/cli/connect/cli.rs b/crates/core/tedge/src/cli/connect/cli.rs
@@ -41,21 +41,21 @@ impl BuildCommand for TEdgeConnectOpt {
         Ok(match self {
             TEdgeConnectOpt::C8y { is_test_connection } => ConnectCommand {
                 config_location: context.config_location.clone(),
-                config_repository: context.config_repository,
+                config: context.load_config()?,
                 cloud: Cloud::C8y,
                 is_test_connection,
                 service_manager: service_manager(&context.config_location.tedge_config_root_path)?,
             },
             TEdgeConnectOpt::Az { is_test_connection } => ConnectCommand {
                 config_location: context.config_location.clone(),
-                config_repository: context.config_repository,
+                config: context.load_config()?,
                 cloud: Cloud::Azure,
                 is_test_connection,
                 service_manager: service_manager(&context.config_location.tedge_config_root_path)?,
             },
             TEdgeConnectOpt::Aws { is_test_connection } => ConnectCommand {
                 config_location: context.config_location.clone(),
-                config_repository: context.config_repository,
+                config: context.load_config()?,
                 cloud: Cloud::Aws,
                 is_test_connection,
                 service_manager: service_manager(&context.config_location.tedge_config_root_path)?,
diff --git a/crates/core/tedge/src/cli/connect/command.rs b/crates/core/tedge/src/cli/connect/command.rs
@@ -38,7 +38,7 @@ const MQTT_TLS_PORT: u16 = 8883;
 
 pub struct ConnectCommand {
     pub config_location: TEdgeConfigLocation,
-    pub config_repository: TEdgeConfigRepository,
+    pub config: TEdgeConfig,
     pub cloud: Cloud,
     pub is_test_connection: bool,
     pub service_manager: Arc<dyn SystemServiceManager>,
@@ -59,13 +59,13 @@ impl Command for ConnectCommand {
     }
 
     fn execute(&self) -> anyhow::Result<()> {
-        let config = self.config_repository.load()?;
-        let bridge_config = bridge_config(&config, self.cloud)?;
-        let updated_mosquitto_config = CommonMosquittoConfig::from_tedge_config(&config);
+        let config = &self.config;
+        let bridge_config = bridge_config(config, self.cloud)?;
+        let updated_mosquitto_config = CommonMosquittoConfig::from_tedge_config(config);
 
         if self.is_test_connection {
             if self.check_if_bridge_exists(&bridge_config) {
-                return match self.check_connection(&config) {
+                return match self.check_connection(config) {
                     Ok(DeviceStatus::AlreadyExists) => {
                         let cloud = bridge_config.cloud_name;
                         println!("Connection check to {} cloud is successful.\n", cloud);
@@ -98,7 +98,7 @@ impl Command for ConnectCommand {
             Err(err) => return Err(err.into()),
         }
 
-        match self.check_connection(&config) {
+        match self.check_connection(config) {
             Ok(DeviceStatus::AlreadyExists) => {
                 println!("Connection check is successful.\n");
             }
@@ -124,7 +124,7 @@ impl Command for ConnectCommand {
 
         if let Cloud::C8y = self.cloud {
             check_connected_c8y_tenant_as_configured(
-                &config,
+                config,
                 &config
                     .c8y
                     .mqtt
diff --git a/crates/core/tedge/src/cli/init.rs b/crates/core/tedge/src/cli/init.rs
@@ -153,7 +153,7 @@ impl TEdgeInitCmd {
             PermissionEntry::new(Some("root".into()), Some("root".into()), Some(0o775)),
         )?;
 
-        let config = self.context.config_repository.load()?;
+        let config = self.context.load_config()?;
 
         create_directory(
             config.logs.path.clone(),
diff --git a/crates/core/tedge/src/cli/mqtt/cli.rs b/crates/core/tedge/src/cli/mqtt/cli.rs
@@ -44,7 +44,7 @@ pub enum TEdgeMqttCli {
 
 impl BuildCommand for TEdgeMqttCli {
     fn build_command(self, context: BuildContext) -> Result<Box<dyn Command>, crate::ConfigError> {
-        let config = context.config_repository.load()?;
+        let config = context.load_config()?;
         let auth_config = config.mqtt_client_auth_config();
 
         let cmd = {
diff --git a/crates/core/tedge/src/cli/reconnect/cli.rs b/crates/core/tedge/src/cli/reconnect/cli.rs
@@ -22,14 +22,14 @@ pub enum TEdgeReconnectCli {
 impl BuildCommand for TEdgeReconnectCli {
     fn build_command(self, context: BuildContext) -> Result<Box<dyn Command>, crate::ConfigError> {
         let config_location = context.config_location.clone();
-        let config_repository = context.config_repository;
+        let config = context.load_config()?;
         let service_manager = service_manager(&context.config_location.tedge_config_root_path)?;
         let common_mosquitto_config = CommonMosquittoConfig::default();
 
         let cmd = match self {
             TEdgeReconnectCli::C8y => ReconnectBridgeCommand {
                 config_location,
-                config_repository,
+                config,
                 service_manager,
                 common_mosquitto_config,
                 config_file: C8Y_CONFIG_FILENAME.into(),
@@ -39,7 +39,7 @@ impl BuildCommand for TEdgeReconnectCli {
             },
             TEdgeReconnectCli::Az => ReconnectBridgeCommand {
                 config_location,
-                config_repository,
+                config,
                 service_manager,
                 common_mosquitto_config,
                 config_file: AZURE_CONFIG_FILENAME.into(),
@@ -49,7 +49,7 @@ impl BuildCommand for TEdgeReconnectCli {
             },
             TEdgeReconnectCli::Aws => ReconnectBridgeCommand {
                 config_location,
-                config_repository,
+                config,
                 service_manager,
                 common_mosquitto_config,
                 config_file: AWS_CONFIG_FILENAME.into(),
diff --git a/crates/core/tedge/src/cli/reconnect/command.rs b/crates/core/tedge/src/cli/reconnect/command.rs
@@ -1,19 +1,17 @@
 use std::sync::Arc;
 
-use tedge_config::system_services::SystemServiceManager;
-use tedge_config::TEdgeConfigLocation;
-use tedge_config::TEdgeConfigRepository;
-
 use crate::bridge::CommonMosquittoConfig;
 use crate::cli::common::Cloud;
 use crate::cli::connect::ConnectCommand;
 use crate::cli::disconnect::disconnect_bridge::DisconnectBridgeCommand;
 use crate::command::Command;
+use tedge_config::system_services::SystemServiceManager;
+use tedge_config::TEdgeConfig;
+use tedge_config::TEdgeConfigLocation;
 
-#[derive(Debug)]
 pub struct ReconnectBridgeCommand {
     pub config_location: TEdgeConfigLocation,
-    pub config_repository: TEdgeConfigRepository,
+    pub config: TEdgeConfig,
     pub config_file: String,
     pub cloud: Cloud,
     pub common_mosquitto_config: CommonMosquittoConfig,
@@ -55,7 +53,7 @@ impl From<&ReconnectBridgeCommand> for ConnectCommand {
     fn from(reconnect_cmd: &ReconnectBridgeCommand) -> Self {
         ConnectCommand {
             config_location: reconnect_cmd.config_location.clone(),
-            config_repository: reconnect_cmd.config_repository.clone(),
+            config: reconnect_cmd.config.clone(),
             cloud: reconnect_cmd.cloud,
             is_test_connection: false,
             service_manager: reconnect_cmd.service_manager.clone(),
diff --git a/crates/core/tedge/src/cli/refresh_bridges.rs b/crates/core/tedge/src/cli/refresh_bridges.rs
@@ -53,7 +53,7 @@ impl Command for RefreshBridgesCmd {
 
 impl RefreshBridgesCmd {
     pub fn new(context: &BuildContext) -> Result<Self, crate::ConfigError> {
-        let config = context.config_repository.load()?;
+        let config = context.load_config()?;
         let config_location = context.config_location.clone();
         let service_manager = tedge_config::system_services::service_manager(
             &config_location.tedge_config_root_path,
diff --git a/crates/core/tedge/src/command.rs b/crates/core/tedge/src/command.rs
@@ -1,3 +1,5 @@
+use std::path::Path;
+
 /// A trait to be implemented by all tedge sub-commands.
 ///
 /// A command encapsulates all the required parameters and provides an `execute()` method
@@ -150,3 +152,17 @@ pub struct BuildContext {
     pub config_repository: tedge_config::TEdgeConfigRepository,
     pub config_location: tedge_config::TEdgeConfigLocation,
 }
+
+impl BuildContext {
+    pub fn new(config_dir: impl AsRef<Path>) -> Self {
+        let config_location = tedge_config::TEdgeConfigLocation::from_custom_root(config_dir);
+        BuildContext {
+            config_repository: tedge_config::TEdgeConfigRepository::new(config_location.clone()),
+            config_location,
+        }
+    }
+
+    pub fn load_config(&self) -> Result<tedge_config::TEdgeConfig, tedge_config::TEdgeConfigError> {
+        tedge_config::TEdgeConfig::new(self.config_location.clone())
+    }
+}
diff --git a/crates/core/tedge/src/main.rs b/crates/core/tedge/src/main.rs
@@ -57,15 +57,7 @@ fn main() -> anyhow::Result<()> {
         TEdgeOptMulticall::Tedge { cmd, config_dir } => {
             set_log_level(tracing::Level::WARN);
 
-            let tedge_config_location =
-                tedge_config::TEdgeConfigLocation::from_custom_root(config_dir);
-            let config_repository =
-                tedge_config::TEdgeConfigRepository::new(tedge_config_location.clone());
-
-            let build_context = BuildContext {
-                config_repository,
-                config_location: tedge_config_location,
-            };
+            let build_context = BuildContext::new(config_dir);
             let cmd = cmd
                 .build_command(build_context)
                 .with_context(|| "missing configuration parameter")?;
diff --git a/crates/core/tedge_agent/src/agent.rs b/crates/core/tedge_agent/src/agent.rs
@@ -90,9 +90,7 @@ impl AgentConfig {
         tedge_config_location: &tedge_config::TEdgeConfigLocation,
         cliopts: AgentOpt,
     ) -> Result<Self, anyhow::Error> {
-        let config_repository =
-            tedge_config::TEdgeConfigRepository::new(tedge_config_location.clone());
-        let tedge_config = config_repository.load()?;
+        let tedge_config = tedge_config::TEdgeConfig::new(tedge_config_location.clone())?;
 
         let config_dir = tedge_config_location.tedge_config_root_path.clone();
         let tmp_dir = Arc::from(tedge_config.tmp.path.as_path());
diff --git a/crates/core/tedge_agent/src/restart_manager/config.rs b/crates/core/tedge_agent/src/restart_manager/config.rs
@@ -14,9 +14,7 @@ impl RestartManagerConfig {
         device_topic_id: &EntityTopicId,
         tedge_config_location: &tedge_config::TEdgeConfigLocation,
     ) -> Result<RestartManagerConfig, tedge_config::TEdgeConfigError> {
-        let config_repository =
-            tedge_config::TEdgeConfigRepository::new(tedge_config_location.clone());
-        let tedge_config = config_repository.load()?;
+        let tedge_config = tedge_config::TEdgeConfig::new(tedge_config_location.clone())?;
 
         Ok(RestartManagerConfig {
             device_topic_id: device_topic_id.clone(),
diff --git a/crates/core/tedge_agent/src/software_manager/actor.rs b/crates/core/tedge_agent/src/software_manager/actor.rs
@@ -325,8 +325,7 @@ impl SoftwareManagerActor {
 fn get_default_plugin(
     config_location: &tedge_config::TEdgeConfigLocation,
 ) -> Result<Option<SoftwareType>, TEdgeConfigError> {
-    let config_repository = tedge_config::TEdgeConfigRepository::new(config_location.clone());
-    let tedge_config = config_repository.load()?;
+    let tedge_config = tedge_config::TEdgeConfig::new(config_location.clone())?;
 
     Ok(tedge_config
         .software
diff --git a/crates/core/tedge_agent/src/software_manager/config.rs b/crates/core/tedge_agent/src/software_manager/config.rs
@@ -17,10 +17,7 @@ impl SoftwareManagerConfig {
     pub fn from_tedge_config(
         tedge_config_location: &TEdgeConfigLocation,
     ) -> Result<SoftwareManagerConfig, tedge_config::TEdgeConfigError> {
-        let config_repository =
-            tedge_config::TEdgeConfigRepository::new(tedge_config_location.clone());
-        let tedge_config = config_repository.load()?;
-
+        let tedge_config = tedge_config::TEdgeConfig::new(tedge_config_location.clone())?;
         let config_dir = &tedge_config_location.tedge_config_root_path;
 
         let default_plugin_type = tedge_config
diff --git a/crates/core/tedge_agent/src/tedge_operation_converter/config.rs b/crates/core/tedge_agent/src/tedge_operation_converter/config.rs
@@ -16,9 +16,7 @@ impl OperationConfig {
         device_topic_id: &EntityTopicId,
         tedge_config_location: &tedge_config::TEdgeConfigLocation,
     ) -> Result<OperationConfig, tedge_config::TEdgeConfigError> {
-        let config_repository =
-            tedge_config::TEdgeConfigRepository::new(tedge_config_location.clone());
-        let tedge_config = config_repository.load()?;
+        let tedge_config = tedge_config::TEdgeConfig::new(tedge_config_location.clone())?;
 
         Ok(OperationConfig {
             mqtt_schema: MqttSchema::with_root(tedge_config.mqtt.topic_root.clone()),
diff --git a/crates/core/tedge_mapper/src/core/component.rs b/crates/core/tedge_mapper/src/core/component.rs
@@ -8,9 +8,8 @@ pub trait TEdgeComponent: Sync + Send {
     async fn start(&self, tedge_config: TEdgeConfig, cfg_dir: &Path) -> Result<(), anyhow::Error>;
 
     fn mqtt_config(&self) -> Result<mqtt_channel::Config, anyhow::Error> {
-        let config_repository =
-            tedge_config::TEdgeConfigRepository::new(tedge_config::TEdgeConfigLocation::default());
-        let tedge_config = config_repository.load()?;
+        let tedge_config =
+            tedge_config::TEdgeConfig::new(tedge_config::TEdgeConfigLocation::default())?;
 
         let mqtt_config = tedge_config
             .mqtt_config()?
diff --git a/crates/core/tedge_mapper/src/lib.rs b/crates/core/tedge_mapper/src/lib.rs
@@ -85,7 +85,7 @@ pub async fn run(mapper_opt: MapperOpt) -> anyhow::Result<()> {
 
     let tedge_config_location =
         tedge_config::TEdgeConfigLocation::from_custom_root(&mapper_opt.config_dir);
-    let config = tedge_config::TEdgeConfigRepository::new(tedge_config_location.clone()).load()?;
+    let config = tedge_config::TEdgeConfig::new(tedge_config_location.clone())?;
 
     let log_level = if mapper_opt.debug {
         tracing::Level::DEBUG
diff --git a/crates/core/tedge_watchdog/src/systemd_watchdog.rs b/crates/core/tedge_watchdog/src/systemd_watchdog.rs
@@ -79,11 +79,10 @@ async fn start_watchdog_for_self() -> Result<(), WatchdogError> {
 }
 
 async fn start_watchdog_for_tedge_services(tedge_config_dir: PathBuf) {
-    // let tedge_config_location = tedge_config::TEdgeConfigLocation::from_custom_root(&config_dir);
     let tedge_config_location =
-        tedge_config::TEdgeConfigLocation::from_custom_root(tedge_config_dir.clone());
-    let config_repository = tedge_config::TEdgeConfigRepository::new(tedge_config_location.clone());
-    let tedge_config = config_repository.load().expect("Could not load config");
+        tedge_config::TEdgeConfigLocation::from_custom_root(&tedge_config_dir);
+    let tedge_config = tedge_config::TEdgeConfig::new(tedge_config_location.clone())
+        .expect("Could not load config");
 
     let mqtt_topic_root = tedge_config.mqtt.topic_root.clone();
     let mqtt_schema = MqttSchema::with_root(mqtt_topic_root);
@@ -157,8 +156,7 @@ async fn monitor_tedge_service(
     res_topic: Topic,
     interval: u64,
 ) -> Result<(), WatchdogError> {
-    let config_repository = tedge_config::TEdgeConfigRepository::new(tedge_config_location);
-    let tedge_config = config_repository.load()?;
+    let tedge_config = tedge_config::TEdgeConfig::new(tedge_config_location)?;
 
     let mqtt_device_topic_id: EntityTopicId = tedge_config
         .mqtt
diff --git a/plugins/c8y_firmware_plugin/src/lib.rs b/plugins/c8y_firmware_plugin/src/lib.rs
@@ -66,8 +66,7 @@ pub async fn run(firmware_plugin_opt: FirmwarePluginOpt) -> Result<(), anyhow::E
 
     set_log_level(log_level);
 
-    let config_repository = tedge_config::TEdgeConfigRepository::new(tedge_config_location.clone());
-    let tedge_config = config_repository.load()?;
+    let tedge_config = tedge_config::TEdgeConfig::new(tedge_config_location)?;
 
     if firmware_plugin_opt.init {
         warn!("This --init option has been deprecated and will be removed in a future release");
diff --git a/plugins/c8y_remote_access_plugin/src/lib.rs b/plugins/c8y_remote_access_plugin/src/lib.rs
@@ -12,7 +12,6 @@ use miette::miette;
 use miette::Context;
 use miette::IntoDiagnostic;
 use tedge_config::TEdgeConfig;
-use tedge_config::TEdgeConfigRepository;
 use tedge_utils::file::create_directory_with_user_group;
 use tedge_utils::file::create_file_with_user_group;
 use tokio::io::AsyncBufReadExt;
@@ -32,8 +31,7 @@ mod proxy;
 pub async fn run(opt: C8yRemoteAccessPluginOpt) -> miette::Result<()> {
     let config_dir = opt.get_config_location();
 
-    let tedge_config = TEdgeConfigRepository::new(config_dir.clone())
-        .load()
+    let tedge_config = TEdgeConfig::new(config_dir.clone())
         .into_diagnostic()
         .context("Reading tedge config")?;
 
diff --git a/plugins/tedge_apt_plugin/src/lib.rs b/plugins/tedge_apt_plugin/src/lib.rs
@@ -14,7 +14,6 @@ use std::process::Stdio;
 use tedge_config::AptConfig;
 use tedge_config::TEdgeConfig;
 use tedge_config::TEdgeConfigLocation;
-use tedge_config::TEdgeConfigRepository;
 use tedge_config::DEFAULT_TEDGE_CONFIG_PATH;
 
 #[derive(clap::Parser, Debug)]
@@ -329,7 +328,7 @@ fn get_name_and_version(line: &str) -> (&str, &str) {
 fn get_config(config_dir: PathBuf) -> Option<TEdgeConfig> {
     let tedge_config_location = TEdgeConfigLocation::from_custom_root(config_dir);
 
-    match TEdgeConfigRepository::new(tedge_config_location).load() {
+    match TEdgeConfig::new(tedge_config_location) {
         Ok(config) => Some(config),
         Err(err) => {
             warn!("Failed to load TEdgeConfig: {}", err);

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ impl<T> OptionalConfigError<T> for OptionalConfig<T> {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
	`45`	`+#[derive(Clone)]`
`45`	`46`	`pub struct TEdgeConfig(TEdgeConfigReader);`
`46`	`47`
`47`	`48`	`impl std::ops::Deref for TEdgeConfig {`