Merge pull request #6626 from jolicode/feature/agent-project-operator

Agent project operator + cluster kubernetes

Author: joelwurtz

src/action/mod.rs

@@ -110,6 +110,30 @@ impl Action {
         }
     }
 
+    pub fn get_target(route: &Route<Rule>, request: &Request) -> Option<String> {
+        let markers_captured = route.capture(request);
+        let variables = route.handler().variables(&markers_captured, request);
+        let rule = route.handler();
+
+        let target = rule.target.as_ref().map(|t| {
+            let mut value = StaticOrDynamic::replace(t.clone(), &variables);
+
+            if let Some(skipped_query_params) = request.path_and_query_skipped.skipped_query_params.as_ref() {
+                if value.contains('?') {
+                    value.push('&');
+                } else {
+                    value.push('?');
+                }
+
+                value.push_str(skipped_query_params.as_str());
+            }
+
+            value
+        });
+
+        target
+    }
+
     pub fn from_route_rule(route: &Route<Rule>, request: &Request) -> (Option<Action>, bool, bool) {
         let markers_captured = route.capture(request);
         let variables = route.handler().variables(&markers_captured, request);

src/api/log.rs

@@ -1,6 +1,7 @@
 use crate::action::Action;
 use crate::http::{Header, Request};
 use serde::{Deserialize, Serialize};
+use std::time::{SystemTime, UNIX_EPOCH};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Log {
@@ -27,7 +28,46 @@ struct FromLog {
     content_type: Option<String>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct LegacyLog {
+    status_code: u16,
+    host: Option<String>,
+    method: Option<String>,
+    request_uri: Option<String>,
+    user_agent: Option<String>,
+    referer: Option<String>,
+    scheme: Option<String>,
+    use_json: Option<bool>,
+    target: Option<String>,
+    rule_id: Option<String>,
+}
+
 impl Log {
+    pub fn from_legacy(legacy: LegacyLog, proxy: String) -> Self {
+        let now = match SystemTime::now().duration_since(UNIX_EPOCH) {
+            Err(_) => 0,
+            Ok(time) => time.as_millis() as u64,
+        };
+
+        Log {
+            code: legacy.status_code,
+            to: legacy.target.unwrap_or_default(),
+            time: now,
+            proxy,
+            ips: None,
+            from: FromLog {
+                rule_ids: legacy.rule_id.map(|id| vec![id]),
+                url: legacy.request_uri.unwrap_or_default(),
+                method: legacy.method,
+                scheme: legacy.scheme,
+                host: legacy.host,
+                referer: legacy.referer,
+                user_agent: legacy.user_agent,
+                content_type: None,
+            },
+        }
+    }
+
     pub fn from_proxy(
         request: &Request,
         code: u16,

src/api/marker.rs

@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 pub struct Marker {
     pub name: String,
     pub regex: String,
-    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    #[serde(default)]
     pub transformers: Vec<Transformer>,
 }
 

src/api/mod.rs

@@ -14,7 +14,7 @@ mod trace;
 mod transformer;
 mod variable;
 
-pub use self::log::Log;
+pub use self::log::{LegacyLog, Log};
 pub use body_filter::{BodyFilter, HTMLBodyFilter, TextAction, TextBodyFilter};
 pub use header::Header;
 pub use header_filter::HeaderFilter;