Remove Option and use #[serde(default)] instead

2 files changed, 12 insertions, 10 deletions

diff --git a/ci/ios/test-router/raas/src/block_list/rule.rs b/ci/ios/test-router/raas/src/block_list/rule.rs
index cc9b0a0bc5..a95dbd55ac 100644
--- a/ci/ios/test-router/raas/src/block_list/rule.rs
+++ b/ci/ios/test-router/raas/src/block_list/rule.rs
@@ -24,6 +24,8 @@ pub struct Endpoints {
 }
 
 impl BlockRule {
+    /// Creates one or more nft rules that correspond to this BlockRule. The returned Vec will always
+    /// have at least one element.
     pub fn create_nft_rules<'a>(&'a self, chain: &'a Chain<'a>) -> Vec<Rule<'a>> {
         match self {
             BlockRule::Host { protocols, .. } if !protocols.is_empty() => protocols
diff --git a/ci/ios/test-router/raas/src/web/routes.rs b/ci/ios/test-router/raas/src/web/routes.rs
index d6e8a39838..42c4b9687e 100644
--- a/ci/ios/test-router/raas/src/web/routes.rs
+++ b/ci/ios/test-router/raas/src/web/routes.rs
@@ -22,7 +22,8 @@ pub struct NewRule {
     /// A list of protocols that should be blocked, e.g. Tcp or WireGuard. The default behavior
     /// is to block all traffic regardless of protocol, but if `protocols` is non-empty, only
     /// traffic that uses that protocol is blocked.
-    pub protocols: Option<BTreeSet<Protocol>>,
+    #[serde(default)]
+    pub protocols: BTreeSet<Protocol>,
     /// A unique identifier for a group of rules. It is possible to add rules to an existing label
     /// and to remove all rules for a label.
     pub label: Uuid,
@@ -95,10 +96,17 @@ pub async fn add_rule(
             dst: json.dst,
             invert_dst: json.block_all_except_dst,
         };
+        let protocols = json.protocols;
 
         let mut block_rules = vec![];
 
-        if let Some(protocols) = json.protocols {
+        if protocols.is_empty() {
+            // If no protocols are specified we default to blocking everything for (src, dst).
+            block_rules.push(BlockRule::Host {
+                endpoints,
+                protocols: BTreeSet::new(),
+            });
+        } else {
             let mut transport = BTreeSet::new();
             let mut application = BTreeSet::new();
             for protocol in protocols {
@@ -118,14 +126,6 @@ pub async fn add_rule(
             }
         }
 
-        // If no protocols are specified we default to blocking everything for (src, dst).
-        if block_rules.is_empty() {
-            block_rules.push(BlockRule::Host {
-                endpoints,
-                protocols: BTreeSet::new(),
-            });
-        }
-
         fw.add_rules(&block_rules, label)?;
         for rule in block_rules {
             log_rule(&rule, &label);