Merge branch 'feature/unit-tests-round-1' into feature/header-constants

Author: aram356

Cargo.lock

@@ -25,3 +25,6 @@ serde_json = "1.0.91"
 sha2 = "0.10.6"
 tokio = { version = "1.43", features = ["sync", "macros", "io-util", "rt", "time"] }   
 url = "2.4.1"
+
+[dev-dependencies]
+temp-env = "0.3.6"

crates/common/Cargo.toml

@@ -1,7 +1,8 @@
-use config::{Config, ConfigError, File, FileFormat};
-use serde::Deserialize;
 use std::str;
 
+use config::{Config, ConfigError, Environment, File, FileFormat};
+use serde::Deserialize;
+
 #[derive(Debug, Deserialize)]
 #[allow(unused)]
 pub struct AdServer {
@@ -37,27 +38,29 @@ impl Settings {
         let toml_bytes = include_bytes!("../../../trusted-server.toml");
         let toml_str = str::from_utf8(toml_bytes).unwrap();
 
-        let s = Config::builder()
-            .add_source(File::from_str(toml_str, FileFormat::Toml))
+        Self::from_toml(toml_str)
+    }
+
+    pub fn from_toml(toml_str: &str) -> Result<Self, ConfigError> {
+        let environment = Environment::default()
+            .prefix("TRUSTED_SERVER")
+            .separator("__");
+
+        let toml = File::from_str(toml_str, FileFormat::Toml);
+        let config = Config::builder()
+            .add_source(toml)
+            .add_source(environment)
             .build()?;
 
         // You can deserialize (and thus freeze) the entire configuration as
-        s.try_deserialize()
+        config.try_deserialize()
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    fn create_test_settings(toml_str: &str) -> Result<Settings, ConfigError> {
-        let s = Config::builder()
-            .add_source(File::from_str(toml_str, FileFormat::Toml))
-            .build()?;
-
-        s.try_deserialize()
-    }
-
     #[test]
     fn test_settings_new() {
         // Test that Settings::new() loads successfully
@@ -92,7 +95,7 @@ mod tests {
             template = "{{client_ip}}:{{user_agent}}:{{first_party_id}}:{{auth_user_id}}:{{publisher_domain}}:{{accept_language}}"
             "#;
 
-        let settings = create_test_settings(toml_str);
+        let settings = Settings::from_toml(toml_str);
         assert!(settings.is_ok());
 
         let settings = settings.unwrap();
@@ -114,21 +117,21 @@ mod tests {
     #[test]
     fn test_settings_missing_required_fields() {
         let toml_str = r#"
-[ad_server]
-ad_partner_url = "https://example-ad.com/serve"
-# Missing sync_url
+            [ad_server]
+            ad_partner_url = "https://example-ad.com/serve"
+            # Missing sync_url
 
-[prebid]
-server_url = "https://prebid.example.com/openrtb2/auction"
+            [prebid]
+            server_url = "https://prebid.example.com/openrtb2/auction"
 
-[synthetic]
-counter_store = "test-counter-store"
-opid_store = "test-opid-store"
-secret_key = "test-secret-key"
-template = "{{client_ip}}"
-"#;
+            [synthetic]
+            counter_store = "test-counter-store"
+            opid_store = "test-opid-store"
+            secret_key = "test-secret-key"
+            template = "{{client_ip}}"
+            "#;
 
-        let settings = create_test_settings(toml_str);
+        let settings = Settings::from_toml(toml_str);
         assert!(
             settings.is_err(),
             "Should fail when required fields are missing"
@@ -138,85 +141,117 @@ template = "{{client_ip}}"
     #[test]
     fn test_settings_empty_toml() {
         let toml_str = "";
-        let settings = create_test_settings(toml_str);
+        let settings = Settings::from_toml(toml_str);
+
         assert!(settings.is_err(), "Should fail with empty TOML");
     }
 
     #[test]
     fn test_settings_invalid_toml_syntax() {
         let toml_str = r#"
-[ad_server
-ad_partner_url = "https://example-ad.com/serve"
-"#;
-        let settings = create_test_settings(toml_str);
+            [ad_server
+            ad_partner_url = "https://example-ad.com/serve"
+            "#;
+
+        let settings = Settings::from_toml(toml_str);
         assert!(settings.is_err(), "Should fail with invalid TOML syntax");
     }
 
     #[test]
     fn test_settings_partial_config() {
         let toml_str = r#"
-[ad_server]
-ad_partner_url = "https://example-ad.com/serve"
-sync_url = "https://example-ad.com/sync"
-"#;
-        let settings = create_test_settings(toml_str);
+            [ad_server]
+            ad_partner_url = "https://example-ad.com/serve"
+            sync_url = "https://example-ad.com/sync"
+            "#;
+
+        let settings = Settings::from_toml(toml_str);
         assert!(settings.is_err(), "Should fail when sections are missing");
     }
 
     #[test]
     fn test_settings_extra_fields() {
         let toml_str = r#"
-[ad_server]
-ad_partner_url = "https://example-ad.com/serve"
-sync_url = "https://example-ad.com/sync"
-extra_field = "should be ignored"
-
-[prebid]
-server_url = "https://prebid.example.com/openrtb2/auction"
-
-[synthetic]
-counter_store = "test-counter-store"
-opid_store = "test-opid-store"
-secret_key = "test-secret-key-1234567890"
-template = "{{client_ip}}"
-"#;
-
-        let settings = create_test_settings(toml_str);
+        [ad_server]
+        ad_partner_url = "https://example-ad.com/serve"
+        sync_url = "https://example-ad.com/sync"
+        extra_field = "should be ignored"
+
+        [prebid]
+        server_url = "https://prebid.example.com/openrtb2/auction"
+
+        [synthetic]
+        counter_store = "test-counter-store"
+        opid_store = "test-opid-store"
+        secret_key = "test-secret-key-1234567890"
+        template = "{{client_ip}}"
+        "#;
+
+        let settings = Settings::from_toml(toml_str);
         assert!(settings.is_ok(), "Extra fields should be ignored");
     }
 
     #[test]
-    fn test_ad_server_debug_format() {
-        let ad_server = AdServer {
-            ad_partner_url: "https://test.com".to_string(),
-            sync_url: "https://sync.test.com".to_string(),
-        };
-        let debug_str = format!("{:?}", ad_server);
-        assert!(debug_str.contains("AdServer"));
-        assert!(debug_str.contains("https://test.com"));
-    }
+    fn test_set_env() {
+        let toml_str = r#"
+            [ad_server]
+            # ad_partner_url will be set by env variable
+            sync_url = "https://example-ad.com/sync"
 
-    #[test]
-    fn test_prebid_debug_format() {
-        let prebid = Prebid {
-            server_url: "https://prebid.test.com".to_string(),
-        };
-        let debug_str = format!("{:?}", prebid);
-        assert!(debug_str.contains("Prebid"));
-        assert!(debug_str.contains("https://prebid.test.com"));
+            [prebid]
+            server_url = "https://prebid.example.com/openrtb2/auction"
+
+            [synthetic] 
+            counter_store = "test-counter-stor  e"
+            opid_store = "test-opid-store"
+            secret_key = "test-secret-key-1234567890"
+            template = "{{client_ip}}"
+            "#;
+
+        temp_env::with_var(
+            "TRUSTED_SERVER__AD_SERVER__AD_PARTNER_URL",
+            Some("https://change-ad.com/serve"),
+            || {
+                let settings = Settings::from_toml(toml_str);
+
+                assert!(settings.is_ok(), "Settings should load from embedded TOML");
+                assert_eq!(
+                    settings.unwrap().ad_server.ad_partner_url,
+                    "https://change-ad.com/serve"
+                );
+            },
+        );
     }
 
     #[test]
-    fn test_synthetic_debug_format() {
-        let synthetic = Synthetic {
-            counter_store: "counter".to_string(),
-            opid_store: "opid".to_string(),
-            secret_key: "secret".to_string(),
-            template: "{{test}}".to_string(),
-        };
-        let debug_str = format!("{:?}", synthetic);
-        assert!(debug_str.contains("Synthetic"));
-        assert!(debug_str.contains("counter"));
-        assert!(debug_str.contains("secret"));
+    fn test_override_env() {
+        let toml_str = r#"
+            [ad_server]
+            ad_partner_url = "https://example-ad.com/serve"
+            sync_url = "https://example-ad.com/sync"
+
+            [prebid]
+            server_url = "https://prebid.example.com/openrtb2/auction"
+
+            [synthetic] 
+            counter_store = "test-counter-stor  e"
+            opid_store = "test-opid-store"
+            secret_key = "test-secret-key-1234567890"
+            template = "{{client_ip}}"
+            "#;
+
+        temp_env::with_var(
+            "TRUSTED_SERVER__AD_SERVER__AD_PARTNER_URL",
+            Some("https://change-ad.com/serve"),
+            || {
+                let settings = Settings::from_toml(toml_str);
+
+                assert!(settings.is_ok(), "Settings should load from embedded TOML");
+                assert_eq!(
+                    settings.unwrap().ad_server.ad_partner_url,
+                    "https://change-ad.com/serve"
+                );
+            },
+        );
     }
 }