Merge pull request #135 from ngrok/bob/policy-default

Add serde(default) back to policy parent struct

ngrok/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ngrok"
-version = "0.14.0-pre.10"
+version = "0.14.0-pre.11"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "The ngrok agent SDK"

ngrok/assets/policy-inbound.json

@@ -0,0 +1,15 @@
+{
+  "inbound": [
+    {
+      "name": "test_in",
+      "expressions": [
+        "req.Method == 'PUT'"
+      ],
+      "actions": [
+        {
+          "type": "deny"
+        }
+      ]
+    }
+  ]
+}

ngrok/src/config/policies.rs

@@ -14,6 +14,7 @@ use crate::internals::proto;
 /// A policy that defines rules that should be applied to incoming or outgoing
 /// connections to the edge.
 #[derive(Serialize, Deserialize, Debug, Clone, Default, PartialEq)]
+#[serde(default)]
 pub struct Policy {
     inbound: Vec<Rule>,
     outbound: Vec<Rule>,
@@ -241,6 +242,13 @@ pub(crate) mod test {
         );
     }
 
+    #[test]
+    fn test_empty_json_to_policy() {
+        let policy: Policy = Policy::from_json("{}").unwrap();
+        assert_eq!(0, policy.inbound.len());
+        assert_eq!(0, policy.outbound.len());
+    }
+
     #[test]
     fn test_policy_to_json() {
         let policy = Policy::from_json(POLICY_JSON).unwrap();
@@ -317,6 +325,13 @@ pub(crate) mod test {
         assert_eq!(policy, policy2);
     }
 
+    #[test]
+    fn test_load_inbound_file() {
+        let policy = Policy::from_file("assets/policy-inbound.json").unwrap();
+        assert_eq!("test_in", policy.inbound[0].name);
+        assert_eq!(0, policy.outbound.len());
+    }
+
     #[test]
     fn test_load_file_error() {
         let error = Policy::from_file("assets/absent.json").err().unwrap();