Deprecate tedge_config::get_new_tedge_config and load_tedge_config

Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>

Author: didier-wenzek

crates/common/tedge_config/src/lib.rs

@@ -14,14 +14,13 @@ pub use certificate::CertificateError;
 pub use tedge_config_macros::all_or_nothing;
 pub use tedge_config_macros::OptionalConfig;
 
-/// loads the new tedge config from system default
-pub fn get_new_tedge_config() -> Result<TEdgeConfig, TEdgeConfigError> {
-    let tedge_config_location = TEdgeConfigLocation::default();
-    TEdgeConfigRepository::new(tedge_config_location).load()
-}
+impl TEdgeConfig {
+    pub fn new(config_location: TEdgeConfigLocation) -> Result<Self, TEdgeConfigError> {
+        TEdgeConfigRepository::new(config_location).load()
+    }
 
-/// loads the tedge config from a config directory
-pub fn load_tedge_config(config_dir: &Path) -> Result<TEdgeConfig, TEdgeConfigError> {
-    let tedge_config_location = TEdgeConfigLocation::from_custom_root(config_dir);
-    TEdgeConfigRepository::new(tedge_config_location).load()
+    pub fn load(config_dir: &Path) -> Result<TEdgeConfig, TEdgeConfigError> {
+        let config_location = TEdgeConfigLocation::from_custom_root(config_dir);
+        TEdgeConfig::new(config_location)
+    }
 }

crates/core/tedge/src/cli/certificate/upload.rs

@@ -6,8 +6,9 @@ use reqwest::StatusCode;
 use reqwest::Url;
 use std::io::prelude::*;
 use std::path::Path;
-use tedge_config::get_new_tedge_config;
 use tedge_config::HostPort;
+use tedge_config::TEdgeConfig;
+use tedge_config::TEdgeConfigLocation;
 use tedge_config::HTTPS_PORT;
 
 #[derive(Debug, serde::Deserialize)]
@@ -50,7 +51,7 @@ impl UploadCertCmd {
             Err(_) => rpassword::read_password_from_tty(Some("Enter password: "))?,
         };
 
-        let config = get_new_tedge_config()?;
+        let config = TEdgeConfig::new(TEdgeConfigLocation::default())?;
         let root_cert = &config.c8y.root_cert_path;
         let client_builder = reqwest::blocking::Client::builder();
         let res = match std::fs::metadata(root_cert) {

crates/core/tedge/src/main.rs

@@ -30,14 +30,14 @@ fn main() -> anyhow::Result<()> {
     let opt = parse_multicall_if_known(&executable_name);
     match opt {
         TEdgeOptMulticall::Component(Component::TedgeMapper(opt)) => {
-            let tedge_config = tedge_config::load_tedge_config(&opt.config_dir)?;
+            let tedge_config = tedge_config::TEdgeConfig::load(&opt.config_dir)?;
             block_on_with(
                 tedge_config.run.log_memory_interval.duration(),
                 tedge_mapper::run(opt),
             )
         }
         TEdgeOptMulticall::Component(Component::TedgeAgent(opt)) => {
-            let tedge_config = tedge_config::load_tedge_config(&opt.config_dir)?;
+            let tedge_config = tedge_config::TEdgeConfig::load(&opt.config_dir)?;
             block_on_with(
                 tedge_config.run.log_memory_interval.duration(),
                 tedge_agent::run(opt),

crates/extensions/c8y_http_proxy/src/lib.rs

@@ -18,7 +18,7 @@ use tedge_actors::ServerMessageBoxBuilder;
 use tedge_actors::ServiceProvider;
 use tedge_config::ConfigNotSet;
 use tedge_config::ReadError;
-use tedge_config::TEdgeConfig as NewTEdgeConfig;
+use tedge_config::TEdgeConfig;
 use tedge_http_ext::HttpRequest;
 use tedge_http_ext::HttpResult;
 
@@ -40,10 +40,10 @@ pub struct C8YHttpConfig {
     retry_interval: Duration,
 }
 
-impl TryFrom<&NewTEdgeConfig> for C8YHttpConfig {
+impl TryFrom<&TEdgeConfig> for C8YHttpConfig {
     type Error = C8yHttpConfigBuildError;
 
-    fn try_from(tedge_config: &NewTEdgeConfig) -> Result<Self, Self::Error> {
+    fn try_from(tedge_config: &TEdgeConfig) -> Result<Self, Self::Error> {
         let c8y_host = tedge_config.c8y.http.or_config_not_set()?.to_string();
         let device_id = tedge_config.device.id.try_read(tedge_config)?.to_string();
         let tmp_dir = tedge_config.tmp.path.as_std_path().to_path_buf();