wip: Update PluginConfiguration

src/configuration.rs

@@ -1,4 +1,5 @@
 use std::cell::OnceCell;
+use std::collections::HashMap;
 use std::fmt::{Debug, Display, Formatter};
 use std::sync::Arc;
 
@@ -460,7 +461,7 @@
 
         for rlp in config.policies.iter() {
             for rule in &rlp.rules {
                 for datum in &rule.data {
                     let result = datum.item.compile();
                     if result.is_err() {
                         return Err(result.err().unwrap());
@@ -475,14 +476,14 @@
                     }
                 }
             }
             for hostname in rlp.hostnames.iter() {
                 index.insert(hostname, rlp.clone());
             }
         }
 
         Ok(Self {
             index,
             failure_mode: config.failure_mode,
         })
     }
 }
@@ -504,8 +505,16 @@
 #[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,
 }
@@ -579,7 +588,7 @@
         let all_of_conditions = &conditions[0].all_of;
         assert_eq!(all_of_conditions.len(), 3);
 
         let data_items = &rules[0].data;
         assert_eq!(data_items.len(), 2);
 
         // TODO(eastizle): DataItem does not implement PartialEq, add it only for testing?
@@ -660,7 +669,7 @@
         let rules = &filter_config.policies[0].rules;
         assert_eq!(rules.len(), 1);
 
         let data_items = &rules[0].data;
         assert_eq!(data_items.len(), 1);
 
         if let DataType::Selector(selector_item) = &data_items[0].item {

src/policy.rs

@@ -14,39 +14,29 @@
 
 #[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(
@@ -58,7 +48,7 @@
             .filter(|rule: &&Rule| self.filter_rule_by_conditions(filter, &rule.conditions))
             // Mapping 1 Rule -> 1 Descriptor
             // Filter out empty descriptors
             .filter_map(|rule| self.build_single_descriptor(filter, &rule.data))
             .collect()
     }