🔥 module crate::limit::conditions et al

Signed-off-by: Alex Snaps <[email protected]>

limitador-server/src/envoy_rls/server.rs

@@ -253,7 +253,7 @@ mod tests {
             namespace,
             1,
             60,
-            vec!["req_method == 'GET'"],
+            vec!["req_method == 'GET'".to_string()],
             vec!["app_id"],
         )
         .expect("This must be a valid limit!");
@@ -395,10 +395,16 @@ mod tests {
         let namespace = "test_namespace";
 
         vec![
-            Limit::new(namespace, 10, 60, vec!["x == '1'"], vec!["z"])
-                .expect("This must be a valid limit!"),
-            Limit::new(namespace, 0, 60, vec!["x == '1'", "y == '2'"], vec!["z"])
+            Limit::new(namespace, 10, 60, vec!["x == '1'".to_string()], vec!["z"])
                 .expect("This must be a valid limit!"),
+            Limit::new(
+                namespace,
+                0,
+                60,
+                vec!["x == '1'".to_string(), "y == '2'".to_string()],
+                vec!["z"],
+            )
+            .expect("This must be a valid limit!"),
         ]
         .into_iter()
         .for_each(|limit| {
@@ -462,7 +468,7 @@ mod tests {
     #[tokio::test]
     async fn test_takes_into_account_the_hits_addend_param() {
         let namespace = "test_namespace";
-        let limit = Limit::new(namespace, 10, 60, vec!["x == '1'"], vec!["y"])
+        let limit = Limit::new(namespace, 10, 60, vec!["x == '1'".to_string()], vec!["y"])
             .expect("This must be a valid limit!");
 
         let limiter = RateLimiter::new(10_000);
@@ -532,7 +538,7 @@ mod tests {
         // "hits_addend" is optional according to the spec, and should default
         // to 1, However, with the autogenerated structs it defaults to 0.
         let namespace = "test_namespace";
-        let limit = Limit::new(namespace, 1, 60, vec!["x == '1'"], vec!["y"])
+        let limit = Limit::new(namespace, 1, 60, vec!["x == '1'".to_string()], vec!["y"])
             .expect("This must be a valid limit!");
 
         let limiter = RateLimiter::new(10_000);

limitador-server/src/http_api/request_types.rs

@@ -1,6 +1,5 @@
 use limitador::counter::Counter as LimitadorCounter;
-use limitador::errors::LimitadorError;
-use limitador::limit::Limit as LimitadorLimit;
+use limitador::limit::{Limit as LimitadorLimit, ParseError};
 use paperclip::actix::Apiv2Schema;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, HashMap};
@@ -42,7 +41,7 @@ impl From<&LimitadorLimit> for Limit {
 }
 
 impl TryFrom<Limit> for LimitadorLimit {
-    type Error = LimitadorError;
+    type Error = ParseError;
 
     fn try_from(limit: Limit) -> Result<Self, Self::Error> {
         let mut limitador_limit = if let Some(id) = limit.id {

limitador/src/errors.rs

@@ -1,4 +1,5 @@
-use crate::limit::ConditionParsingError;
+use crate::limit::cel::EvaluationError;
+use crate::limit::ParseError;
 use crate::storage::StorageErr;
 use std::convert::Infallible;
 use std::error::Error;
@@ -7,7 +8,7 @@ use std::fmt::{Display, Formatter};
 #[derive(Debug)]
 pub enum LimitadorError {
     StorageError(StorageErr),
-    InterpreterError(ConditionParsingError),
+    InterpreterError(EvaluationError),
 }
 
 impl Display for LimitadorError {
@@ -38,13 +39,13 @@ impl From<StorageErr> for LimitadorError {
     }
 }
 
-impl From<ConditionParsingError> for LimitadorError {
-    fn from(err: ConditionParsingError) -> Self {
+impl From<EvaluationError> for LimitadorError {
+    fn from(err: EvaluationError) -> Self {
         LimitadorError::InterpreterError(err)
     }
 }
 
-impl From<Infallible> for LimitadorError {
+impl From<Infallible> for ParseError {
     fn from(value: Infallible) -> Self {
         unreachable!("unexpected infallible value: {:?}", value)
     }