wip - permutive

Author: ChristianPavilonis

crates/common/src/error.rs

@@ -61,10 +61,6 @@ pub enum TrustedServerError {
     #[display("Permutive SDK error: {message}")]
     PermutiveSdk { message: String },
 
-    /// Permutive API proxy error.
-    #[display("Permutive API error: {message}")]
-    PermutiveApi { message: String },
-
     /// Proxy error.
     #[display("Proxy error: {message}")]
     Proxy { message: String },
@@ -108,7 +104,6 @@ impl IntoHttpResponse for TrustedServerError {
             Self::Prebid { .. } => StatusCode::BAD_GATEWAY,
             Self::Integration { .. } => StatusCode::BAD_GATEWAY,
             Self::PermutiveSdk { .. } => StatusCode::BAD_GATEWAY,
-            Self::PermutiveApi { .. } => StatusCode::BAD_GATEWAY,
             Self::Proxy { .. } => StatusCode::BAD_GATEWAY,
             Self::SyntheticId { .. } => StatusCode::INTERNAL_SERVER_ERROR,
             Self::Template { .. } => StatusCode::INTERNAL_SERVER_ERROR,

crates/common/src/generic_proxy.rs

@@ -66,14 +66,15 @@ pub async fn handle_generic_proxy(
     );
 
     // Extract target path
-    let target_path = mapping
-        .extract_target_path(path)
-        .ok_or_else(|| TrustedServerError::Proxy {
-            message: format!(
-                "Failed to extract target path from {} with prefix {}",
-                path, mapping.prefix
-            ),
-        })?;
+    let target_path =
+        mapping
+            .extract_target_path(path)
+            .ok_or_else(|| TrustedServerError::Proxy {
+                message: format!(
+                    "Failed to extract target path from {} with prefix {}",
+                    path, mapping.prefix
+                ),
+            })?;
 
     // Build full target URL with query parameters
     let target_url = build_target_url(&mapping.target, target_path, &req)?;
@@ -95,11 +96,12 @@ pub async fn handle_generic_proxy(
     // Get backend and forward request
     let backend_name = ensure_backend_from_url(&mapping.target)?;
 
-    let target_response = target_req
-        .send(backend_name)
-        .change_context(TrustedServerError::Proxy {
-            message: format!("Failed to forward request to {}", target_url),
-        })?;
+    let target_response =
+        target_req
+            .send(backend_name)
+            .change_context(TrustedServerError::Proxy {
+                message: format!("Failed to forward request to {}", target_url),
+            })?;
 
     log::info!(
         "Target responded with status: {}",
@@ -119,9 +121,7 @@ fn find_proxy_mapping<'a>(
     settings
         .proxy_mappings
         .iter()
-        .find(|mapping| {
-            mapping.matches_path(path) && mapping.supports_method(method.as_str())
-        })
+        .find(|mapping| mapping.matches_path(path) && mapping.supports_method(method.as_str()))
         .ok_or_else(|| {
             TrustedServerError::Proxy {
                 message: format!(
@@ -252,10 +252,7 @@ mod tests {
             Some("/v2/projects")
         );
         assert_eq!(mapping.extract_target_path("/permutive/api"), Some(""));
-        assert_eq!(
-            mapping.extract_target_path("/permutive/api/"),
-            Some("/")
-        );
+        assert_eq!(mapping.extract_target_path("/permutive/api/"), Some("/"));
         assert_eq!(mapping.extract_target_path("/other/path"), None);
     }
 

crates/common/src/lib.rs

@@ -38,7 +38,6 @@ pub mod http_util;
 pub mod integrations;
 pub mod models;
 pub mod openrtb;
-pub mod permutive_proxy;
 pub mod permutive_sdk;
 pub mod prebid_proxy;
 pub mod proxy;