Refactor config reading to function

Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>

Author: nuclearcat

src/azure.rs

@@ -10,7 +10,7 @@ impl AzureDriver {
     }
 }
 
-use crate::{Args, ReceivedFile};
+use crate::{Args, ReceivedFile, get_config_content};
 use axum::http::{HeaderName, HeaderValue};
 use azure_storage::StorageCredentials;
 use azure_storage_blobs::prelude::{BlobBlockType, BlockId, BlockList, ClientBuilder, Tags};
@@ -41,13 +41,7 @@ struct AzureConfig {
 
 /// Get Azure credentials from config.toml
 fn get_azure_credentials(name: &str) -> AzureConfig {
-    let args = Args::parse();
-    let mut cfg_file = args.config_file;
-    // check if env variable available KCI_STORAGE_CONFIG
-    if let Ok(env_cfg_file) = std::env::var("KCI_STORAGE_CONFIG") {
-        cfg_file = env_cfg_file;
-    }
-    let cfg_content = std::fs::read_to_string(cfg_file).unwrap();
+    let cfg_content = get_config_content();
     let cfg: Table = toml::from_str(&cfg_content).unwrap();
     let azure_cfg = cfg.get(name).unwrap();
     let account = azure_cfg.get("account").unwrap().as_str().unwrap();

src/main.rs

@@ -96,6 +96,13 @@ fn init_driver(driver_type: &str) -> Box<dyn Driver> {
     return driver;
 }
 
+pub fn get_config_content() -> String {
+    let args = Args::parse();
+    let cfg_file = PathBuf::from(&args.config_file);
+    let cfg_content = std::fs::read_to_string(&cfg_file).unwrap();
+    cfg_content
+}
+
 /// Initial variables configuration and checks
 async fn initial_setup() -> Option<RustlsConfig> {
     let cache_dir = "cache";

src/storjwt.rs

@@ -1,5 +1,4 @@
-use crate::Args;
-use clap::Parser;
+use crate::get_config_content;
 use hmac::{Hmac, Mac};
 use jwt::{Header, Token, VerifyWithKey, SignWithKey};
 use sha2::Sha256;
@@ -8,13 +7,7 @@ use toml::value::Table;
 use rand::{distributions::Alphanumeric, Rng};
 pub fn verify_jwt_token(token_str: &str) -> Result<BTreeMap<String, String>, jwt::Error> {
     // config.toml, jwt_secret parameter
-    let args = Args::parse();
-    let mut cfg_file = args.config_file;
-    // check if env variable available KCI_STORAGE_CONFIG
-    if let Ok(env_cfg_file) = std::env::var("KCI_STORAGE_CONFIG") {
-        cfg_file = env_cfg_file;
-    }
-    let toml_cfg = std::fs::read_to_string(&cfg_file).unwrap();
+    let toml_cfg = get_config_content();
     let parsed_toml = toml_cfg.parse::<Table>().unwrap();
     let key_str = parsed_toml["jwt_secret"].as_str().unwrap();
     let key: Hmac<Sha256> = Hmac::new_from_slice(key_str.as_bytes())?;
@@ -54,9 +47,7 @@ pub fn generate_jwt_secret() {
 }
 
 pub fn generate_jwt_token(email: &str) -> Result<String, jwt::Error> {
-    let args = Args::parse();
-    let cfg_file = args.config_file;
-    let toml_cfg = std::fs::read_to_string(&cfg_file).unwrap();
+    let toml_cfg = get_config_content();
     let parsed_toml = toml_cfg.parse::<Table>().unwrap();
     let key_str = parsed_toml["jwt_secret"].as_str().unwrap();
     let key: Hmac<Sha256> = Hmac::new_from_slice(key_str.as_bytes())?;