adding IBEJI_HOME env var for loading the invehicle digital twin conf…

…ig file (#61) * adding IBEJI_HOME env var for loading the invehicle digital twin config file Signed-off-by: Leonardo Rossetti <[email protected]> * use common::utils to load config file Signed-off-by: Leonardo Rossetti <[email protected]> * IBEJI_HOME env var docs Signed-off-by: Leonardo Rossetti <[email protected]> * fix variable name and readme typo Signed-off-by: Leonardo Rossetti <[email protected]> * move environment variable instructions Signed-off-by: Leonardo Rossetti <[email protected]> * adding code block language Signed-off-by: Leonardo Rossetti <[email protected]> * remove unecessary let Signed-off-by: Leonardo Rossetti <[email protected]> * static analysis fix Signed-off-by: Leonardo Rossetti <[email protected]> --------- Signed-off-by: Leonardo Rossetti <[email protected]>
eclipse-ibeji · Oct 30, 2023 · 27dffdb · 27dffdb
1 parent 4203b2c
commit 27dffdb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -127,6 +127,16 @@ The demos use config files and we have provided a templated version of each conf
 - {repo-root-dir}/core/invehicle-digital-twin/template
 - {repo-root-dir}/samples/common/template
 
+Configuration files will be loaded from the current working directory by default
+but an `IBEJI_HOME` environment variable can be used to change the base configuration directory to a different one:
+
+```bash
+IBEJI_HOME=/etc/ibeji ./invehicle-digital-twin
+```
+
+The above example tells `invehicle-digital-twin` to load configuration files from `/etc/ibeji` instead of using
+the current working directory.
+
 Chariott may be used to discover the in-vehicle digital twin service.  We will discuss how to enable this feature.
 
 ### <a name="property-sample">Property Sample</a>

diff --git a/core/common/src/utils.rs b/core/common/src/utils.rs
@@ -16,6 +16,8 @@ use strum_macros::Display;
 use tokio::time::{sleep, Duration};
 use tonic::{Request, Status};
 
+const IBEJI_HOME_VAR_NAME: &str = "IBEJI_HOME";
+
 /// An identifier used when discovering a service through Chariott.
 #[derive(Debug, Deserialize)]
 pub struct ServiceIdentifier {
@@ -44,8 +46,14 @@ pub fn load_settings<T>(config_filename: &str) -> Result<T, ConfigError>
 where
     T: for<'de> serde::Deserialize<'de>,
 {
-    let config =
-        Config::builder().add_source(File::new(config_filename, FileFormat::Yaml)).build()?;
+    let config_filename_path = match std::env::var(IBEJI_HOME_VAR_NAME) {
+        Ok(s) => format!("{}/{}", s, config_filename),
+        _ => config_filename.to_owned(),
+    };
+
+    let config = Config::builder()
+        .add_source(File::new(config_filename_path.as_str(), FileFormat::Yaml))
+        .build()?;
 
     config.try_deserialize()
 }

diff --git a/core/invehicle-digital-twin/src/invehicle_digital_twin_config.rs b/core/invehicle-digital-twin/src/invehicle_digital_twin_config.rs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 // SPDX-License-Identifier: MIT
 
-use config::{Config, File, FileFormat};
+use common::utils;
 use serde_derive::Deserialize;
 
 const CONFIG_FILENAME: &str = "invehicle_digital_twin_settings";
@@ -15,10 +15,5 @@ pub struct Settings {
 
 /// Load the settings.
 pub fn load_settings() -> Settings {
-    let config =
-        Config::builder().add_source(File::new(CONFIG_FILENAME, FileFormat::Yaml)).build().unwrap();
-
-    let settings: Settings = config.try_deserialize().unwrap();
-
-    settings
+    utils::load_settings(CONFIG_FILENAME).unwrap()
 }