Merge pull request #396 from Kuadrant/cel_predicates

🔥 conditions et at, replacing with proper `cel::Predicate`s & `::Expression`s

doc/migrations/conditions.md

@@ -23,22 +23,3 @@ case `foo` was the identifier of the variable, while `bar` was the value to eval
 after the operator `==` would be equally important. SO that `foo  ==  bar` would test for a `foo ` variable being equal
 to ` bar` where the trailing whitespace after the identifier, and the one prefixing the value, would have been
 evaluated.
-
-## Server binary users
-
-The server still allows for the deprecated syntax, but warns about its usage. You can easily migrate your limits file, 
-using the following command:
-
-```commandline
-limitador-server --validate old_limits.yaml > updated_limits.yaml
-```
-
-Which should output `Deprecated syntax for conditions corrected!` to `stderr` while `stdout` would be the limits using 
-the new syntax. It is recommended you manually verify the resulting `LIMITS_FILE`.
-
-
-## Crate users
-
-A feature `lenient_conditions` has been added, which lets you use the syntax used in previous version of the crate.
-The function `limitador::limit::check_deprecated_syntax_usages_and_reset()` lets you verify if the deprecated syntax 
-has been used as `limit::Limit`s are created with their condition strings using the deprecated syntax.

doc/server/configuration.md

@@ -94,7 +94,7 @@ Here is an example of such a limit definition:
   max_value: 10
   seconds: 60
   conditions:
-    - "req.method == 'GET'"
+    - "req_method == 'GET'"
   variables:
     - user_id
 ```

limitador-server/Cargo.toml

@@ -18,7 +18,7 @@ distributed_storage = ["limitador/distributed_storage"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-limitador = { path = "../limitador", features = ['lenient_conditions'] }
+limitador = { path = "../limitador" }
 tokio = { version = "1", features = ["full"] }
 thiserror = "2"
 tonic = "0.12.3"

limitador-server/examples/envoy.yaml

@@ -28,8 +28,8 @@ static_resources:
                   rate_limits:
                     - stage: 0
                       actions:
-                        - {request_headers: {header_name: "userid", descriptor_key: "user_id"}}
-                        - {request_headers: {header_name: ":method", descriptor_key: "req.method"}}
+                        - { request_headers: { header_name: "userid", descriptor_key: "user_id" } }
+                        - { request_headers: { header_name: ":method", descriptor_key: "descriptors[0]['method']" } }
           http_filters:
           - name: envoy.filters.http.ratelimit
             typed_config:

limitador-server/examples/limits.yaml

@@ -10,6 +10,6 @@
   max_value: 5
   seconds: 60
   conditions:
-    - "req.method == 'POST'"
+    - "descriptors[0]['req.method'] == 'POST'"
   variables:
     - user_id

limitador-server/sandbox/limits.yaml

@@ -3,20 +3,20 @@
   max_value: 10
   seconds: 60
   conditions:
-    - "req.method == 'GET'"
-    - "req.path != '/json'"
+    - "descriptors[0]['req.method'] == 'GET'"
+    - "descriptors[0]['req.path'] != '/json'"
   variables: []
 - namespace: test_namespace
   max_value: 5
   seconds: 60
   conditions:
-    - "req.method == 'POST'"
-    - "req.path != '/json'"
+    - "descriptors[0]['req.method'] == 'POST'"
+    - "descriptors[0]['req.path'] != '/json'"
   variables: []
 - namespace: test_namespace
   max_value: 50000
   seconds: 10
   conditions:
-    - "req.method == 'GET'"
-    - "req.path == '/json'"
+    - "descriptors[0]['req.method'] == 'GET'"
+    - "descriptors[0]['req.path'] == '/json'"
   variables: []