Update PluginConfiguration

Signed-off-by: Adam Cattermole <[email protected]>

src/configuration.rs

@@ -1,10 +1,12 @@
 use std::cell::OnceCell;
+use std::collections::HashMap;
 use std::fmt::{Debug, Display, Formatter};
 use std::sync::Arc;
 
 use cel_interpreter::objects::ValueType;
 use cel_interpreter::{Context, Expression, Value};
 use cel_parser::{Atom, RelationOp};
+use prost::Message;
 use serde::Deserialize;
 
 use crate::attribute::Attribute;
@@ -504,8 +506,16 @@ pub enum ExtensionType {
 #[derive(Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct PluginConfiguration {
-    #[serde(rename = "rateLimitPolicies")]
+    pub extensions: HashMap<String, Extension>,
     pub policies: Vec<Policy>,
+}
+
+#[derive(Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct Extension {
+    #[serde(rename = "type")]
+    pub extension_type: ExtensionType,
+    pub endpoint: String,
     // Deny/Allow request when faced with an irrecoverable failure.
     pub failure_mode: FailureMode,
 }

src/policy.rs

@@ -1,5 +1,5 @@
 use crate::attribute::Attribute;
-use crate::configuration::{DataItem, DataType, PatternExpression};
+use crate::configuration::{DataItem, DataType, ExtensionType, PatternExpression};
 use crate::envoy::{RateLimitDescriptor, RateLimitDescriptor_Entry};
 use crate::filter::http_context::Filter;
 use log::debug;
@@ -14,39 +14,29 @@ pub struct Condition {
 
 #[derive(Deserialize, Debug, Clone)]
 pub struct Rule {
-    //
     #[serde(default)]
     pub conditions: Vec<Condition>,
-    //
+    pub actions: Vec<Action>,
+}
+
+#[derive(Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct Action {
+    pub extension: String,
     pub data: Vec<DataItem>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct Policy {
-    pub name: String,
-    pub domain: String,
-    pub service: String,
-    pub hostnames: Vec<String>,
+    pub hostname: String,
     pub rules: Vec<Rule>,
 }
 
 impl Policy {
     #[cfg(test)]
-    pub fn new(
-        name: String,
-        domain: String,
-        service: String,
-        hostnames: Vec<String>,
-        rules: Vec<Rule>,
-    ) -> Self {
-        Policy {
-            name,
-            domain,
-            service,
-            hostnames,
-            rules,
-        }
+    pub fn new(hostname: String, rules: Vec<Rule>) -> Self {
+        Policy { hostname, rules }
     }
 
     pub fn build_descriptors(